Compare commits

...

56 Commits
master ... kate

Author SHA1 Message Date
udf ed18b3ccba
Add check for large files and comments 2018-11-25 02:45:20 +02:00
udf b0b2b65ca4
add short descriptions to kbass plugins 2018-11-24 23:22:44 +02:00
udf 4f05e252be
add tdesktop keyboard assistance plugins 2018-11-24 23:14:04 +02:00
udf 599f794525
move get_target_message to utils 2018-11-24 17:19:23 +02:00
udf 4d531be35b
catch exceptions when the title isnt modified 2018-11-22 16:02:48 +02:00
udf dbbd02edc8
Merge branch 'ninja_fix' into kate 2018-11-22 00:40:00 +02:00
udf 74f0cea230
Fix ninja in saved messages
I'm not sure why you'd use ninja in your own chat, but it shouldn't raise anyways.
2018-11-21 23:24:33 +02:00
udf 7f789c23c9
Merge branch 'superblock' into kate 2018-11-21 22:55:49 +02:00
udf cf7c642b18
Merge branch 'master' into kate 2018-11-21 22:55:02 +02:00
udf 8c0f04c0cb
Add license header 2018-11-21 22:08:27 +02:00
udf 3e5b6fddb3
Add superblock plugin 2018-11-21 22:08:27 +02:00
udf 2a740440d5
Add superblock plugin 2018-11-21 21:05:33 +02:00
udf 28f43b5bc8
use shield() correctly 2018-11-14 16:34:29 +02:00
udf 3ea3808ac2
fix not waiting after rename 2018-11-14 16:22:43 +02:00
udf 7c90f97a97
fix typo 2018-11-14 00:44:11 +02:00
udf 23b6f78cbd
revert title if message is deleted before natural revert 2018-11-14 00:37:10 +02:00
udf 785b215c90
make constants uppercase 2018-11-14 00:33:35 +02:00
udf 24f5b88d3a
Merge branch 'master' of https://github.com/udf/uniborg 2018-11-13 22:41:33 +02:00
udf c43114264f
fix links 2018-11-09 21:08:59 +02:00
udf dfa87dc849
Merge branch 'master' of https://git.togrand.xyz/uniborg/uniborg 2018-11-04 14:55:59 +02:00
udf 7041489498
Merge branch 'master' of https://github.com/udf/uniborg 2018-11-03 14:19:09 +02:00
udf e246a8d378
remove debug code; move length limit to constants 2018-11-03 14:18:59 +02:00
udf a146d4f3b4
Useless imports are the best imports 2018-11-03 05:08:46 +02:00
udf 225e377130
truncate really long byte sequences 2018-11-03 04:58:51 +02:00
udf 192e1d890a
hide empty objects 2018-11-03 04:53:32 +02:00
udf 774c0bebdb
add message .info plugin 2018-11-03 04:39:21 +02:00
udf f4a7e49cc1
remove old stuff 2018-11-03 03:10:49 +02:00
udf ddeb468a79
remove stock tags from markdown
now it just adds new tags instead of replicating the default behaviour of the clients
2018-11-02 18:25:04 +02:00
udf 5da937756b
fix fix 2018-11-01 23:24:17 +02:00
udf f9b3c48a11
move sp_kick_invite to disabled
previously it was unreleased
2018-11-01 23:17:30 +02:00
udf 9981c27415
Merge branch 'master' of https://github.com/udf/uniborg 2018-11-01 23:10:14 +02:00
udf b28f2c5b35
attempt to fix title casing 2018-11-01 23:04:15 +02:00
udf 2ba0debfea
clean up imports 2018-11-01 23:02:34 +02:00
udf 61d03d4870 Merge https://git.togrand.xyz/uniborg/uniborg 2018-10-08 19:21:24 +00:00
udf 829828f835 move sp_h to disabled dir 2018-10-08 18:58:45 +00:00
udf 608aea3e5b shitpost harder 2018-09-13 23:00:00 +02:00
udf c19c70291c Merge branch 'master' of https://github.com/udf/uniborg 2018-09-13 22:55:45 +02:00
udf 3ef1a7fd11 reply with braille art on deletion 2018-09-13 22:54:57 +02:00
udf a923b74c6f
Merge pull request #1 from Qwerty-Space/patch-1
made smol
2018-08-27 00:07:48 +02:00
Qwerty-Space c3ed26a1c7
made smol 2018-08-26 22:57:45 +01:00
udf 73dd73eb24 h 2018-08-26 23:28:26 +02:00
udf 699ac98b05 Merge https://github.com/uniborg/uniborg 2018-07-19 16:56:32 +00:00
udf c4f8779e34 Merge branch 'master' of https://github.com/uniborg/uniborg 2018-06-30 20:23:04 +00:00
udf 39017da8dc update to latest uniborg master 2018-06-22 16:26:32 +00:00
udf 5c93052045 Merge branch 'master' of https://github.com/uniborg/uniborg 2018-06-17 20:10:17 +00:00
udf 2d016d534d remove shit 2018-06-16 13:37:56 +00:00
udf dfd0e87735 Merge branch 'master' of https://github.com/uniborg/uniborg 2018-06-16 13:37:45 +00:00
EyeZiS b2bb1c6027 -S 2018-06-14 20:08:04 +02:00
udf ade16c6655 Merge branch 'master' of https://github.com/uniborg/uniborg 2018-06-12 19:54:43 +02:00
udf a1b255b8a1 Merge branch 'fix-reparse' of https://github.com/uniborg/uniborg 2018-06-10 19:57:35 +00:00
udf b6b262f93d Merge branch 'master' of https://github.com/uniborg/uniborg 2018-06-10 19:55:14 +00:00
udf 64f971ee64 make thing better, idk 2018-06-10 19:54:00 +00:00
udf a07a352d1c use None as default parameter instead of empty list 2018-06-10 21:10:48 +02:00
udf a2a4b506cb Skip existing entities
It's a very hacky PoC, but it fixes things like urls being incorrectly parsed
2018-06-10 20:40:15 +02:00
eyezis d04d082c45 add shitpost plugins 2018-06-03 14:16:44 +02:00
eyezis 95fd4eec97 remove unused plugins 2018-06-03 14:16:00 +02:00
18 changed files with 413 additions and 162 deletions

