From c11f62da292e79b2e9561c4fd455d5e253a183dd Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Sat, 27 Jun 2020 21:23:29 +0400
Subject: [PATCH] Updated server. Removed actions to forwarded messages.

Signed-off-by: Pavel Kirilin <win10@list.ru>
---
 src/actions/basic.py     |  7 +------
 src/actions/fun.py       |  6 +++---
 src/actions/replies.py   | 16 +++++++++++++++-
 src/server_app.py        |  7 ++++++-
 src/templates/index.html |  2 +-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/actions/basic.py b/src/actions/basic.py
index 44257ed..a62a539 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 83a4fe0..da9af46 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 c5f1d4a..aa16ac8 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 cb9c262..050011b 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 15963c0..b203586 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() {
-- 
GitLab