This commit is contained in:
git-bruh 2021-01-21 12:50:58 +05:30
parent 23f341df1c
commit 397c579a27
No known key found for this signature in database
GPG key ID: E1475C50075ADCE6
2 changed files with 37 additions and 0 deletions

View file

@ -14,6 +14,8 @@ A simple non-puppeting bridge between Matrix and Discord written in Python.
* Normal Discord bot functionality like commands can be added to the bot via [cogs](https://discordpy.readthedocs.io/en/latest/ext/commands/cogs.html), example [here](https://gist.github.com/EvieePy/d78c061a4798ae81be9825468fe146be).
* Apply `use_client_emojis.patch` to make the Discord bot use emojis from all it's servers.
NOTE: [Privileged Intents](https://discordpy.readthedocs.io/en/latest/intents.html#privileged-intents) must be enabled for your Discord bot.
## What Works

35
use_client_emojis.patch Normal file
View file

@ -0,0 +1,35 @@
diff --git a/main.py b/main.py
index 53dc289..9acbb43 100644
--- a/main.py
+++ b/main.py
@@ -56,7 +56,7 @@ class MatrixClient(nio.AsyncClient):
await self.sync(timeout)
# Set up event callbacks
- 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):
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:
if emote not in added_emotes:
added_emotes.append(emote)
- emote_ = discord.utils.get(guild.emojis, name=emote)
+ emote_ = discord.utils.get(
+ self.discord_client.emojis, name=emote
+ )
if emote_:
message = message.replace(f":{emote}:", str(emote_))