diff --git a/src/actions/basic.py b/src/actions/basic.py index 44257edd64ef51a2bb6221de2b4f13ce3711d4c3..a62a539b219afc1ba6d341ceacbd758837477bce 100644 --- a/src/actions/basic.py +++ b/src/actions/basic.py @@ -23,11 +23,6 @@ async def ci(event): await event.respond(contents) -@config.telegram_client.on(events.NewMessage(pattern="^.test$")) -async def show_test(event): - await event.respond("[This is an example](https://example.com)") - - @config.telegram_client.on(events.NewMessage(pattern="^.t$")) async def show_time(event): tz = pytz.timezone("Europe/Moscow") @@ -37,7 +32,7 @@ async def show_time(event): await event.respond(f"{current_time.strftime('%Y-%M-%d %H:%M:%S')} MSK") -@config.telegram_client.on(events.NewMessage(pattern=".*@all.*")) +@config.telegram_client.on(events.NewMessage(pattern=".*@all.*", forwards=False)) async def mention_all(event: events.NewMessage.Event): if event.is_group: chat = await event.get_chat() diff --git a/src/actions/fun.py b/src/actions/fun.py index 83a4fe08e25031cc7ce172a0d48cc066bc639732..da9af46cd49820cd8bb9c2e76578d304535d3a1a 100644 --- a/src/actions/fun.py +++ b/src/actions/fun.py @@ -23,7 +23,7 @@ swearing = [ ] -@config.telegram_client.on(events.NewMessage(pattern=r"^\.bl (.*)")) +@config.telegram_client.on(events.NewMessage(pattern=r"^\.bl (.*)", forwards=False)) async def blyaficate(event: events.NewMessage.Event): message = event.pattern_match.group(1).strip() response = "" @@ -45,7 +45,7 @@ async def blyaficate(event: events.NewMessage.Event): await event.reply(response) -@config.telegram_client.on(events.NewMessage(pattern=rf"^({'|'.join(swearing)})\.?$")) +@config.telegram_client.on(events.NewMessage(pattern=rf"^({'|'.join(swearing)})\.?$", forwards=False)) async def swearing_reply(event): await event.reply( random.choice( @@ -68,7 +68,7 @@ async def swearing_reply(event): ) -@config.telegram_client.on(events.NewMessage(from_users=["clockblocker_tests_bot"])) +@config.telegram_client.on(events.NewMessage(from_users=["clockblocker_tests_bot"], forwards=False)) async def lenochka_reply(event: events.NewMessage.Event): await event.reply( random.choice( diff --git a/src/actions/replies.py b/src/actions/replies.py index c5f1d4aa120d3bb87211ccd901738956b5e9a07b..aa16ac8d895ba95cafb4bac4c60af9df20ae10bd 100644 --- a/src/actions/replies.py +++ b/src/actions/replies.py @@ -18,7 +18,21 @@ async def welcome(event: events.ChatAction.Event): [ "До Ñкорых вÑтреч!", "Прощайте!", - "Он был из тех, кто проÑто любил чатики.", + "До ÑвиданиÑ!", + "Пока!", ] ) ) + + +@config.telegram_client.on(events.NewMessage(pattern=r"^(П|п)ривет\.?", forwards=False)) +async def hello(event): + await event.respond( + random.choice( + [ + "Привет!", + "Добрый день!", + "Добрейший вечерочек!", + ] + ) + ) diff --git a/src/server_app.py b/src/server_app.py index cb9c2629ad33ba0c81097d1b32d8d34f17690ac9..050011b7d53f7a93076dcdba0a1b441c23f3cabb 100644 --- a/src/server_app.py +++ b/src/server_app.py @@ -1,5 +1,6 @@ import logging import random +import uuid from flask import Flask, render_template, request, send_file, current_app @@ -9,7 +10,11 @@ logger = logging.getLogger(__name__) def form_template(): - return render_template("index.html", activated=current_app.activated) + context = { + 'activated': current_app.activated, + 'cash_dropper': str(uuid.uuid4()) + } + return render_template("index.html", **context) def girl_image(): diff --git a/src/templates/index.html b/src/templates/index.html index 15963c0f3fedca9e4892225e0dc75d71ea44e2da..b2035861f7b22dcc2793cc997194813e56ca72b3 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -87,7 +87,7 @@ Just write a message to <a href="tg://resolve?domain=s3rius_san">@s3rius_san</a> in telegram. </div> {% endif %} -<img src="/girl.png" alt="" class="at_bottom"> +<img src="/girl.png?id={{cash_dropper}}" alt="" class="at_bottom"> </body> <script> function sendData() {