Improve emoji support

app.py

@@ -36,13 +36,23 @@ unmatched_messages_cache = {}
 message_delete_queue = []
 
 def prepare_matrix_content(message):
+	reg = re.match(r"^<a?:\w+:\d*>$", message.content)
+
+	if reg:
+		try:
+			return emoji_urls[message.content]
+		except:
+			pass
+
 	attachments = "\n".join([x.url for x in message.attachments])
 	content = message.clean_content + ("\n" + attachments if attachments != "" else "")
+	content = re.sub(r"<a?(:\w+:)\d*>", r"\g<1>", content)
 	return content
 
 guild = None
 channel = None
 emojis = {}
+emoji_urls = {}
 
 @discord_client.event
 async def on_ready():
@@ -55,8 +65,10 @@ async def on_ready():
 	for emoji in guild.emojis:
 		if not emoji.animated:
 			emojis[":{}:".format(emoji.name)] = "<:{}:{}>".format(emoji.name, emoji.id)
+			emoji_urls["<:{}:{}>".format(emoji.name, emoji.id)] = emoji.url + "?size=32"
 		else:
 			emojis[":{}:".format(emoji.name)] = "<a:{}:{}>".format(emoji.name, emoji.id)
+			emoji_urls["<a:{}:{}>".format(emoji.name, emoji.id)] = emoji.url + "?size=32"
 
 @discord_client.event
 async def on_message(message):