Frisk/RcGcDb
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDb.git synced 2025-02-23 00:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move compact emoji to class

Browse source
This commit is contained in:
Markus-Rost 2020-12-13 22:01:51 +01:00
parent 88b22457a2
commit 546ccc0ada
5 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
settings.json.example
View file

@ -456,6 +456,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,
@ -500,6 +505,16 @@
"icon": "", "icon": "",
"color": 0, "color": 0,
"emoji": "❓" "emoji": "❓"
},
"webhook/remove": {
"icon": "https://raw.githubusercontent.com/Markus-Rost/discord-wiki-bot/master/dashboard/src/icon.png",
"color": 0,
"emoji": "<:wikibot:588723255972593672>"
},
"bot/exception": {
"icon": "https://raw.githubusercontent.com/Markus-Rost/discord-wiki-bot/master/dashboard/src/icon.png",
"color": 0,
"emoji": "<:wikibot:588723255972593672>"
} }
} }
} }

2
src/config.py
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 "user-agent" in settings["header"]: if "user-agent" in settings["header"]:
settings["header"]["user-agent"] = settings["header"]["user-agent"].format(version="1.0") # set the version in the useragent settings["header"]["user-agent"] = settings["header"]["user-agent"].format(version="1.0") # set the version in the useragent

2
src/discord.py
View file

@ -50,6 +50,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.length = len(content) self.length = len(content)

2
src/formatters/discussions.py
View file

@ -71,8 +71,6 @@ async def feeds_compact_formatter(post_type, post, message_target, wiki, article
else: else:
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"]) 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" event_type = "unknown"
if settings["event_appearance"].get(event_type, {"emoji": None})["emoji"]:
message = settings["event_appearance"][event_type]["emoji"] + " " + message
return DiscordMessage("compact", event_type, message_target[1], content=message, wiki=wiki) return DiscordMessage("compact", event_type, message_target[1], content=message, wiki=wiki)

2
src/formatters/rc.py
View file

@ -575,8 +575,6 @@ async def compact_formatter(action, change, parsed_comment, categories, recent_c
else: else:
content = _("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"]) content = _("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" action = "unknown"
if settings["event_appearance"].get(action, {"emoji": None})["emoji"]:
content = settings["event_appearance"][action]["emoji"] + " " + content
return DiscordMessage("compact", action, message_target[1], content=content, wiki=WIKI_SCRIPT_PATH) return DiscordMessage("compact", action, message_target[1], content=content, wiki=WIKI_SCRIPT_PATH)