diff --git a/src/actions/basic.py b/src/actions/basic.py index 069af73aaea2c7fa3c5b8ece00f49b6afabea861..ddad473c725aa457eee4e081802db06747531db2 100644 --- a/src/actions/basic.py +++ b/src/actions/basic.py @@ -9,7 +9,7 @@ from telethon import events logger = logging.getLogger(__name__) -@config.telegram_client.on(events.NewMessage(pattern="^.h$")) +@config.telegram_client.on(events.NewMessage(pattern=r"^\.h$")) @mark_unread async def show_help(event): with open("./static_messages/help.txt") as f: @@ -17,7 +17,7 @@ async def show_help(event): await event.respond(contents) -@config.telegram_client.on(events.NewMessage(pattern="^.ci")) +@config.telegram_client.on(events.NewMessage(pattern=r"^\.ci$")) @mark_unread async def ci(event): with open("./static_messages/app.info") as f: @@ -25,7 +25,7 @@ async def ci(event): await event.respond(contents) -@config.telegram_client.on(events.NewMessage(pattern="^.t$")) +@config.telegram_client.on(events.NewMessage(pattern=r"^\.t$")) @mark_unread async def show_time(event): tz = pytz.timezone("Europe/Moscow") diff --git a/src/actions/fun.py b/src/actions/fun.py index e93baf33ed7b961c117af736e1f23feef65ba06e..5c32b154d8191cd9574401e0cc583e3a86e6f40e 100644 --- a/src/actions/fun.py +++ b/src/actions/fun.py @@ -112,7 +112,7 @@ async def lenochka_reply(event: events.NewMessage.Event): ) -@config.telegram_client.on(events.NewMessage(pattern="^.rl .*", forwards=False)) +@config.telegram_client.on(events.NewMessage(pattern=r"^\.rl .*", forwards=False)) @mark_unread async def run_rotations(event: events.NewMessage.Event): text = event.message.message.lstrip(".rl").strip() diff --git a/src/actions/speller.py b/src/actions/speller.py index c3cd3c9806e05ce88b5021ac71a7d27371b27527..de6184ce04a2189022eebf1dfbc7927bac3646b6 100644 --- a/src/actions/speller.py +++ b/src/actions/speller.py @@ -7,7 +7,7 @@ from src.utils.responses import mark_unread from src.utils.str_helpers import Rotor, replace_by_index from telethon import events -rotatable_swearing = ["[Бб]лÑ", "[СÑ]ука", "[Ии]ди нахуй", "[Eе]бать"] +rotatable_swearing = ["[Бб]лÑ", "[СÑ]ука", "[Ии]ди нахуй", "[Eе]бать", "[Оо]чко"] rotatable_pattern = f"({'|'.join(rotatable_swearing)})" diff --git a/src/utils/.str_helpers.py@neomake_1228869_3.py b/src/utils/.str_helpers.py@neomake_1228869_3.py deleted file mode 100644 index 2d2e7cd1bd736931b2994e82be836fbbfccfb136..0000000000000000000000000000000000000000 --- a/src/utils/.str_helpers.py@neomake_1228869_3.py +++ /dev/null @@ -1,29 +0,0 @@ -class Rotor: - """ - Class for text rotation. E.G. - abcd - bcda - cdab - ... - """ - - def __init__(self, original, start): - self.original = original - self.start = start - self.rotation = original + " " * len(original) - - @property - def next_rotation(self): - first = self.rotation[0] - self.rotation = self.rotation[1:] + first - return self.rotation - - -def replace_by_index(base, replacement, index): - if index < 0: # add it to the beginning - return replacement + base - if index > len(base): # add it to the end - return base + replacement - replacement_len = len(replacement) - # insert the new string between "slices" of the original - return base[:index] + replacement + base[index + replacement_len :] diff --git a/src/utils/str_helpers.py b/src/utils/str_helpers.py index 28c680a2ebb3e2dca6c2c5242a97ef39a0a5bf27..2da51066500d0312485a8e7f66ff9b84e1dcf7c9 100644 --- a/src/utils/str_helpers.py +++ b/src/utils/str_helpers.py @@ -10,13 +10,13 @@ class Rotor: def __init__(self, original, start): self.original = original self.start = start - self.rotation = original + " " * len(original) + self.rotation = original + " " @property def next_rotation(self): first = self.rotation[0] self.rotation = self.rotation[1:] + first - return self.rotation[: len(self.original)] + return self.rotation[:-1] def replace_by_index(base, replacement, index):