Improve Emoji Support (again)

app.py

@@ -36,13 +36,10 @@ unmatched_messages_cache = {}
 message_delete_queue = []
 
 def prepare_matrix_content(message):
-	reg = re.match(r"^<a?:\w+:\d*>$", message.content)
+	reg = re.match(r"^<a?:\w+:(\d+)>$", message.content)
 
 	if reg:
-		try:
-			return emoji_urls[message.content]
-		except:
-			pass
+		return "https://cdn.discordapp.com/emojis/{}.png?size=32".format(reg.group(1))
 
 	attachments = "\n".join([x.url for x in message.attachments])
 	content = message.clean_content + ("\n" + attachments if attachments != "" else "")
@@ -52,7 +49,6 @@ def prepare_matrix_content(message):
 guild = None
 channel = None
 emojis = {}
-emoji_urls = {}
 
 @discord_client.event
 async def on_ready():
@@ -65,10 +61,8 @@ 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):