dokku-comp

bot/handlers/callback_unlink.py

@@ -3,52 +3,53 @@ from bot.handlers.command_my import handle_command_my
 from bot.utils.mention import userdata_extract
 from bot.storage import Profile
 
-# remove link of callback sender 
+
+# remove link of callback sender
 # from member vouched before
-def handle_unlink(payload):
-    print('handle unlink button pressed or command, private chat only')
-    
-    from_id = str(payload['from']['id'])
-    linked_id = ''
-    if 'data' in payload:
-        linked_id = str(payload['data'].replace('unlink', ''))
-    elif 'text' in payload:
-        linked_id = str(payload['text'].replace('/unlink ', ''))
+async def handle_unlink(payload):
+    print("handle unlink button pressed or command, private chat only")
+
+    from_id = str(payload["from"]["id"])
+    linked_id = ""
+    if "data" in payload:
+        linked_id = str(payload["data"].replace("unlink", ""))
+    elif "text" in payload:
+        linked_id = str(payload["text"].replace("/unlink ", ""))
 
     # удаляем связь с потомком
     actor = Profile.get(from_id, payload)
-    actor['children'].remove(str(linked_id))
+    actor["children"].remove(str(linked_id))
     Profile.save(actor)
 
     # удаляем связь с предком
     linked = Profile.get(linked_id)
-    linked['parents'].remove(str(from_id))
+    linked["parents"].remove(str(from_id))
     Profile.save(linked)
 
-    
     # удаляем старое сообщение с кнопками-unlink
-    reply_msg_id = payload['message']['message_id']
-    r = delete_message(from_id, reply_msg_id)
+    reply_msg_id = payload["message"]["message_id"]
+    r = await delete_message(from_id, reply_msg_id)
     print(r)
-     
-    # если ещё есть связи - посылаем новое сообщение                                                    
-    if len(actor['children']) > 0:
-        handle_command_my(payload)
 
-    lang = payload['from'].get('language_code', 'ru')
-    for chat_id in linked['chats']:
-        
+    # если ещё есть связи - посылаем новое сообщение
+    if len(actor["children"]) > 0:
+        await handle_command_my(payload)
+
+    lang = payload["from"].get("language_code", "ru")
+    for chat_id in linked["chats"]:
         # если больше никто не поручился - kick out
-        if len(linked['parents']) == 0:
-            r = kick_member(chat_id, linked_id)
+        if len(linked["parents"]) == 0:
+            r = await kick_member(chat_id, linked_id)
             print(r)
-            if r['ok']:
-                _, identity, username = userdata_extract(linked['result']['user'])
-                body = ('Участник %s%s был удалён' if lang == 'ru' else 'Member %s%s was deleted') % (identity, username)
-                r = send_message(chat_id, body)
+            if r["ok"]:
+                _, identity, username = userdata_extract(linked["result"]["user"])
+                body = (
+                    "Участник %s%s был удалён"
+                    if lang == "ru"
+                    else "Member %s%s was deleted"
+                ) % (identity, username)
+                r = await send_message(chat_id, body)
                 print(r)
 
         # обновление счётчика
         update_button(linked_id, chat_id)
-    
-            

bot/handlers/callback_vouch.py

@@ -1,66 +1,65 @@
-from bot.api import send_message, forward_message, delete_message, \
-    approve_chat_join_request, edit_replymarkup, get_chat
+from bot.api import (
+    send_message,
+    forward_message,
+    delete_message,
+    approve_chat_join_request,
+    edit_replymarkup,
+    get_chat,
+)
 from bot.storage import Profile, storage
 
 
-def update_button(chat_id, member_id, text='❤️'):
-    button_message_id = storage.get(f'btn-{chat_id}-{member_id}')
-    print(f'button_message_id: {button_message_id}')
+async def update_button(chat_id, member_id, text="❤️"):
+    button_message_id = storage.get(f"btn-{chat_id}-{member_id}")
+    print(f"button_message_id: {button_message_id}")
     if button_message_id:
-        button_message_id = button_message_id.decode('utf-8')
-        print(f'button_message_id: {button_message_id}')
-        print('update reply markup')
+        button_message_id = button_message_id.decode("utf-8")
+        print(f"button_message_id: {button_message_id}")
+        print("update reply markup")
         newcomer = Profile.get(member_id)
