From c4f65650b977dd193524f92b5ceb5915a1db792b Mon Sep 17 00:00:00 2001 From: Von Random Date: Sat, 9 Nov 2024 22:01:38 +0200 Subject: [PATCH] some cosmetics and case statements --- pgbotlib/api.py | 19 +++++++++---------- pgbotlib/cron.py | 1 + pgbotlib/misc.py | 8 ++++++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pgbotlib/api.py b/pgbotlib/api.py index 7172c6d..28f5909 100644 --- a/pgbotlib/api.py +++ b/pgbotlib/api.py @@ -1,5 +1,3 @@ -""" Some functions for api calls """ - import json import random import re @@ -31,14 +29,15 @@ class ApiWrapper: # this could have used match - case statement, but python 3.9 def call(self, api: str, data: typing.Union[str, None], message: str) -> str: - if api == 'img_url': return self.format_img(data) - elif api == 'gif': return self.get_gif() - elif api == 'kmp': return self.get_kmp() - elif api == 'fga': return self.get_fga() - elif api == 'fakenews': return self.get_fakenews() - elif api == 'anek': return self.get_anek() - elif api == 'y_search': return self.y_search(message) - return self.FAILED + match api: + case 'img_url': return self.format_img(data) + case 'gif': return self.get_gif() + case 'kmp': return self.get_kmp() + case 'fga': return self.get_fga() + case 'fakenews': return self.get_fakenews() + case 'anek': return self.get_anek() + case 'y_search': return self.y_search(message) + case _: return self.FAILED def __sanitize_search(self, message: str) -> str: """Removes one of each of the search tokens from the query diff --git a/pgbotlib/cron.py b/pgbotlib/cron.py index 01cdb25..de84104 100644 --- a/pgbotlib/cron.py +++ b/pgbotlib/cron.py @@ -30,6 +30,7 @@ class Cron: def __mkjob(self, job: dict) -> callable: tokens = frozenset(job['tokens'].split(',')) + async def send_message() -> None: if 'rand' in job: wait_seconds = random.randint(0, job['rand']) * 60 diff --git a/pgbotlib/misc.py b/pgbotlib/misc.py index 47eda4a..d7181f9 100644 --- a/pgbotlib/misc.py +++ b/pgbotlib/misc.py @@ -32,10 +32,14 @@ class MiscReactor: def spawn_edited_handler(self, client: telethon.TelegramClient, - trigger: telethon.events.common.EventBuilder) -> None: + trigger: telethon.events.common.EventBuilder + ) -> None: @client.on(trigger) async def handle_edited_message(event): sender = await event.get_sender() sender_name = self.namegen.get_name(sender) chat_id = event.message.peer_id - await client.send_message(chat_id, f'Я всё видел! {sender_name} совсем охуел, сообщения правит!') + await client.send_message( + chat_id, + f'Я всё видел! {sender_name} совсем охуел, сообщения правит!' + )