diff --git a/extensions/base/abusefilter.py b/extensions/base/abusefilter.py index 5a23937..a9201b3 100644 --- a/extensions/base/abusefilter.py +++ b/extensions/base/abusefilter.py @@ -19,7 +19,7 @@ import datetime from src.discord.message import DiscordMessage from src.api import formatter from src.api.context import Context -from src.api.util import embed_helper, sanitize_to_url, parse_mediawiki_changes, clean_link, compact_author, \ +from src.api.util import embed_helper, sanitize_to_url, clean_link, compact_author, \ sanitize_to_markdown, compact_summary # Order results from most drastic first to less drastic last diff --git a/extensions/base/approvedrevs.py b/extensions/base/approvedrevs.py index 61c7b7c..6fded5f 100644 --- a/extensions/base/approvedrevs.py +++ b/extensions/base/approvedrevs.py @@ -28,7 +28,7 @@ def embed_approval_approvefile(ctx: Context, change: dict): embed_helper(ctx, embed, change) embed["url"] = ctx.client.create_article_path(sanitize_to_url(change["title"])) embed["title"] = ctx._("Approved a file revision of {file}").format(file=sanitize_to_markdown(change["title"])) - link_parser_object = LinkParser() + link_parser_object = LinkParser(ctx.client.WIKI_JUST_DOMAIN) link_parser_object.feed(change.get("logparams", {}).get("0", "")) embed["description"] = ctx._("File version from {time} got approved").format(name=change["title"], time=link_parser_object.new_string) # TODO Make timestamp more user friendly? Getting user who uploaded will be a pain though, same with approval/approve diff --git a/extensions/base/managewiki.py b/extensions/base/managewiki.py index 57ab639..f63c12a 100644 --- a/extensions/base/managewiki.py +++ b/extensions/base/managewiki.py @@ -73,7 +73,7 @@ def embed_managewiki_delete_group(ctx: Context, change: dict) -> DiscordMessage: embed_helper(ctx, embed, change) embed["url"] = ctx.client.create_article_path(sanitize_to_url(change["title"])) group = change["title"].split("/")[-1] - embed["title"] = ctx._("Deleted a \"{group}\" user group").format(wiki=group) + embed["title"] = ctx._("Deleted a \"{group}\" user group").format(group=group) return embed diff --git a/src/misc.py b/src/misc.py index 3a76124..46d764f 100644 --- a/src/misc.py +++ b/src/misc.py @@ -346,6 +346,10 @@ class LinkParser(HTMLParser): new_string = "" recent_href = "" + def __init__(self, DOMAIN_URL: str): + self.WIKI_JUST_DOMAIN = DOMAIN_URL + super().__init__() + def handle_starttag(self, tag, attrs): for attr in attrs: if attr[0] == 'href': @@ -353,12 +357,12 @@ class LinkParser(HTMLParser): if self.recent_href.startswith("//"): self.recent_href = "https:{rest}".format(rest=self.recent_href) elif not self.recent_href.startswith("http"): - self.recent_href = WIKI_JUST_DOMAIN + self.recent_href + self.recent_href = self.WIKI_JUST_DOMAIN + self.recent_href self.recent_href = self.recent_href.replace(")", "\\)") elif attr[0] == 'data-uncrawlable-url': self.recent_href = attr[1].encode('ascii') self.recent_href = base64.b64decode(self.recent_href) - self.recent_href = WIKI_JUST_DOMAIN + self.recent_href.decode('ascii') + self.recent_href = self.WIKI_JUST_DOMAIN + self.recent_href.decode('ascii') def handle_data(self, data): if self.recent_href: