alemi/aioappsrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
git-bruh 2021-01-24 13:44:41 +05:30 committed by GitHub
parent 2e65c7acae
commit 333e670e0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
use_client_emojis.patch
View file

@ -1,29 +1,29 @@
diff --git a/main.py b/main.py diff --git a/main.py b/main.py
index 53dc289..9acbb43 100644 index 21adf31..31cdd28 100644
--- a/main.py --- a/main.py
+++ b/main.py +++ b/main.py
@@ -56,7 +56,7 @@ class MatrixClient(nio.AsyncClient): @@ -56,7 +56,7 @@ class MatrixClient(nio.AsyncClient):
await self.sync(timeout) await self.sync(timeout)
# Set up event callbacks # Set up event callbacks after syncing once to ignore old messages.
- callbacks = Callbacks(self) - callbacks = Callbacks(self)
+ callbacks = Callbacks(self, discord_client) + callbacks = Callbacks(self, discord_client)
self.add_event_callback( self.add_event_callback(
callbacks.message_callback, callbacks.message_callback,
@@ -320,8 +320,9 @@ class DiscordClient(discord.ext.commands.Bot): @@ -351,8 +351,9 @@ class DiscordClient(discord.ext.commands.Bot):
class Callbacks(object): class Callbacks(object):
- def __init__(self, matrix_client): - def __init__(self, matrix_client):
+ def __init__(self, matrix_client, discord_client): + def __init__(self, matrix_client, discord_client):
self.matrix_client = matrix_client self.matrix_client = matrix_client
+ self.discord_client = discord_client + self.discord_client = discord_client
def get_channel(self, room): def get_channel(self, room):
channel_id = next( channel_id = next(
@@ -450,7 +451,9 @@ class Callbacks(object): @@ -500,7 +501,9 @@ class Callbacks(object):
for emote in emotes: # :emote: becomes <:emote:emote_id>
if emote not in added_emotes: if emote not in added_emotes:
added_emotes.append(emote) added_emotes.append(emote)
- emote_ = discord.utils.get(guild.emojis, name=emote) - emote_ = discord.utils.get(guild.emojis, name=emote)
@ -32,4 +32,3 @@ index 53dc289..9acbb43 100644
+ ) + )
if emote_: if emote_:
message = message.replace(f":{emote}:", str(emote_)) message = message.replace(f":{emote}:", str(emote_))