-        amount = len(newcomer['parents']) + 1
-        text += f' {amount}'
+        amount = len(newcomer["parents"]) + 1
+        text += f" {amount}"
         rm = {
-            "inline_keyboard": [
-                [
-                    {
-                        "text": text, 
-                        "callback_data": 'vouch' + member_id
-                    }
-                ]
-            ]
+            "inline_keyboard": [[{"text": text, "callback_data": "vouch" + member_id}]]
         }
-        r = edit_replymarkup(chat_id, button_message_id, reply_markup=rm)
+        r = await edit_replymarkup(chat_id, button_message_id, reply_markup=rm)
         print(r)
 
 
-def handle_button(callback_query):
+async def handle_button(callback_query):
     # получаем профиль нажавшего кнопку
-    actor_id = str(callback_query['from']['id'])
+    actor_id = str(callback_query["from"]["id"])
     actor = Profile.get(actor_id, callback_query)
 
-    callback_data = callback_query['data']
-    if callback_data.startswith('vouch'):
-        print(f'button pressed by {actor_id}')
+    callback_data = callback_query["data"]
+    if callback_data.startswith("vouch"):
+        print(f"button pressed by {actor_id}")
 
         newcomer_id = callback_data[5:]
-        print(f'button pressed for {newcomer_id}')
+        print(f"button pressed for {newcomer_id}")
 
         newcomer = Profile.get(newcomer_id)
-        print(f'newcomer profile {newcomer}')
+        print(f"newcomer profile {newcomer}")
         if newcomer_id == actor_id:
             # нажал сам, не реагируем, прописываем данные
-            newcomer = Profile.get(newcomer_id, callback_query)
+            _newcomer = Profile.get(newcomer_id, callback_query)
         else:
-                # нажал кто-то другой
+            # нажал кто-то другой
 
-                if str(actor_id) not in newcomer['parents']:
-                    print(f'save parent for {newcomer_id}')
-                    newcomer['parents'].append(str(actor_id))
-                    Profile.save(newcomer)
+            if str(actor_id) not in newcomer["parents"]:
+                print(f"save parent for {newcomer_id}")
+                newcomer["parents"].append(str(actor_id))
+                Profile.save(newcomer)
 
-                if str(newcomer_id) not in actor['children']:
-                    print(f'save child for {actor_id}')
-                    actor['children'].append(str(newcomer_id))
-                    Profile.save(actor)
+            if str(newcomer_id) not in actor["children"]:
+                print(f"save child for {actor_id}")
+                actor["children"].append(str(newcomer_id))
+                Profile.save(actor)
 
-                chat_id = str(callback_query['message']['chat']['id'])
+            chat_id = str(callback_query["message"]["chat"]["id"])
 
-                print('accept join request')
-                r = approve_chat_join_request(chat_id, newcomer_id)
-                print(r)
+            print("accept join request")
+            r = await approve_chat_join_request(chat_id, newcomer_id)
+            print(r)
 
-                update_button(chat_id, newcomer_id)
+            await update_button(chat_id, newcomer_id)

bot/handlers/command_ask.py

@@ -2,16 +2,17 @@ from bot.storage import Profile
 from bot.handlers.send_button import show_request_msg
 from bot.api import get_member
 
+
 def handle_command_ask(msg):
-    print('handling request resend')
-    _cmd, chat_id, member_id = msg['text'].split(' ')
-    chat_id = chat_id.replace('-', '-100')
-    r = get_member(chat_id, member_id)
+    print("handling request resend")
+    _cmd, chat_id, member_id = msg["text"].split(" ")
+    chat_id = chat_id.replace("-", "-100")
+    r = await get_member(chat_id, member_id)
     print(r)
     m = {}
-    if 'result' in r:
-        m['from'] = r['result']['user']
-        m['chat'] = { 'id': str(chat_id) }
-        show_request_msg(m)
-    elif 'error_code' in r:
-        print(r)
+    if "result" in r:
+        m["from"] = r["result"]["user"]
+        m["chat"] = {"id": str(chat_id)}
+        await show_request_msg(m)
+    elif "error_code" in r:
+        print(r)

