From b3698cfa70b044a9fd2022ce4ad5046f82c055c1 Mon Sep 17 00:00:00 2001 From: Profitroll <47523801+profitrollgame@users.noreply.github.com> Date: Sat, 18 Feb 2023 00:55:58 +0100 Subject: [PATCH] Added support for duplicates access tokens --- modules/api_client.py | 4 ++-- plugins/callbacks/submission.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/api_client.py b/modules/api_client.py index 311acaf..e653e0f 100644 --- a/modules/api_client.py +++ b/modules/api_client.py @@ -63,8 +63,8 @@ async def upload_pic(filepath: str, token: Union[str, None] = None) -> Tuple[boo raise SubmissionUploadError(str(filepath), response.status_code, response.content) duplicates = [] if "duplicates" in response.json(): - for duplicate in response.json()["duplicates"]: - duplicates.append(f'{configGet("address_external", "posting", "api")}/photos/{duplicate["id"]}') + for index, duplicate in enumerate(response.json()["duplicates"]): + duplicates.append(f'`{duplicate["id"]}`:\n{configGet("address_external", "posting", "api")}/token/photo/{response.json()["access_token"]}?id={index}') return True, duplicates except: return False, [] diff --git a/plugins/callbacks/submission.py b/plugins/callbacks/submission.py index e8420bb..4e15b6b 100644 --- a/plugins/callbacks/submission.py +++ b/plugins/callbacks/submission.py @@ -28,7 +28,7 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery): return except SubmissionDuplicatesError as exp: await clb.answer(text=locale("sub_duplicates_found", "callback", locale=user_locale), show_alert=True) - await clb.message.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(exp.duplicates)), quote=True) + await clb.message.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(exp.duplicates)), disable_web_page_preview=True, quote=True) return if submission is not None: