Browse Source

Improve emoji support

Alex Taber 6 years ago
parent
commit
66aa62a11f
1 changed files with 12 additions and 0 deletions
  1. 12
    0
      app.py

+ 12
- 0
app.py View File

36
 message_delete_queue = []
36
 message_delete_queue = []
37
 
37
 
38
 def prepare_matrix_content(message):
38
 def prepare_matrix_content(message):
39
+	reg = re.match(r"^<a?:\w+:\d*>$", message.content)
40
+
41
+	if reg:
42
+		try:
43
+			return emoji_urls[message.content]
44
+		except:
45
+			pass
46
+
39
 	attachments = "\n".join([x.url for x in message.attachments])
47
 	attachments = "\n".join([x.url for x in message.attachments])
40
 	content = message.clean_content + ("\n" + attachments if attachments != "" else "")
48
 	content = message.clean_content + ("\n" + attachments if attachments != "" else "")
49
+	content = re.sub(r"<a?(:\w+:)\d*>", r"\g<1>", content)
41
 	return content
50
 	return content
42
 
51
 
43
 guild = None
52
 guild = None
44
 channel = None
53
 channel = None
45
 emojis = {}
54
 emojis = {}
55
+emoji_urls = {}
46
 
56
 
47
 @discord_client.event
57
 @discord_client.event
48
 async def on_ready():
58
 async def on_ready():
55
 	for emoji in guild.emojis:
65
 	for emoji in guild.emojis:
56
 		if not emoji.animated:
66
 		if not emoji.animated:
57
 			emojis[":{}:".format(emoji.name)] = "<:{}:{}>".format(emoji.name, emoji.id)
67
 			emojis[":{}:".format(emoji.name)] = "<:{}:{}>".format(emoji.name, emoji.id)
68
+			emoji_urls["<:{}:{}>".format(emoji.name, emoji.id)] = emoji.url + "?size=32"
58
 		else:
69
 		else:
59
 			emojis[":{}:".format(emoji.name)] = "<a:{}:{}>".format(emoji.name, emoji.id)
70
 			emojis[":{}:".format(emoji.name)] = "<a:{}:{}>".format(emoji.name, emoji.id)
71
+			emoji_urls["<a:{}:{}>".format(emoji.name, emoji.id)] = emoji.url + "?size=32"
60
 
72
 
61
 @discord_client.event
73
 @discord_client.event
62
 async def on_message(message):
74
 async def on_message(message):