bot/handlers/command_graph.py

@@ -5,8 +5,8 @@ import json
 
 
 async def handle_command_graph(msg):
-    usr_ids, members = scan(match='usr-*', count=100)
+    _usr_ids, members = scan(match="usr-*", count=100)
     data = generate_chart(members)
     if data:
-        r = await send_document(msg['chat']['id'], data, 'chart.svg')
+        r = await send_document(msg["chat"]["id"], data, "chart.svg")
         print(r)

bot/handlers/command_my.py

@@ -3,64 +3,69 @@ from bot.api import get_member, send_message, get_chat_administrators
 from bot.utils.mention import userdata_extract
 
 
-def construct_unlink_buttons(actor):
+async def construct_unlink_buttons(actor):
     buttons = []
-    for vouch in actor['children']:
-        for chat_id in actor['chats']:
-            r = get_member(chat_id, vouch)
-            member = r['result']['user']
-            uid, identity, username = userdata_extract(member)
-            buttons.append({
-                'text': f'{identity} {username}',
-                'callback_data': 'unlink' + vouch
-            })
+    for vouch in actor["children"]:
+        for chat_id in actor["chats"]:
+            r = await get_member(chat_id, vouch)
+            member = r["result"]["user"]
+            _uid, identity, username = userdata_extract(member)
+            buttons.append(
+                {"text": f"{identity} {username}", "callback_data": "unlink" + vouch}
+            )
     return buttons
 
 
-def handle_command_my(msg, state):
-    print('handle my command')
-    from_id = str(msg['from']['id'])
+async def handle_command_my(msg, state):
+    print("handle my command")
+    from_id = str(msg["from"]["id"])
     sender = Profile.get(from_id, msg)
 
-    handle_command_owner_my(msg)
+    await handle_command_owner_my(msg)
 
     # генерируем кнопки для всех, за кого поручились
-    buttons = construct_unlink_buttons(sender)
-    reply_markup = { "inline_keyboard": [ buttons, ] }
+    buttons = await construct_unlink_buttons(sender)
+    reply_markup = {
+        "inline_keyboard": [
+            buttons,
+        ]
+    }
     if len(buttons) == 0:
-        if msg['from'].get('language_code', 'ru') == 'ru':
-            body = 'Вас ещё никто не узнал? Напишите, я передам нашему кругу'
+        if msg["from"].get("language_code", "ru") == "ru":
+            body = "Вас ещё никто не узнал? Напишите, я передам нашему кругу"
         else:
-            body = 'Nobody recognized you? Speak, I will pass your message to the circle'
-        r = send_message(from_id, body)
+            body = (
+                "Nobody recognized you? Speak, I will pass your message to the circle"
+            )
+        r = await send_message(from_id, body)
         print(r)
-        chat_id = msg['chat']['id']
+        chat_id = msg["chat"]["id"]
         state.make_talking(from_id, chat_id)
     else:
-        if msg['from'].get('language_code', 'ru') == 'ru':
-            body = 'Нажмите кнопки ниже, чтобы удалить ваши связи'
+        if msg["from"].get("language_code", "ru") == "ru":
+            body = "Нажмите кнопки ниже, чтобы удалить ваши связи"
         else:
-            body = 'Unlink your connections pressing the buttons below'
+            body = "Unlink your connections pressing the buttons below"
 
-    r = send_message(from_id, body, reply_markup=reply_markup)
+    r = await send_message(from_id, body, reply_markup=reply_markup)
     print(r)
 
 
-def handle_command_owner_my(msg):
-    chat_id = msg['chat']['id']
-    r = get_chat_administrators(chat_id)
+async def handle_command_owner_my(msg):
+    chat_id = msg["chat"]["id"]
+    r = await get_chat_administrators(chat_id)
     print(r)
-    owner_id = ''
-    for admin in r['result']:
-        if admin['status'] == 'creator':
-            owner_id = str(admin['user']['id'])
+    owner_id = ""
+    for admin in r["result"]:
+        if admin["status"] == "creator":
+            owner_id = str(admin["user"]["id"])
             break
     if owner_id:
         owner = Profile.get(owner_id, msg)
         _uids, members = scan()
         for mdata in members:
