From 80bab1c7e6d89d8620d053067bb67f778ba52afb Mon Sep 17 00:00:00 2001 From: Frisk Date: Fri, 27 Mar 2020 16:06:14 +0100 Subject: [PATCH] Added #104, changed example wiki --- rcgcdw.py | 11 +++++++---- settings.json.example | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rcgcdw.py b/rcgcdw.py index 8630e32..c537263 100644 --- a/rcgcdw.py +++ b/rcgcdw.py @@ -612,7 +612,7 @@ def embed_formatter(action, change, parsed_comment, categories): img_info = next(iter(urls.values()))["imageinfo"] for num, revision in enumerate(img_info): if revision["timestamp"] == change["logparams"]["img_timestamp"]: # find the correct revision corresponding for this log entry - embed["image"]["url"] = "{rev}?{cache}".format(rev=revision["url"], cache=int(time.time()*5)) # cachebusting + image_direct_url = "{rev}?{cache}".format(rev=revision["url"], cache=int(time.time()*5)) # cachebusting additional_info_retrieved = True break except KeyError: @@ -630,7 +630,9 @@ def embed_formatter(action, change, parsed_comment, categories): undolink = "{wiki}index.php?title={filename}&action=revert&oldimage={archiveid}".format( wiki=WIKI_SCRIPT_PATH, filename=article_encoded, archiveid=revision["archivename"]) embed["fields"] = [{"name": _("Options"), "value": _("([preview]({link}) | [undo]({undolink}))").format( - link=embed["image"]["url"], undolink=undolink)}] + link=image_direct_url, undolink=undolink)}] + if settings["appearance"]["embed"]["embed_images"]: + embed["image"]["url"] = image_direct_url if action == "upload/overwrite": embed["title"] = _("Uploaded a new version of {name}").format(name=change["title"]) elif action == "upload/revert": @@ -667,8 +669,9 @@ def embed_formatter(action, change, parsed_comment, categories): parsed_comment += _("\nLicense: {}").format(license) if additional_info_retrieved: embed["fields"] = [ - {"name": _("Options"), "value": _("([preview]({link}))").format(link=embed["image"]["url"])}] - + {"name": _("Options"), "value": _("([preview]({link}))").format(link=image_direct_url)}] + if settings["appearance"]["embed"]["embed_images"]: + embed["image"]["url"] = image_direct_url elif action == "delete/delete": link = create_article_path(change["title"].replace(" ", "_")) embed["title"] = _("Deleted page {article}").format(article=change["title"]) diff --git a/settings.json.example b/settings.json.example index 9cb379d..8b7213c 100644 --- a/settings.json.example +++ b/settings.json.example @@ -1,6 +1,6 @@ { "cooldown": 60, - "wiki_url": "https://ucp-rail-test.fandom.com/pl/", + "wiki_url": "https://wreckit-woodhouse.fandom.com/", "lang": "en", "header": { "user-agent": "RcGcDw/{version}" @@ -58,6 +58,7 @@ "embed": { "show_edit_changes": false, "show_footer": true, + "embed_images": true, "daily_overview": { "color": 16312092, "icon":""