0.0.8-newage

api/webhook.py

@@ -1,11 +1,19 @@
-from tgbot.config import WEBHOOK, FEEDBACK_CHAT_ID # init storage there
-from tgbot.handlers import handle_feedback, handle_answer, \
-    handle_join, handle_left, handle_button, handle_join_request, \
-        handle_graph
-from tgbot.api import register_webhook
 from sanic import Sanic
 from sanic.response import text
 
+from tgbot.config import WEBHOOK, FEEDBACK_CHAT_ID
+
+from tgbot.handlers.handle_feedback import handle_feedback, handle_answer
+from tgbot.handlers.handle_members_change import handle_join, handle_left
+from tgbot.handlers.handle_join_request import handle_join_request
+from tgbot.handlers.handle_default import handle_default
+from tgbot.handlers.command_my import handle_command_my
+from tgbot.handlers.command_graph import handle_command_graph
+from tgbot.handlers.callback_vouch import handle_button
+from tgbot.handlers.callback_unlink import handle_unlink
+
+from tgbot.api import register_webhook
+
 
 app = Sanic()
 app.config.REGISTERED = False
@@ -13,14 +21,15 @@ app.config.REGISTERED = False
 
 @app.route('/', methods=["GET"])
 async def register(req):
+    res = 'skipped'
     if not app.config.REGISTERED:
         r = register_webhook(WEBHOOK)
-        print(f'\n\t\t\tWEBHOOK REGISTERED:\n{r.json()}')
+        print(f'\n\t\t\tWEBHOOK REGISTERED:\n{r}')
         app.config.REGISTERED = True
-        print(r.json())
-        return text('ok')
-    return text('skipped')
-
+        print(r)
+        res = 'ok'
+    return text(res)
+        
 
 @app.post('/')
 async def handle(req):
@@ -28,25 +37,45 @@ async def handle(req):
     try:
         update = req.json
         print(update)
-        if 'message' in update:
-            msg = update.get('message', update.get('edited_message'))
-            if msg['chat']['type'] == 'private':
-                handle_feedback(msg)
+
+        # видимые сообщения
+        msg = update.get('message', update.get('edited_message'))
+        if msg:
+            if msg['chat']['id'] == msg['from']['id']:
+                if msg['text'] == '/my':
+                    handle_command_my(msg)
+                else:
+                    handle_feedback(msg)
             elif str(msg['chat']['id']) == FEEDBACK_CHAT_ID:
                 if 'reply_to_message' in msg:
                     handle_answer(msg)
                 elif 'text' in msg and msg['text'] == '/graph':
-                    handle_graph(msg)
+                    await handle_command_graph(msg)
+            elif 'new_chat_member' in msg:
+                handle_join(msg)
+            elif 'left_chat_member' in msg:
+                handle_left(msg)
             else:
-                if 'new_chat_member' in msg:
-                    handle_join(msg)
-                elif 'left_chat_member' in msg:
-                    handle_left(msg)
+                handle_default(msg)
+
+        # кнопки
         elif 'callback_query' in update:
-            handle_button(update['callback_query'])
+            data = update['callback_query']['data']
+            if data.startswith(BUTTON_VOUCH):
+                handle_button(update['callback_query'])
+            elif data.startswith('unlink'):
+                handle_unlink(update['callback_query'])
+
+        # заявки
         elif 'chat_join_request' in update:
             print('chat join request')
-            handle_join_request(update)
+            handle_join_request(update['chat_join_request'])
+        
+        # wtf
+        else:
+            print('UNHANDLED EVENT')
+
+    
     except Exception:
         import traceback
         traceback.print_exc()