From 88fd76653a279c86bf26916e8f6b52c59b4f89b4 Mon Sep 17 00:00:00 2001 From: Dan Elkouby Date: Fri, 15 Jun 2018 00:09:25 +0300 Subject: [PATCH] Update for newest Telethon master --- stdplugins/all.py | 2 +- stdplugins/headpat.py | 2 +- stdplugins/sed.py | 2 +- uniborg/uniborg.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stdplugins/all.py b/stdplugins/all.py index 65f9528..56fd97a 100644 --- a/stdplugins/all.py +++ b/stdplugins/all.py @@ -6,7 +6,7 @@ from telethon import events @borg.on(events.NewMessage(pattern=r"\.all", outgoing=True)) async def _(event): - if event.forward: + if event.fwd_from: return await event.delete() mentions = "@all" diff --git a/stdplugins/headpat.py b/stdplugins/headpat.py index e7cf3a4..84d88f7 100644 --- a/stdplugins/headpat.py +++ b/stdplugins/headpat.py @@ -17,7 +17,7 @@ oops = "OOPSIE WOOPSIE!! Uwu We madea fucky wucky!! A wittle fucko boingo! " \ @borg.on(events.NewMessage) async def on_pat(event): - if event.forward: + if event.fwd_from: return user = borg.me.username diff --git a/stdplugins/sed.py b/stdplugins/sed.py index fe518a4..e13ab06 100644 --- a/stdplugins/sed.py +++ b/stdplugins/sed.py @@ -81,7 +81,7 @@ async def on_message(event): @borg.on(events.NewMessage( pattern=re.compile(r"^s/((?:\\/|[^/])+)/((?:\\/|[^/])*)(/.*)?"))) async def on_regex(event): - if event.forward: + if event.fwd_from: return if not event.is_private and await group_has_sedbot(await event.input_chat): return diff --git a/uniborg/uniborg.py b/uniborg/uniborg.py index 4f40251..5040b7a 100644 --- a/uniborg/uniborg.py +++ b/uniborg/uniborg.py @@ -38,7 +38,7 @@ class Uniborg(TelegramClient): # precedence self._event_builders = hacks.ReverseList() - self._loop.run_until_complete(self._async_init(bot_token=bot_token)) + self.loop.run_until_complete(self._async_init(bot_token=bot_token)) core_plugin = Path(__file__).parent / "_core.py" self.load_plugin_from_file(core_plugin) @@ -53,7 +53,7 @@ class Uniborg(TelegramClient): self.uid = telethon.utils.get_peer_id(self.me) def run(self): - self._loop.run_forever() + self.loop.run_forever() def load_plugin(self, shortname): self.load_plugin_from_file(f"{self._plugin_path}/{shortname}.py")