diff --git a/extensions.py b/extensions.py index 1ffcc22..c6ac510 100644 --- a/extensions.py +++ b/extensions.py @@ -1,7 +1,7 @@ import re -def humanize_tags_from_json(value: str, default: str) -> str: +def humanize_tags_from_json(value: str, default: str): if value != "": output = str() tags = value.split() @@ -14,7 +14,7 @@ def humanize_tags_from_json(value: str, default: str) -> str: return default -def format_rating(value: str) -> str | None: +def format_rating(value: str): match value: case "g": # Negative Squared Latin Capital Letter G diff --git a/inline_query.py b/inline_query.py index 3e625a1..d308db3 100644 --- a/inline_query.py +++ b/inline_query.py @@ -1,5 +1,6 @@ from uuid import uuid4 +import requests from telegram import Update, InlineKeyboardButton, InlineQueryResultArticle, InputTextMessageContent, \ InlineKeyboardMarkup from telegram.constants import ParseMode @@ -35,25 +36,6 @@ 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}", @@ -86,10 +68,9 @@ async def invalid_query(update: Update, query: str) -> None: InlineQueryResultArticle( id=str(uuid4()), title=f"ID: {query}", - description="Error", + description="not found.", input_message_content=InputTextMessageContent( - f"ID: {query}\n" - f"That record was not found.", + f"ID: {query}\nrequested post does not exist.", parse_mode=ParseMode.HTML ) ) diff --git a/main.py b/main.py index 5bd891a..4f19837 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() -> None: +def get_token(): if os.getenv("BOT_TOKEN") is not None: return os.getenv("BOT_TOKEN") diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 29bdc4d..0000000 Binary files a/requirements.txt and /dev/null differ