-            m = json.loads(mdata.decode('utf-8'))
-            if owner_id in m['parents']:
-                if str(m['id']) not in owner['children']:
-                    owner['children'].append(str(m['id']))
-                    Profile.save(owner)
+            m = json.loads(mdata.decode("utf-8"))
+            if owner_id in m["parents"]:
+                if str(m["id"]) not in owner["children"]:
+                    owner["children"].append(str(m["id"]))
+                    Profile.save(owner)

bot/handlers/handle_default.py

@@ -2,18 +2,19 @@ from bot.api import send_message, delete_message, get_chat_administrators
 from bot.storage import Profile, storage
 from bot.handlers.send_button import show_request_msg
 
-def handle_default(msg):
-    print('default handler for all messages')
-    chat_id = str(msg['chat']['id'])
-    from_id = str(msg['from']['id'])
+
+async def handle_default(msg):
+    print("default handler for all messages")
+    chat_id = str(msg["chat"]["id"])
+    from_id = str(msg["from"]["id"])
     sender = Profile.get(from_id, msg)
 
-    if msg['text'].startswith('/my'):
+    if msg["text"].startswith("/my"):
         # команда в групповом чате
-        print('remove some messages in group chat')
+        print("remove some messages in group chat")
 
         # удалить сообщение с командой /my
-        r = delete_message(chat_id, msg['message_id'])
+        r = await delete_message(chat_id, msg["message_id"])
         print(r)
 
         # показать новое сообщение с кнопкой
@@ -21,22 +22,22 @@ def handle_default(msg):
         show_request_msg(msg)
     else:
         # любое другое сообщение
-        if len(sender['parents']) == 0:
+        if len(sender["parents"]) == 0:
             # владелец чата автоматически ручается
-            print(f'setting owner as parent for {from_id}')
-            r = get_chat_administrators(chat_id)
+            print(f"setting owner as parent for {from_id}")
+            r = await get_chat_administrators(chat_id)
             print(r)
-            owner_id = ''
-            for admin in r['result']:
-                if admin['status'] == 'creator':
-                    owner_id = admin['user']['id']
+            owner_id = ""
+            for admin in r["result"]:
+                if admin["status"] == "creator":
+                    owner_id = admin["user"]["id"]
                     break
             if owner_id:
-                sender['parents'].append(str(owner_id))
+                sender["parents"].append(str(owner_id))
                 # обновляем профиль владельца
                 owner = Profile.get(owner_id)
-                owner['children'].append(str(from_id))
+                owner["children"].append(str(from_id))
                 Profile.save(owner)
 
     # сохранить профиль отправителя
-    Profile.save(sender)
+    Profile.save(sender)

bot/handlers/handle_feedback.py

@@ -1,51 +1,57 @@
 import json
 
-from bot.api import send_message, forward_message, delete_message, get_chat_administrators
+from bot.api import (
+    send_message,
+    forward_message,
+    delete_message,
+    get_chat_administrators,
+)
 from bot.handlers.send_button import show_request_msg
 from bot.utils.mention import userdata_extract
 from bot.storage import storage, Profile
 from bot.config import FEEDBACK_CHAT_ID
 
 
-def handle_feedback(msg, state):
-    mid = msg['message_id']
-    cid = msg['chat']['id']
-    if msg['text'] == '/start':
-        r = send_message(cid, 'Напишите своё сообщение для администрации чата')
+async def handle_feedback(msg, state):
+    mid = msg["message_id"]
+    cid = msg["chat"]["id"]
+    if msg["text"] == "/start":
+        r = await send_message(cid, "Напишите своё сообщение для администрации чата")
         print(r)
+    elif state.is_talking(uid):
+        r = await forward_message(cid, mid, state.talking[uid])
+        print(r)
+        state.aho(uid)
     else:
