Move compact emoji to class

This commit is contained in:
Markus-Rost 2020-12-13 22:02:20 +01:00
parent 072e9f524f
commit a1c1a18734
5 changed files with 8 additions and 5 deletions

View file

@ -493,6 +493,11 @@
"color": 1, "color": 1,
"emoji": "👁️" "emoji": "👁️"
}, },
"discussion": {
"icon": "https://static.wikia.nocookie.net/663e53f7-1e79-4906-95a7-2c1df4ebbada",
"color": 54998,
"emoji": "📝"
},
"discussion/forum/post": { "discussion/forum/post": {
"icon": "https://static.wikia.nocookie.net/663e53f7-1e79-4906-95a7-2c1df4ebbada", "icon": "https://static.wikia.nocookie.net/663e53f7-1e79-4906-95a7-2c1df4ebbada",
"color": 54998, "color": 54998,

View file

@ -1,7 +1,7 @@
import json, sys, logging import json, sys, logging
try: # load settings try: # load settings
with open("settings.json") as sfile: with open("settings.json", encoding="utf8") as sfile:
settings = json.load(sfile) settings = json.load(sfile)
if settings["limitrefetch"] < settings["limit"] and settings["limitrefetch"] != -1: if settings["limitrefetch"] < settings["limit"] and settings["limitrefetch"] != -1:
settings["limitrefetch"] = settings["limit"] settings["limitrefetch"] = settings["limit"]

View file

@ -15,6 +15,8 @@ class DiscordMessage:
if message_type == "embed": if message_type == "embed":
self.__setup_embed() self.__setup_embed()
elif message_type == "compact": elif message_type == "compact":
if settings["event_appearance"].get(event_type, {"emoji": None})["emoji"]:
content = settings["event_appearance"][event_type]["emoji"] + " " + content
self.webhook_object["content"] = content self.webhook_object["content"] = content
self.event_type = event_type self.event_type = event_type

View file

@ -82,8 +82,6 @@ def compact_formatter(post_type, post, article_paths):
message = _("Unknown event `{event}` by [{author}]({author_url}), report it on the [support server](<{support}>).").format( message = _("Unknown event `{event}` by [{author}]({author_url}), report it on the [support server](<{support}>).").format(
event=post_type, author=author, author_url=author_url, support=settings["support"]) event=post_type, author=author, author_url=author_url, support=settings["support"])
event_type = "unknown" event_type = "unknown"
if settings["event_appearance"].get(event_type, {"emoji": None})["emoji"]:
message = settings["event_appearance"][event_type]["emoji"] + " " + message
send_to_discord(DiscordMessage("compact", event_type, settings["fandom_discussions"]["webhookURL"], content=message), meta=DiscordMessageMetadata("POST")) send_to_discord(DiscordMessage("compact", event_type, settings["fandom_discussions"]["webhookURL"], content=message), meta=DiscordMessageMetadata("POST"))

View file

@ -664,8 +664,6 @@ def compact_formatter(action, change, parsed_comment, categories, recent_changes
"Unknown event `{event}` by [{author}]({author_url}), report it on the [support server](<{support}>).").format( "Unknown event `{event}` by [{author}]({author_url}), report it on the [support server](<{support}>).").format(
event=action, author=author, author_url=author_url, support=settings["support"]) event=action, author=author, author_url=author_url, support=settings["support"])
action = "unknown" action = "unknown"
if settings["event_appearance"].get(action, {"emoji": None})["emoji"]:
content = settings["event_appearance"][action]["emoji"] + " " + content
send_to_discord(DiscordMessage("compact", action, settings["webhookURL"], content=content), meta=request_metadata) send_to_discord(DiscordMessage("compact", action, settings["webhookURL"], content=content), meta=request_metadata)
def embed_abuselog_formatter(change, recent_changes): def embed_abuselog_formatter(change, recent_changes):