update
This commit is contained in:
parent
2e65c7acae
commit
333e670e0e
1 changed files with 10 additions and 11 deletions
|
@ -1,29 +1,29 @@
|
|||
diff --git a/main.py b/main.py
|
||||
index 53dc289..9acbb43 100644
|
||||
index 21adf31..31cdd28 100644
|
||||
--- a/main.py
|
||||
+++ b/main.py
|
||||
@@ -56,7 +56,7 @@ class MatrixClient(nio.AsyncClient):
|
||||
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, discord_client)
|
||||
|
||||
|
||||
self.add_event_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):
|
||||
- def __init__(self, matrix_client):
|
||||
+ def __init__(self, matrix_client, discord_client):
|
||||
self.matrix_client = matrix_client
|
||||
+ self.discord_client = discord_client
|
||||
|
||||
|
||||
def get_channel(self, room):
|
||||
channel_id = next(
|
||||
@@ -450,7 +451,9 @@ class Callbacks(object):
|
||||
for emote in emotes:
|
||||
@@ -500,7 +501,9 @@ class Callbacks(object):
|
||||
# :emote: becomes <:emote:emote_id>
|
||||
if emote not in added_emotes:
|
||||
added_emotes.append(emote)
|
||||
- emote_ = discord.utils.get(guild.emojis, name=emote)
|
||||
|
@ -32,4 +32,3 @@ index 53dc289..9acbb43 100644
|
|||
+ )
|
||||
if emote_:
|
||||
message = message.replace(f":{emote}:", str(emote_))
|
||||
|
||||
|
|
Loading…
Reference in a new issue