From 8b97a60a34e168619fd6d6158016010f1b24760f Mon Sep 17 00:00:00 2001 From: mctaylors Date: Mon, 10 Mar 2025 00:21:20 +0300 Subject: [PATCH 1/2] refactor: explicitly define parameter types Signed-off-by: mctaylors --- extensions.py | 4 ++-- inline_query.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extensions.py b/extensions.py index 26682fe..c6ac510 100644 --- a/extensions.py +++ b/extensions.py @@ -1,7 +1,7 @@ import re -def humanize_tags_from_json(value, default): +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, default): return default -def format_rating(value): +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 9e6cffc..f2f0cdd 100644 --- a/inline_query.py +++ b/inline_query.py @@ -1,3 +1,4 @@ +from configparser import ConfigParser from uuid import uuid4 import requests @@ -31,7 +32,8 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No await answer_query(update, query, config, data) -async def answer_query(update, query, config, data): +async def answer_query(update: Update, query: str, + config: ConfigParser, data): characters = humanize_tags_from_json(data['tag_string_character'], "no characters") copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright") artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist") @@ -63,7 +65,7 @@ async def answer_query(update, query, config, data): await update.inline_query.answer(results) -async def invalid_query(update, query): +async def invalid_query(update: Update, query: str): results = [ InlineQueryResultArticle( id=str(uuid4()), From 3bbfb7b6922ffdc38b721fe498212dec8f70a120 Mon Sep 17 00:00:00 2001 From: mctaylors Date: Mon, 10 Mar 2025 00:25:35 +0300 Subject: [PATCH 2/2] refactor: use more None type annotations Signed-off-by: mctaylors --- inline_query.py | 4 ++-- main.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inline_query.py b/inline_query.py index f2f0cdd..9a2d43b 100644 --- a/inline_query.py +++ b/inline_query.py @@ -33,7 +33,7 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No async def answer_query(update: Update, query: str, - config: ConfigParser, data): + config: ConfigParser, data) -> None: characters = humanize_tags_from_json(data['tag_string_character'], "no characters") copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright") artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist") @@ -65,7 +65,7 @@ async def answer_query(update: Update, query: str, await update.inline_query.answer(results) -async def invalid_query(update: Update, query: str): +async def invalid_query(update: Update, query: str) -> None: results = [ InlineQueryResultArticle( id=str(uuid4()), diff --git a/main.py b/main.py index 646ece5..49be0a1 100644 --- a/main.py +++ b/main.py @@ -33,7 +33,7 @@ def main() -> None: application.run_polling(allowed_updates=Update.ALL_TYPES) -def validate_config(): +def validate_config() -> None: # noinspection PyBroadException try: response = requests.get(f"https://{config.get('Service', 'Domain')}/profile.json")