diff --git a/settings.json.example b/settings.json.example index aff9b2b..6971898 100644 --- a/settings.json.example +++ b/settings.json.example @@ -493,6 +493,11 @@ "color": 1, "emoji": "👁️" }, + "discussion": { + "icon": "https://static.wikia.nocookie.net/663e53f7-1e79-4906-95a7-2c1df4ebbada", + "color": 54998, + "emoji": "📝" + }, "discussion/forum/post": { "icon": "https://static.wikia.nocookie.net/663e53f7-1e79-4906-95a7-2c1df4ebbada", "color": 54998, diff --git a/src/configloader.py b/src/configloader.py index cd0c83d..50fa9c6 100644 --- a/src/configloader.py +++ b/src/configloader.py @@ -1,7 +1,7 @@ import json, sys, logging try: # load settings - with open("settings.json") as sfile: + with open("settings.json", encoding="utf8") as sfile: settings = json.load(sfile) if settings["limitrefetch"] < settings["limit"] and settings["limitrefetch"] != -1: settings["limitrefetch"] = settings["limit"] diff --git a/src/discord/message.py b/src/discord/message.py index c781af9..dac9cae 100644 --- a/src/discord/message.py +++ b/src/discord/message.py @@ -15,6 +15,8 @@ class DiscordMessage: if message_type == "embed": self.__setup_embed() 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.event_type = event_type diff --git a/src/discussion_formatters.py b/src/discussion_formatters.py index 5c292fc..1e241c8 100644 --- a/src/discussion_formatters.py +++ b/src/discussion_formatters.py @@ -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( event=post_type, author=author, author_url=author_url, support=settings["support"]) 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")) diff --git a/src/rc_formatters.py b/src/rc_formatters.py index 4424ba9..03176a8 100644 --- a/src/rc_formatters.py +++ b/src/rc_formatters.py @@ -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( event=action, author=author, author_url=author_url, support=settings["support"]) 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) def embed_abuselog_formatter(change, recent_changes):