View File

@ -8,7 +8,7 @@ Pluggable [``asyncio``](https://docs.python.org/3/library/asyncio.html)
Simply clone the repository and run the main file:
```sh
git clone https://github.com/uniborg/uniborg.git
git clone https://github.com/udf/uniborg.git
cd uniborg
python stdborg.py
```
@ -16,11 +16,11 @@ python stdborg.py
## design
The modular design of the project enhances your Telegram experience
through [plugins](https://github.com/uniborg/uniborg/tree/master/stdplugins)
through [plugins](https://github.com/udf/uniborg/tree/master/stdplugins)
which you can enable or disable on demand.
Each plugin gets the `borg`, `logger` and `storage` magical
[variables](https://github.com/uniborg/uniborg/blob/4805f2f6de7d734c341bb978318f44323ad525f1/uniborg/uniborg.py#L66-L68)
[variables](https://github.com/udf/uniborg/blob/4805f2f6de7d734c341bb978318f44323ad525f1/uniborg/uniborg.py#L66-L68)
to ease their use. Thus creating a plugin as easy as adding
a new file under the plugin directory to do the job:
@ -36,12 +36,12 @@ async def handler(event):
## internals
The core features offered by the custom `TelegramClient` live under the
[`uniborg/`](https://github.com/uniborg/uniborg/tree/master/uniborg)
[`uniborg/`](https://github.com/udf/uniborg/tree/master/uniborg)
directory, with some utilities, enhancements and the core plugin.
## learning
Check out the already-mentioned
[plugins](https://github.com/uniborg/uniborg/tree/master/stdplugins)
[plugins](https://github.com/udf/uniborg/tree/master/stdplugins)
directory to learn how to write your own, and consider reading
[Telethon's documentation](http://telethon.readthedocs.io/).

37
disabledplugins/sp_h.py Normal file
View File

@ -0,0 +1,37 @@
import asyncio
from telethon import events
from telethon.tl import types
EPIC_MEME = (
"""
"""
)
@borg.on(events.NewMessage(pattern=r"^h$"))
async def on_h(event):
await borg.reply(file="CAADAQADpgIAAna32gVJ62JcFcDnqwI")
async def del_filter(del_event):
if del_event.chat_id and del_event.chat_id != event.chat_id:
return False
return del_event.deleted_id == message.id
fut = borg.await_event(events.MessageDeleted, del_filter)
try:
await asyncio.wait_for(fut, timeout=5)
await event.reply(EPIC_MEME)
except asyncio.TimeoutError:
pass

View File

@ -0,0 +1,26 @@
# kicks people who join a group by invite
import asyncio
from telethon import events
from telethon.tl.functions.channels import EditBannedRequest
from telethon.tl.types import ChannelBannedRights
import time
channel_id = 1252035294
@borg.on(events.ChatAction(chats=channel_id))
async def on_join(event):
if event.user_joined:
await borg(
EditBannedRequest(
channel=channel_id,
user_id=await event.get_user(),
banned_rights=ChannelBannedRights(
time.time() + 60,
True, True, True, True, True, True, True, True
)
)
)

View File

@ -1,18 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from telethon import events
@borg.on(events.NewMessage(pattern=r"\.all", outgoing=True))
async def _(event):
if event.fwd_from:
return
await event.delete()
mentions = "@all"
chat = await event.get_input_chat()
async for x in borg.iter_participants(chat, 100):
mentions += f"[\u2063](tg://user?id={x.id})"
await borg.send_message(
chat, mentions, reply_to=event.message.reply_to_msg_id)

View File

@ -74,6 +74,7 @@ def yaml_format(obj, indent=0):
result.append('\n')
indent += 2
for x in obj:
result.append(f"{' ' * indent}- {yaml_format(x, indent + 2)}")
result.append('\n')
result.pop()

46
stdplugins/kbass_core.py Normal file
View File

@ -0,0 +1,46 @@
"""
Contains code used by other kbass_* plugins
"""
from uniborg import util
def self_reply_cmd(borg, pattern):
def wrapper(function):
@borg.on(util.admin_cmd(pattern))
async def wrapped(event, *args, **kwargs):
await event.delete()
target = await util.get_target_message(borg, event)
if not target:
return
return await function(event, target, *args, **kwargs)
return wrapped
return wrapper
def self_reply_selector(borg, cmd):
def wrapper(function):
@borg.on(util.admin_cmd(cmd + r"( [+-]?\d+)?$"))
async def wrapped(event, *args, **kwargs):
await event.delete()
reply = await event.get_reply_message()
if not reply:
return
num_offset = int(event.pattern_match.group(1) or 0)
reverse = num_offset > 0
targets = [reply] if reverse else []
targets.extend(await borg.get_messages(
await event.get_input_chat(),
limit=abs(num_offset),
offset_id=reply.id,
reverse=reverse
))
if not reverse:
# reverse the list because we want things to always be in
# history order
targets.reverse()
targets.append(reply)
return await function(event, targets, num_offset, *args, **kwargs)
return wrapped
return wrapper

43
stdplugins/kbass_edit.py Normal file
View File

@ -0,0 +1,43 @@
"""
Reply to a message with .e to make a draft of it (with '\n.e' appended)
Reply to your own message with <text>.e to edit the message to <text>
if <text> is ".", the message is edited to empty/deleted
"""
import asyncio
from telethon.errors import MessageEmptyError
from telethon.tl.functions.messages import SaveDraftRequest
from telethon.tl.functions.messages import EditMessageRequest
from stdplugins.kbass_core import self_reply_cmd
@self_reply_cmd(borg, r"^\.e$")
async def on_edit_start(event, target):
await asyncio.sleep(3) # tdesktop doesn't sync drafts when the window is active
await borg(SaveDraftRequest(
peer=await event.get_input_chat(),
message=(target.message or '.') + '\n.e',
entities=target.entities,
no_webpage=not target.media,
reply_to_msg_id=target.id
))
@self_reply_cmd(borg, r'(?ms)^(.+)\.e$')
async def on_edit_end(event, target):
text = event.pattern_match.group(1)
message = event.message.message[:-2]
if message.strip() == '.':
message = ''
try:
await borg(EditMessageRequest(
peer=await event.get_input_chat(),
id=target.id,
no_webpage=not target.media,
message=message,
entities=event.message.entities
))
except MessageEmptyError:
# Can't make text message empty, so delete it
await borg.delete_messages(chat, target)

View File

@ -0,0 +1,34 @@
"""
Reply to a file with .f to send it as a photo
"""
from io import BytesIO
from stdplugins.kbass_core import self_reply_cmd
from telethon import types
from telethon.errors import PhotoInvalidDimensionsError
@self_reply_cmd(borg, r"^\.f$")
async def on_file_to_photo(event, target):
try:
image = target.media.document
except AttributeError:
return
if not image.mime_type.startswith('image/'):
return # This isn't an image
if image.mime_type == 'image/webp':
return # Telegram doesn't let you directly send stickers as photos
if image.size > 10 * 1024 * 1024:
return # We'd get PhotoSaveFileInvalidError otherwise
file = await borg.download_media(target, file=BytesIO())
file.seek(0)
img = await borg.upload_file(file)
try:
await event.respond(
reply_to=target,
file=types.InputMediaUploadedPhoto(img)
)
except PhotoInvalidDimensionsError:
return

15
stdplugins/kbass_save.py Normal file
View File

@ -0,0 +1,15 @@
"""
Reply to a message with .s <n> to forward <n> messages from that point to your
saved messages (negative values of <n> go backwards in history)
"""
import asyncio
from stdplugins.kbass_core import self_reply_selector
@self_reply_selector(borg, r'\.s')
async def on_save(event, targets, num_offset):
await borg.forward_messages('me', targets)
msg = await event.respond(f'Saved {abs(num_offset) + 1} messages!')
await asyncio.sleep(3)
await borg.delete_messages(msg.to_id, msg)

View File

@ -0,0 +1,25 @@
"""
Reply to a message with .p <y/n> to toggle the webpage preview of a message
"""
from telethon.errors import MessageNotModifiedError
from telethon.tl.functions.messages import EditMessageRequest
from stdplugins.kbass_core import self_reply_cmd
@self_reply_cmd(borg, r"^\.p(?: ?)([yn])?$")
async def on_edit_preview(event, target):
preview = event.pattern_match.group(1) == 'y'
if not event.pattern_match.group(1):
preview = not bool(target.media)
try:
await borg(EditMessageRequest(
peer=await event.get_input_chat(),
id=target.id,
no_webpage=not preview,
message=target.message,
entities=target.entities
))
except MessageNotModifiedError:
# There was no preview to modify
pass

28
stdplugins/kbass_yank.py Normal file
View File

@ -0,0 +1,28 @@
"""
Like save but makes a draft in your chat of all the messages concatenated with
two newlines
"""
import html
from telethon.tl.functions.messages import SaveDraftRequest
from telethon.extensions import html as thtml
from stdplugins.kbass_core import self_reply_selector
def get_message_html(message):
if message.action:
return html.escape(str(message.action))
return thtml.unparse(message.message, message.entities)
@self_reply_selector(borg, r'\.y')
async def on_yank(event, targets, num_offset):
message = '\n\n'.join(get_message_html(target) for target in targets)
message, entities = thtml.parse(message)
await borg(SaveDraftRequest(
peer='me',
message=message,
entities=entities,
no_webpage=True,
))

View File

@ -8,10 +8,7 @@ from telethon import events
from telethon.tl.functions.messages import EditMessageRequest
from telethon.extensions.markdown import DEFAULT_URL_RE
from telethon.utils import add_surrogate, del_surrogate
from telethon.tl.types import (
MessageEntityBold, MessageEntityItalic, MessageEntityCode,
MessageEntityPre, MessageEntityTextUrl
)
from telethon.tl.types import MessageEntityTextUrl
def parse_url_match(m):
@ -23,14 +20,6 @@ def parse_url_match(m):
return m.group(1), entity
def get_tag_parser(tag, entity):
# TODO unescape escaped tags?
def tag_parser(m):
return m.group(1), entity(offset=m.start(), length=len(m.group(1)))
tag = re.escape(tag)
return re.compile(tag + r'(.+?)' + tag, re.DOTALL), tag_parser
PRINTABLE_ASCII = range(0x21, 0x7f)
def parse_aesthetics(m):
def aesthetify(string):
@ -65,18 +54,10 @@ def parse_snip(m):
return m.group(1), None
PARSED_ENTITIES = (
MessageEntityBold, MessageEntityItalic, MessageEntityCode,
MessageEntityPre, MessageEntityTextUrl
)
# A matcher is a tuple of (regex pattern, parse function)
# where the parse function takes the match and returns (text, entity)
MATCHERS = [
(DEFAULT_URL_RE, parse_url_match),
(get_tag_parser('**', MessageEntityBold)),
(get_tag_parser('__', MessageEntityItalic)),
(get_tag_parser('```', partial(MessageEntityPre, language=''))),
(get_tag_parser('`', MessageEntityCode)),
(re.compile(r'\+\+(.+?)\+\+'), parse_aesthetics),
(re.compile(r'([^/\w]|^)(/?(r/\w+))'), parse_subreddit),
(re.compile(r'(!\w+)'), parse_snip)

View File

@ -5,21 +5,15 @@
import asyncio
from telethon import events
from telethon.tl.types import InputPeerSelf
import telethon.utils
from uniborg import util
async def get_target_message(event):
if event.is_reply and (await event.get_reply_message()).from_id == borg.uid:
return await event.get_reply_message()
async for message in borg.iter_messages(
await event.get_input_chat(), limit=20):
if message.out:
return message
async def await_read(chat, message):
if isinstance(chat, InputPeerSelf):
return
chat = telethon.utils.get_peer_id(chat)
async def read_filter(read_event):
@ -43,7 +37,7 @@ async def delete(event):
text = event.pattern_match.group(2)
if not text:
return
target = await get_target_message(event)
target = await util.get_target_message(borg, event)
if target:
chat = await event.get_input_chat()
await await_read(chat, target)

View File

@ -1,109 +0,0 @@
from collections import defaultdict, deque
import re
import regex
from telethon import events, utils
from telethon.tl import types, functions
HEADER = "「sed」\n"
KNOWN_RE_BOTS = re.compile(
r'(regex|moku|BananaButler_|rgx|l4mR)bot',
flags=re.IGNORECASE
)
# Heavily based on
# https://github.com/SijmenSchoon/regexbot/blob/master/regexbot.py
last_msgs = defaultdict(lambda: deque(maxlen=10))
def doit(chat_id, match, original):
fr = match.group(1)
to = match.group(2)
to = to.replace('\\/', '/')
try:
fl = match.group(3)
if fl is None:
fl = ''
fl = fl[1:]
except IndexError:
fl = ''
# Build Python regex flags
count = 1
flags = 0
for f in fl:
if f == 'i':
flags |= regex.IGNORECASE
elif f == 'g':
count = 0
else:
return None, f"Unknown flag: {f}"
def actually_doit(original):
try:
s = original.message
if s.startswith(HEADER):
s = s[len(HEADER):]
s, i = regex.subn(fr, to, s, count=count, flags=flags)
if i > 0:
return original, s
except Exception as e:
return None, f"u dun goofed m8: {str(e)}"
return None, None
if original is not None:
return actually_doit(original)
# Try matching the last few messages
for original in last_msgs[chat_id]:
m, s = actually_doit(original)
if s is not None:
return m, s
return None, None
async def group_has_sedbot(group):
if isinstance(group, types.InputPeerChannel):
full = await borg(functions.channels.GetFullChannelRequest(group))
elif isinstance(group, types.InputPeerChat):
full = await borg(functions.messages.GetFullChatRequest(group.chat_id))
else:
return False
return any(KNOWN_RE_BOTS.match(x.username or '') for x in full.users)
@borg.on(events.NewMessage)
async def on_message(event):
last_msgs[event.chat_id].appendleft(event.message)
@borg.on(events.MessageEdited)
async def on_edit(event):
for m in last_msgs[event.chat_id]:
if m.id == event.id:
m.raw_text = event.raw_text
break
@borg.on(events.NewMessage(
pattern=re.compile(r"^s/((?:\\/|[^/])+)/((?:\\/|[^/])*)(/.*)?")))
async def on_regex(event):
if event.fwd_from:
return
if not event.is_private and\
await group_has_sedbot(await event.get_input_chat()):
return
chat_id = utils.get_peer_id(await event.get_input_chat())
m, s = doit(chat_id, event.pattern_match, await event.get_reply_message())
if m is not None:
s = f"{HEADER}{s}"
out = await borg.send_message(
await event.get_input_chat(), s, reply_to=m.id
)
last_msgs[chat_id].appendleft(out)
elif s is not None:
await event.reply(s)
raise events.StopPropagation

10
stdplugins/sp_bar.py Normal file
View File

@ -0,0 +1,10 @@
import asyncio
from telethon import events
from telethon.tl import types
import re
@borg.on(events.NewMessage(pattern=re.compile(r"^bar$"), chats=1040270887))
async def on_bar(event):
if event.from_id == 151462131:
return
await event.reply("foo")

View File

@ -0,0 +1,71 @@
import asyncio
import re
from telethon import events
from telethon.tl.functions.channels import EditTitleRequest
from telethon.errors.rpcerrorlist import ChatNotModifiedError
MULTI_EDIT_TIMEOUT = 80
REVERT_TIMEOUT = 2 * 60 * 60
CHANNEL_ID = 1040270887
DEFAULT_TITLE = "Programming & Tech"
prog_tech_channel = None
lock = asyncio.Lock()
def fix_title(s):
# Ideally this would be a state machine, but ¯\_(ツ)_/¯
def replace(m):
token = m.group(1)
if token.lower() == 'and':
token = '&'
return token[0].upper() + token[1:] + (' ' if m.group(2) else '')
return re.sub(r'(\S+)(\s+)?', replace, s)
async def edit_title(title):
global prog_tech_channel
if prog_tech_channel is None:
prog_tech_channel = await borg.get_entity(CHANNEL_ID)
try:
await borg(EditTitleRequest(
channel=prog_tech_channel, title=title
))
except ChatNotModifiedError:
pass # Everything is ok
async def wait_for_delete(deleted_fut, timeout):
try:
await asyncio.wait_for(deleted_fut, timeout)
await edit_title(DEFAULT_TITLE)
return True
except asyncio.TimeoutError:
pass
return False
@borg.on(events.NewMessage(
pattern=re.compile(r"(?i)programming (?:&|and) (.+)"), chats=CHANNEL_ID))
async def on_name(event):
new_topic = fix_title(event.pattern_match.group(1))
new_title = f"Programming & {new_topic}"
if "Tech" not in new_title:
new_title += " & Tech"
if len(new_title) > 255 or lock.locked():
return
with (await lock):
await edit_title(new_title)
deleted_fut = borg.await_event(events.MessageDeleted(
chats=CHANNEL_ID,
func=lambda e: e.deleted_id == event.message.id
))
if await wait_for_delete(asyncio.shield(deleted_fut), MULTI_EDIT_TIMEOUT):
await asyncio.sleep(MULTI_EDIT_TIMEOUT)
return
if await wait_for_delete(deleted_fut, REVERT_TIMEOUT) or lock.locked():
return
with (await lock):
await edit_title(DEFAULT_TITLE)

58
stdplugins/superblock.py Normal file
View File

@ -0,0 +1,58 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
import asyncio
from telethon import events
import telethon.tl.functions as tlf
from telethon.tl.types import InputPeerChannel, UpdateUserBlocked
from telethon.tl.functions.contacts import GetBlockedRequest
# How often to fetch the full list of blocked users
REFETCH_TIME = 60
blocked_user_ids = set()
@borg.on(events.NewMessage(incoming=True, func=lambda e: e.message.mentioned))
async def on_mentioned(event):
if not event.message.from_id: # Channel messages don't have a from_id
return
if event.from_id not in blocked_user_ids:
return
peer = await borg.get_input_entity(event.chat_id)
if isinstance(peer, InputPeerChannel):
o = tlf.channels.ReadMessageContentsRequest(peer, [event.message.id])
else:
o = tlf.messages.ReadMessageContentsRequest([event.message.id])
await borg(o)
@borg.on(events.Raw(types=UpdateUserBlocked))
async def on_blocked(event):
if event.blocked:
blocked_user_ids.add(event.user_id)
else:
blocked_user_ids.discard(event.user_id)
async def fetch_blocked_users():
global blocked_user_ids
while 1:
offset = 0
blocked_ids = set()
while 1:
blocked = await borg(GetBlockedRequest(offset=offset, limit=100))
offset += 100
for contact in blocked.blocked:
blocked_ids.add(contact.user_id)
if not blocked.blocked:
break
blocked_user_ids = blocked_ids
await asyncio.sleep(REFETCH_TIME)
asyncio.ensure_future(fetch_blocked_users())

View File

@ -28,3 +28,12 @@ async def is_read(borg, entity, message, is_out=None):
dialog = (await borg(GetPeerDialogsRequest([entity]))).dialogs[0]
max_id = dialog.read_outbox_max_id if is_out else dialog.read_inbox_max_id
return message_id <= max_id
async def get_target_message(borg, event):
if event.is_reply and (await event.get_reply_message()).from_id == borg.uid:
return await event.get_reply_message()
async for message in borg.iter_messages(
await event.get_input_chat(), limit=20):
if message.out:
return message