-        uid = msg['from']['id']
-        if state.is_talking(uid):
-            r = forward_message(cid, mid, state.talking[uid])
-            print(r)
-            state.aho(uid)
-        else:
-            r = forward_message(cid, mid, FEEDBACK_CHAT_ID)
-            print(r)
-            support_msg_id = r['result']['message_id']
-            # сохранение айди сообщения в приватной переписке с ботом
-            storage.set(f'fbk-{support_msg_id}', json.dumps({
-                "author_id": msg["from"]["id"],
-                "message_id": mid,
-                "chat_id": cid
-            }))
+        r = await forward_message(cid, mid, FEEDBACK_CHAT_ID)
+        print(r)
+        support_msg_id = r["result"]["message_id"]
+        # сохранение айди сообщения в приватной переписке с ботом
+        storage.set(
+            f"fbk-{support_msg_id}",
+            json.dumps(
+                {"author_id": msg["from"]["id"], "message_id": mid, "chat_id": cid}
+            ),
+        )
 
 
-
-def handle_answer(msg):
-    answered_msg = msg['reply_to_message']
-    r = get_chat_administrators(msg['chat']['id'])
+async def handle_answer(msg):
+    answered_msg = msg["reply_to_message"]
+    r = await get_chat_administrators(msg["chat"]["id"])
     print(r)
     admins = []
-    for a in r['result']:
-        admins.append(a['user']['id'])
-    if answered_msg['from']['is_bot'] and msg['from']['id'] in admins:
-        support_msg_id = str(answered_msg['message_id'])
+    for a in r["result"]:
+        admins.append(a["user"]["id"])
+    if answered_msg["from"]["is_bot"] and msg["from"]["id"] in admins:
+        support_msg_id = str(answered_msg["message_id"])
         # получение сохраненного информации о сообщении для ответа
-        stored_feedback = storage.get(f'fbk-{support_msg_id}')
+        stored_feedback = storage.get(f"fbk-{support_msg_id}")
         if stored_feedback:
-            print('handle an answer from feedback group')
+            print("handle an answer from feedback group")
             stored_feedback = json.loads(stored_feedback)
-            r = send_message(f'{stored_feedback["chat_id"]}', msg['text'], reply_to=stored_feedback["message_id"])
+            r = await send_message(
+                f'{stored_feedback["chat_id"]}',
+                msg["text"],
+                reply_to=stored_feedback["message_id"],
+            )
             print(r)
-

bot/handlers/handle_join_request.py

@@ -1,20 +1,19 @@
-from bot.api import approve_chat_join_request, delete_message           
+from bot.api import approve_chat_join_request, delete_message
 from bot.handlers.send_button import show_request_msg
 from bot.storage import Profile, storage
 
 
-def handle_join_request(msg):
-    print(f'handle join request {msg}')
-    chat_id = str(msg['chat']['id'])
-    from_id = str(msg['from']['id'])
+async def handle_join_request(msg):
+    print(f"handle join request {msg}")
+    chat_id = str(msg["chat"]["id"])
+    from_id = str(msg["from"]["id"])
     actor = Profile.get(from_id, msg)
 
-    if len(actor['parents']) == 0:
+    if len(actor["parents"]) == 0:
         # показываем сообщение с кнопкой "поручиться"
-        show_request_msg(msg)
+        await show_request_msg(msg)
     else:
         # за пользователя поручились ранее
-        r = approve_chat_join_request(chat_id, from_id)
+        r = await approve_chat_join_request(chat_id, from_id)
         print(r)
     Profile.save(actor)
-

bot/handlers/handle_members_change.py

@@ -3,42 +3,42 @@ from bot.api import delete_message
 from bot.storage import Profile, storage
 from bot.config import FEEDBACK_CHAT_ID
 
-def handle_join(msg):
-    chat_id = str(msg['chat']['id'])
-    from_id = str(msg['from']['id'])
+
+async def handle_join(msg):
+    chat_id = str(msg["chat"]["id"])
+    from_id = str(msg["from"]["id"])
 
     actor = Profile.get(from_id, msg)
 
-    newcomer_id = str(msg['new_chat_member']['id'])
+    newcomer_id = str(msg["new_chat_member"]["id"])
     if from_id == newcomer_id:
-        if len(actor['parents']) == 0 and str(chat_id) != FEEDBACK_CHAT_ID:
+        if len(actor["parents"]) == 0 and str(chat_id) != FEEDBACK_CHAT_ID:
             # показываем сообщение с кнопкой "поручиться"
-            show_request_msg(msg)
+            r = await show_request_msg(msg)
+            print(r)
         else:
             # за пользователя поручились ранее
             pass
     else:
         # пользователи приглашены другим участником
