From ce473db0970806403191075939a96b5e57183eaa Mon Sep 17 00:00:00 2001 From: MarkusRost <2701034-MarkusRost@users.noreply.gitlab.com> Date: Tue, 11 May 2021 16:53:38 +0000 Subject: [PATCH] Ensure unique embeds URLs closes #41 --- src/formatters/discussions.py | 6 +++++- src/formatters/rc.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/formatters/discussions.py b/src/formatters/discussions.py index 156bc88..e62c0f6 100644 --- a/src/formatters/discussions.py +++ b/src/formatters/discussions.py @@ -185,6 +185,10 @@ async def feeds_embed_formatter(post_type, post, message_target, wiki, article_p embed.add_field(_("Report this on the support server"), settings["support"]) else: embed.add_field(_("Report this on the support server"), change_params) + if "?" in embed["url"]: + embed["url"] = embed["url"] + "&_rcid={}".format(post["id"]) + else: + embed["url"] = embed["url"] + "?_rcid={}".format(post["id"]) embed.finish_embed() return embed @@ -271,4 +275,4 @@ class DiscussionsFromHellParser: elif mark["type"] == "em": prefix += "_" suffix = "_" + suffix - return prefix, suffix \ No newline at end of file + return prefix, suffix diff --git a/src/formatters/rc.py b/src/formatters/rc.py index 88b8606..cdce408 100644 --- a/src/formatters/rc.py +++ b/src/formatters/rc.py @@ -1149,5 +1149,9 @@ async def embed_formatter(action, change, parsed_comment, categories, recent_cha new_cat = (_("**Added**: ") + ", ".join(list(categories["new"])[0:16]) + ("\n" if len(categories["new"])<=15 else _(" and {} more\n").format(len(categories["new"])-15))) if categories["new"] else "" del_cat = (_("**Removed**: ") + ", ".join(list(categories["removed"])[0:16]) + ("" if len(categories["removed"])<=15 else _(" and {} more").format(len(categories["removed"])-15))) if categories["removed"] else "" embed.add_field(_("Changed categories"), new_cat + del_cat) + if "?" in embed["url"]: + embed["url"] = embed["url"] + "&_rcid={}".format(change["rcid"]) + else: + embed["url"] = embed["url"] + "?_rcid={}".format(change["rcid"]) embed.finish_embed() return embed