year hotfix (#14)

* direction fix * direction fix * extended year & bot not reacts to admin messages * extended year & bot not reacts to admin messages
profcomff · Nov 8, 2022 · 72ed705 · 72ed705
1 parent fafa873
commit 72ed705
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/bot/event_scenarios/layout.py b/bot/event_scenarios/layout.py
@@ -15,7 +15,7 @@
 
 
 def process_event(vk: VkApiMethod, event: Event, **kwargs):
-    if event.type == VkEventType.MESSAGE_NEW and event.from_user:
+    if event.type == VkEventType.MESSAGE_NEW and event.from_user and not event.from_me:
         logger.info(f"processing message from {event.user_id}: {event.text}")
         if change_mode(event.text):
             utils.send_message(

diff --git a/bot/event_scenarios/registry/event_handlers.py b/bot/event_scenarios/registry/event_handlers.py
@@ -29,7 +29,7 @@ def on_mode_change(vk: VkApiMethod) -> None:
     ).json()
     ids = set()
     for user in users:
-        ids.add(int(user["social_web_id"]))
+        ids.add(int(user.get("social_web_id")))
     for user_id in ids:
         utils.on_start_message_button(
             vk,

diff --git a/bot/schemas/models.py b/bot/schemas/models.py
@@ -10,6 +10,8 @@ class Year(str, Enum):
     FOURTH = "4"
     FIFTH = "1м"
     SIXTH = "2м"
+    FIFTH_SPEC = "5"
+    SIXTH_SPEC = "6"
 
 
 class Directions(str, Enum):