-        print(f'{len(msg["new_chat_members"])} members were invited by {from_id}')    
-        for m in msg['new_chat_members']:
-            newcomer = Profile.get(m['id'])
-            newcomer['parents'].append(str(from_id))
+        print(f'{len(msg["new_chat_members"])} members were invited by {from_id}')
+        for m in msg["new_chat_members"]:
+            newcomer = Profile.get(m["id"])
+            newcomer["parents"].append(str(from_id))
             Profile.save(newcomer)
-            actor['children'].append(str(m['id']))
+            actor["children"].append(str(m["id"]))
         # обновляем профиль пригласившего
         Profile.save(actor)
 
 
-def handle_left(msg):
-    print(f'handling member leaving')
+async def handle_left(msg):
+    print("handling member leaving")
     member_id = msg["left_chat_member"]["id"]
-    chat_id = msg['chat']['id']
+    chat_id = msg["chat"]["id"]
 
     # удаление сообщения с кнопкой в этом чате
-    prev_msg = storage.get(f'btn-{chat_id}-{member_id}')
+    prev_msg = storage.get(f"btn-{chat_id}-{member_id}")
     if prev_msg:
-        r = delete_message(chat_id, prev_msg['id'])
+        r = await delete_message(chat_id, prev_msg["id"])
         print(r)
-        storage.remove(f'btn-{chat_id}-{member_id}')
-
-
+        storage.remove(f"btn-{chat_id}-{member_id}")

bot/handlers/handle_startup.py

@@ -3,27 +3,32 @@ from bot.api import approve_chat_join_request, kick_member
 from bot.handlers.callback_vouch import update_button
 from bot.utils.mention import userdata_extract
 
+
 # устанавливает соответствие данных
-def handle_startup():
-    btn_ids, btns = scan(match='btn-*', count=100)
+async def handle_startup():
+    btn_ids, _btns = scan(match="btn-*", count=100)
     for btnid in btn_ids:
         # для каждой ранее созданной кнопки
         btnid_str = btnid.decode("utf-8").replace("btn-", "")
-        parts = btnid_str.split('-')
+        parts = btnid_str.split("-")
         print(parts)
         _, chat_id, member_id = parts
         chat_id = "-" + chat_id
         newcomer = Profile.get(member_id)
-        if len(newcomer.get('parents', [])) > 0:
+        if len(newcomer.get("parents", [])) > 0:
             # принять заявку если её нажимали
-            r = approve_chat_join_request(chat_id, member_id)
+            r = await approve_chat_join_request(chat_id, member_id)
             print(r)
             update_button(chat_id, member_id)
-        elif len(newcomer.get('parents', [])) == 0:
-            r = kick_member(chat_id, member_id)
+        elif len(newcomer.get("parents", [])) == 0:
+            r = await kick_member(chat_id, member_id)
             print(r)
-            if r['ok']:
-                _, identity, username = userdata_extract(newcomer['result']['user'])
-                body = ('Участник %s%s был удалён' if lang == 'ru' else 'Member %s%s was deleted') % (identity, username)
-                r = send_message(chat_id, body)
-                print(r)
+            if r["ok"]:
+                _, identity, username = userdata_extract(newcomer["result"]["user"])
+                body = (
+                    "Участник %s%s был удалён"
+                    if lang == "ru"
+                    else "Member %s%s was deleted"
+                ) % (identity, username)
+                r = await send_message(chat_id, body)
+                print(r)

bot/handlers/routing.py

