From 58d7050dc3c67a642ebc158819efb1ba19b39ef3 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Fri, 16 May 2025 23:36:49 +0300 Subject: [PATCH 01/10] pip: add requirements.txt --- requirements.txt | Bin 0 -> 446 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..29bdc4d881f0eac7284019564fa8abbdb0b9a220 GIT binary patch literal 446 zcmezWFOeaSp^_n!A)mpP!Ir^b zLk2^zsRj&s42BG5aCsHgzTf%F?OSb$9d$!0R7 zFyt{Lg5^MV8bbY3z);Ch!jQp`&ydHU%TU6Q%86}0{{oZ BLDv8P literal 0 HcmV?d00001 From 3518f4bbf025d5fa5f267c75b3ca5fd90773d761 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Fri, 16 May 2025 23:53:11 +0300 Subject: [PATCH 02/10] chore: remove unused imports --- inline_query.py | 1 - 1 file changed, 1 deletion(-) diff --git a/inline_query.py b/inline_query.py index d308db3..a9fba1c 100644 --- a/inline_query.py +++ b/inline_query.py @@ -1,6 +1,5 @@ from uuid import uuid4 -import requests from telegram import Update, InlineKeyboardButton, InlineQueryResultArticle, InputTextMessageContent, \ InlineKeyboardMarkup from telegram.constants import ParseMode From 8909210e2e12561340651e2d2c6c701da6443b6b Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sat, 17 May 2025 00:05:45 +0300 Subject: [PATCH 03/10] fix: add is_banned check --- inline_query.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/inline_query.py b/inline_query.py index a9fba1c..6dd8024 100644 --- a/inline_query.py +++ b/inline_query.py @@ -35,6 +35,25 @@ async def answer_query(update: Update, query: str, data) -> None: copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright") artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist") rating = format_rating(data['rating']) + + if data['is_banned']: + results = [ + InlineQueryResultArticle( + id=str(uuid4()), + title=f"ID: {query}", + description=f"{characters} ({copyrights}) drawn by {artists}", + input_message_content=InputTextMessageContent( + f"ID: {query} {rating}\n" + f"{characters} ({copyrights}) drawn by {artists}\n" + f"This post has been removed because of a takedown request or rule violation.", + parse_mode=ParseMode.HTML + ) + ) + ] + + await update.inline_query.answer(results) + return + keyboard = [ [ InlineKeyboardButton(f"Open in {app.name}", From bd39df5368f6d2a2f4543f2bd878e278df01dc06 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sat, 17 May 2025 00:07:30 +0300 Subject: [PATCH 04/10] i18n: use strings from Danbooru --- inline_query.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inline_query.py b/inline_query.py index 6dd8024..3e625a1 100644 --- a/inline_query.py +++ b/inline_query.py @@ -86,9 +86,10 @@ async def invalid_query(update: Update, query: str) -> None: InlineQueryResultArticle( id=str(uuid4()), title=f"ID: {query}", - description="not found.", + description="Error", input_message_content=InputTextMessageContent( - f"ID: {query}\nrequested post does not exist.", + f"ID: {query}\n" + f"That record was not found.", parse_mode=ParseMode.HTML ) ) From 93e3ca4f96740466842be8a66aa880b7603297a0 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sat, 17 May 2025 23:23:14 +0300 Subject: [PATCH 05/10] refactor: define parameter types *again* --- extensions.py | 4 ++-- main.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions.py b/extensions.py index c6ac510..1ffcc22 100644 --- a/extensions.py +++ b/extensions.py @@ -1,7 +1,7 @@ import re -def humanize_tags_from_json(value: str, default: str): +def humanize_tags_from_json(value: str, default: str) -> str: if value != "": output = str() tags = value.split() @@ -14,7 +14,7 @@ def humanize_tags_from_json(value: str, default: str): return default -def format_rating(value: str): +def format_rating(value: str) -> str | None: match value: case "g": # Negative Squared Latin Capital Letter G diff --git a/main.py b/main.py index 4f19837..5bd891a 100644 --- a/main.py +++ b/main.py @@ -28,7 +28,7 @@ def main() -> None: application.run_polling(allowed_updates=commands.Update.ALL_TYPES) -def get_token(): +def get_token() -> None: if os.getenv("BOT_TOKEN") is not None: return os.getenv("BOT_TOKEN") From 35ea45d9c729ec74d2ead870bce837605e737a0c Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sun, 18 May 2025 10:12:35 +0300 Subject: [PATCH 06/10] fix: set encoding for _c.read Signed-off-by: mctaylors --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 0d97476..c6c1a8b 100644 --- a/config.py +++ b/config.py @@ -4,7 +4,7 @@ from typing import Optional import requests _c = configparser.ConfigParser() -_c.read("config.ini") +_c.read("config.ini", "utf-8") class _General: From 1ce708a40b105862ea1f35390510c7c8e8719d69 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sun, 18 May 2025 10:30:53 +0300 Subject: [PATCH 07/10] change: make return None statement explicit in format_rating Signed-off-by: mctaylors --- extensions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions.py b/extensions.py index 1ffcc22..edc3571 100644 --- a/extensions.py +++ b/extensions.py @@ -28,3 +28,4 @@ def format_rating(value: str) -> str | None: case "e": # Negative Squared Latin Capital Letter E return "🅴" + return None From 735bfdb406103d199dcb319ea4fc5e4522ffe720 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sun, 18 May 2025 11:08:09 +0300 Subject: [PATCH 08/10] feat: use LinkPreviewOptions in answer_query Signed-off-by: mctaylors --- inline_query.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inline_query.py b/inline_query.py index 3e625a1..fa2e71a 100644 --- a/inline_query.py +++ b/inline_query.py @@ -1,7 +1,7 @@ from uuid import uuid4 from telegram import Update, InlineKeyboardButton, InlineQueryResultArticle, InputTextMessageContent, \ - InlineKeyboardMarkup + InlineKeyboardMarkup, LinkPreviewOptions from telegram.constants import ParseMode from telegram.ext import ContextTypes @@ -70,9 +70,9 @@ async def answer_query(update: Update, query: str, data) -> None: thumbnail_url=data['preview_file_url'], input_message_content=InputTextMessageContent( f"ID: {query} {rating}\n" - f"{characters} ({copyrights}) " - f"drawn by {artists}", - parse_mode=ParseMode.HTML + f"{characters} ({copyrights}) drawn by {artists}", + parse_mode=ParseMode.HTML, + link_preview_options=LinkPreviewOptions(url=data['large_file_url']) ), reply_markup=InlineKeyboardMarkup(keyboard) ) From e59ff67176d1a2de6bf613935853c8eb52a8dc37 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sun, 18 May 2025 11:26:51 +0300 Subject: [PATCH 09/10] change: make inline query answer more compact Signed-off-by: mctaylors --- inline_query.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/inline_query.py b/inline_query.py index fa2e71a..a3f19c4 100644 --- a/inline_query.py +++ b/inline_query.py @@ -43,8 +43,7 @@ async def answer_query(update: Update, query: str, data) -> None: title=f"ID: {query}", description=f"{characters} ({copyrights}) drawn by {artists}", input_message_content=InputTextMessageContent( - f"ID: {query} {rating}\n" - f"{characters} ({copyrights}) drawn by {artists}\n" + f"#{query} {characters} ({copyrights}) drawn by {artists} {rating}\n" f"This post has been removed because of a takedown request or rule violation.", parse_mode=ParseMode.HTML ) @@ -69,8 +68,7 @@ async def answer_query(update: Update, query: str, data) -> None: description=f"{characters} ({copyrights}) drawn by {artists}", thumbnail_url=data['preview_file_url'], input_message_content=InputTextMessageContent( - f"ID: {query} {rating}\n" - f"{characters} ({copyrights}) drawn by {artists}", + f"#{query} {characters} ({copyrights}) drawn by {artists} {rating}", parse_mode=ParseMode.HTML, link_preview_options=LinkPreviewOptions(url=data['large_file_url']) ), @@ -88,7 +86,7 @@ async def invalid_query(update: Update, query: str) -> None: title=f"ID: {query}", description="Error", input_message_content=InputTextMessageContent( - f"ID: {query}\n" + f"#{query}\n" f"That record was not found.", parse_mode=ParseMode.HTML ) From 4adfcd316fbfbe0dcd26baa72a45d84dd59b6c73 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Sun, 18 May 2025 11:41:39 +0300 Subject: [PATCH 10/10] refactor: completely rewrite humanize_tags_from_json Signed-off-by: mctaylors --- extensions.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/extensions.py b/extensions.py index edc3571..49b2d1a 100644 --- a/extensions.py +++ b/extensions.py @@ -3,14 +3,7 @@ import re def humanize_tags_from_json(value: str, default: str) -> str: if value != "": - output = str() - tags = value.split() - - for t in tags: - output += f"{re.sub('_\\(.*', '', t)}, " - output = output[:-2] - - return output + return ", ".join([re.sub('_\\(.*', '', t) for t in value.split()]) return default