0.0.8-fixes

tgbot/handlers/handle_default.py

@@ -1,7 +1,7 @@
 from tgbot.api import send_message, delete_message, get_chat_administrators
 from tgbot.storage import Profile
 from tgbot.handlers.send_button import show_request_msg
-
+from tgbot.storage import storage
 
 def handle_default(msg):
     print(f'default handler for all messages')
@@ -18,14 +18,14 @@ def handle_default(msg):
         print(r)
 
         # удалить предыдушее сообщение с кнопкой в этом чате
-        if sender['request_msg_id'].startswith(chat_id):
-            chat_id, rmid = sender['request_msg_id'].split(':')
-            r = delete_message(chat_id, rmid)
+        prev_msg_id = storage.get(f'btn-{chat_id}-{from_id}')
+        if prev_msg_id:
+            r = delete_message(chat_id, prev_msg_id)
             print(r)
 
         # показать новое сообщение с кнопкой
-        request_msg_id = show_request_msg(msg)
-        sender['request_msg_id'] = f'{chat_id}:{request_msg_id}'
+        btn_msg_id = show_request_msg(msg)
+        storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
     else:
         # любое другое сообщение
         if len(sender['parents']) == 0:
@@ -33,11 +33,13 @@ def handle_default(msg):
             print(f'setting owner as parent for {from_id}')
             r = get_chat_administrators(chat_id)
             print(r)
+            owner_id = ''
+            for admin in r['result']:
+                if admin['status'] == 'creator':
+                    owner_id = admin['user']['id']
+                    break
             
-            owner_id = r['result'][0]['id']  # DEBUG!!
-
             sender['parents'].append(owner_id)
-            
             # обновляем профиль владельца
             owner = Profile.get(owner_id)
             owner['children'].append(from_id)