@@ -0,0 +1,41 @@
+from bot.handlers.handle_feedback import handle_feedback, handle_answer
+from bot.handlers.handle_members_change import handle_join, handle_left
+from bot.handlers.handle_default import handle_default
+from bot.handlers.command_my import handle_command_my
+from bot.handlers.command_graph import handle_command_graph
+from bot.handlers.command_ask import handle_command_ask
+from bot.config import FEEDBACK_CHAT_ID
+
+
+async def handle_routing(msg, state):
+    cid = msg["chat"]["id"]
+    uid = msg["from"]["id"]
+    if cid == uid:
+        # сообщения в личке с ботом
+        print("private chat message")
+        if msg["text"].startswith("/my"):
+            await handle_command_my(msg)
+        elif msg["text"].startswith("/unlink"):
+            await handle_unlink(msg)
+        else:
+            await handle_feedback(msg, state)
+
+    elif str(cid) == FEEDBACK_CHAT_ID:
+        # сообщения из группы обратной связи
+        print("feedback chat message")
+        if "reply_to_message" in msg:
+            await handle_answer(msg)
+        elif msg["text"] == "/graph":
+            await handle_command_graph(msg)
+        elif msg["text"].startswith("/ask"):
+            await handle_command_ask(msg)
+
+    else:
+        # сообщения из всех остальных групп
+        print(f"group {cid} chat message")
+        if "text" in msg:
+            await handle_default(msg)
+        elif "new_chat_member" in msg:
+            await handle_join(msg)
+        elif "left_chat_member" in msg:
+            await handle_left(msg)

bot/handlers/send_button.py

@@ -2,52 +2,49 @@ from bot.api import send_message, send_photo, get_userphotos
 from bot.utils.mention import mention, userdata_extract
 from bot.storage import storage
 
-def show_request_msg(msg):
+
+async def show_request_msg(msg):
     print("showing request with button")
-    chat_id = str(msg['chat']['id'])
-    from_id = str(msg['from']['id'])
-    lang = msg['from'].get('language_code', 'ru')
+    chat_id = str(msg["chat"]["id"])
+    from_id = str(msg["from"]["id"])
+    lang = msg["from"].get("language_code", "ru")
     reply_markup = {
-        "inline_keyboard": [
-            [
-                {
-                    "text": '❤️', 
-                    "callback_data": 'vouch' + from_id
-                }
-            ]
-        ]
+        "inline_keyboard": [[{"text": "❤️", "callback_data": "vouch" + from_id}]]
     }
-    newcomer_message = "Нажмите, чтобы одобрить заявку " if lang == 'ru' \
+    newcomer_message = (
+        "Нажмите, чтобы одобрить заявку "
+        if lang == "ru"
         else "There is a newcomer, press the button if you are connected with "
-    r = get_userphotos(user_id=from_id)
+    )
+    r = await get_userphotos(user_id=from_id)
     print(r)
-    if r['ok'] and r['result']['total_count'] > 0:
-        print('show button with photo')
-        file_id = r['result']['photos'][0][0]['file_id']
-        _uid, identity, username = userdata_extract(msg['from'])
+    if r["ok"] and r["result"]["total_count"] > 0:
+        print("show button with photo")
+        file_id = r["result"]["photos"][0][0]["file_id"]
+        _uid, identity, username = userdata_extract(msg["from"])
         r = send_photo(
             chat_id,
             file_id,
-            caption=newcomer_message + f'{identity}{username}',
-            reply_to=msg.get('message_id', ''),
-            reply_markup=reply_markup
+            caption=newcomer_message + f"{identity}{username}",
+            reply_to=msg.get("message_id", ""),
+            reply_markup=reply_markup,
         )
     else:
-        print('show button without photo')
+        print("show button without photo")
         r = send_message(
             chat_id,
-            newcomer_message + mention(msg['from']),   
-            reply_to=msg.get('message_id', ''),
-            reply_markup=reply_markup
+            newcomer_message + mention(msg["from"]),
+            reply_to=msg.get("message_id", ""),
+            reply_markup=reply_markup,
         )
     print(r)
-    if 'message_id' in r:
+    if "message_id" in r:
         # удаляем предыдущее сообщение с кнопкой в этом чате
-        prevbtn = storage.get(f'btn-{chat_id}-{from_id}')
+        prevbtn = storage.get(f"btn-{chat_id}-{from_id}")
         if prevbtn:
-            r = delete_message(chat_id, prevbtn)
+            r = await delete_message(chat_id, prevbtn)
             print(r)
         # создаём новое
-        newbtn = r['message_id']
-        print(f'button message id: {newbtn}')
-        storage.set(f'btn-{chat_id}-{from_id}', newbtn)
+        newbtn = r["message_id"]
+        print(f"button message id: {newbtn}")
+        storage.set(f"btn-{chat_id}-{from_id}", newbtn)