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)
-    
-