0.0.10

tgbot/handlers/callback_unlink.py

@@ -1,4 +1,5 @@
 from tgbot.api import send_message, delete_message
+from tgbot.handlers.command_my import handle_command_my
 from tgbot.storage import Profile
 
 # remove link of callback sender 
@@ -7,17 +8,28 @@ def handle_unlink(callback_query):
     print('handle unlink button pressed, private chat only')
     
     from_id = str(callback_query['from']['id'])
-    reply_msg_id = callback_query['message']['message_id']
+    linked_id = str(callback_query['data'].replace('unlink', ''))
 
+    # удаляем связь с потомком
     actor = Profile.get(from_id, callback_query)
-    actor['parents'].remove(from_id)
-    
+    actor['children'].remove(linked_id)
+    Profile.save(actor)
+
+    # удаляем связь с предком
+    linked = Profile.get(linked_id)
+    linked['parents'].remove(from_id)
+    Profile.save(linked)
+
     # удаляем старое сообщение с кнопками
+    reply_msg_id = callback_query['message']['message_id']
     r = delete_message(from_id, reply_msg_id)
     print(r)
+     
+    # если ещё есть связи - посылаем новое сообщение                                                    
+    if len(actor['children']) > 0:
+        handle_command_my(callback_query)
 
-    # если ещё есть связи - посылаем новое сообщение
-    if len(actor['parents']) > 0:
-        body = construct_unlink_buttons(actor)
-        r = send_message(from_id, body)
-        print(r)
+    # если больше никто не поручился - мьютим
+    if len(linked['parents']) == 0:
+        for chat_id in linked['chats']:
+            mute_member(chat_id, linked_id)

tgbot/handlers/callback_vouch.py

@@ -1,6 +1,5 @@
-from tgbot.api import send_message, forward_message, delete_message
+from tgbot.api import send_message, forward_message, delete_message, approve_chat_join_request, unmute_member
 from tgbot.storage import Profile
-from tgbot.config import BUTTON_VOUCH
 
 
 def handle_button(callback_query):
@@ -9,31 +8,37 @@ def handle_button(callback_query):
     actor = Profile.get(actor_id, callback_query)
 
     callback_data = callback_query['data']
-    if callback_data.startswith(BUTTON_VOUCH):
-        print(f'vouch button pressed by {actor_id}')
+    if callback_data.startswith('vouch'):
+        print(f'button pressed by {actor_id}')
+
+        newcomer_id = callback_data[5:]
+        print(f'button pressed for {newcomer_id}')
 
-        newcomer_id = callback_data[len(BUTTON_VOUCH):]
         newcomer = Profile.get(newcomer_id)
+        print(f'newcomer profile {newcomer}')
         if newcomer_id == actor_id:
             # нажал сам, не реагируем, прописываем данные
             newcomer = Profile.get(newcomer_id, callback_query)
-        elif newcomer_id not in actor['children'] and \
-            actor_id not in newcomer['parents']:
-                newcomer['parents'].append(actor_id)
-                actor['children'].append(newcomer_id)
-                Profile.save(newcomer)
-                Profile.save(actor)
-                try:
-                    chat_id = str(callback_query['message']['chat']['id'])
+        else:
+                # нажал кто-то другой
 
-                    print('unmute newcomer')
+                if actor_id not in newcomer['parents']:
+                    print(f'save parent for {newcomer_id}')
+                    newcomer['parents'].append(actor_id)
+                    Profile.save(newcomer)
+
+                if newcomer_id not in actor['children']:
+                    print(f'save child for {actor_id}')
+                    actor['children'].append(newcomer_id)
+                    Profile.save(actor)
+
+                chat_id = str(callback_query['message']['chat']['id'])
+
+                print('accept join request')
+                r = approve_chat_join_request(chat_id, newcomer_id)
+                print(r)
+
+                if not r.get('ok'):              
+                    print('try to unmute newcomer')
                     r = unmute_member(chat_id, newcomer_id)
-                    print(r)
-
-                    print('accept join request')
-                    r = approve_chat_join_request(chat_id, newcomer_id)
-                    print(r)
-
-                except:
-                    pass
-       
+                    print(r)

tgbot/handlers/command_ask.py

@@ -0,0 +1,14 @@
+from tgbot.storage import Profile
+from tgbot.handlers.send_button import show_request_msg
+from tgbot.api import get_member
+
+def handle_command_ask(msg):
+    print(f'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(r)
+    m = {}
+    m['from'] = r['result']['user']
+    m['chat'] = { 'id': chat_id }
+    show_request_msg(m)

tgbot/handlers/command_graph.py

@@ -1,29 +1,11 @@
 from tgbot.utils.graph import generate_chart
 from tgbot.api import send_document
-from tgbot.storage import storage
+from tgbot.storage import storage, scan
 import json
 
 
 async def handle_command_graph(msg):
-    cursor = 0
-    keys = []
-    r = storage
-    while True:
-        # Scan for keys starting with 'usr-*' in batches of 100
-        cursor, batch_keys = r.scan(cursor=cursor, match='usr-*', count=100)
-        keys += batch_keys
-        # If the cursor is 0, then we've reached the end of the keys
-        if cursor == 0:
-            break
-    # Get the values of all the keys
-    values = r.mget(keys)
-    # Parse the JSON data from each value
-    members = []
-    for value in values:
-        value_str = value.decode('utf-8')
-        member = json.loads(value_str)
-        members.append(member)
-    print(f'found {len(members)} members')
+    usr_ids, members = scan(match='usr-*', count=100)
     data = generate_chart(members)
     if data:
         r = await send_document(msg['chat']['id'], data, 'chart.svg')

tgbot/handlers/command_my.py

@@ -1,33 +1,26 @@
 from tgbot.storage import Profile
 from tgbot.api import get_member, send_message
+from tgbot.utils.mention import userdata_extract
+
 
 def construct_unlink_buttons(actor):
     buttons = []
     for vouch in actor['children']:
-        vouch_added = False
         for chat_id in actor['chats']:
-            if not vouch_added:
-                r = get_member(chat_id, vouch)
-                member = r.get('result')
-                if member:
-                    try:
-                        buttons.append({
-                            'text': mention(r['result']),
-                            'callback_data': 'unlink' + vouch
-                        })
-                        vouch_added = True
-                    except:
-                        print('member result error')
-                        print(member)
-                else:
-                    print(r)
+            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
+            })
     return { "inline_keyboard": [ buttons, ] }
 
+
 def handle_command_my(msg):
     print(f'handle my command')
     from_id = str(msg['from']['id'])
     sender = Profile.get(from_id, msg)
-
     # генерируем кнопки для всех, за кого поручились
     reply_markup = construct_unlink_buttons(sender)
 

tgbot/handlers/handle_default.py

@@ -17,15 +17,8 @@ def handle_default(msg):
         r = delete_message(chat_id, msg['message_id'])
         print(r)
 
-        # удалить предыдушее сообщение с кнопкой в этом чате
-        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)
-
         # показать новое сообщение с кнопкой
-        btn_msg_id = show_request_msg(msg)
-        storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
+        show_request_msg(msg)
     else:
         # любое другое сообщение
         if len(sender['parents']) == 0:
@@ -38,12 +31,12 @@ def handle_default(msg):
                 if admin['status'] == 'creator':
                     owner_id = admin['user']['id']
                     break
-            
-            sender['parents'].append(owner_id)
-            # обновляем профиль владельца
-            owner = Profile.get(owner_id)
-            owner['children'].append(from_id)
-            Profile.save(owner)
+            if owner_id:
+                sender['parents'].append(owner_id)
+                # обновляем профиль владельца
+                owner = Profile.get(owner_id)
+                owner['children'].append(from_id)
+                Profile.save(owner)
 
     # сохранить профиль отправителя
     Profile.save(sender)

tgbot/handlers/handle_feedback.py

@@ -1,6 +1,8 @@
 import json
 
 from tgbot.api import send_message, forward_message, delete_message
+from tgbot.handlers.send_button import show_request_msg
+from tgbot.utils.mention import userdata_extract
 from tgbot.storage import storage, Profile
 from tgbot.config import FEEDBACK_CHAT_ID
 

tgbot/handlers/handle_join_request.py

@@ -11,13 +11,7 @@ def handle_join_request(msg):
 
     if len(actor['parents']) == 0:
         # показываем сообщение с кнопкой "поручиться"
-        btn_msg_id = show_request_msg(msg)
-        # удаляем предыдущее сообщение с кнопкой в этом чате
-        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)
-        storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
+        show_request_msg(msg)
     else:
         # за пользователя поручились ранее
         r = approve_chat_join_request(chat_id, from_id)

tgbot/handlers/handle_members_change.py

@@ -12,8 +12,7 @@ def handle_join(msg):
     if from_id == newcomer_id:
         if len(actor['parents']) == 0:
             # показываем сообщение с кнопкой "поручиться"
-            btn_msg_id = show_request_msg(msg)
-            storage.set(f'btn-{chat_id}-{from_id}', btn_msg_id)
+            show_request_msg(msg)
 
             # до одобрения - мьют
             r = mute_member(chat_id, newcomer_id)
@@ -43,9 +42,9 @@ def handle_left(msg):
     chat_id = msg['chat']['id']
 
     # удаление сообщения с кнопкой в этом чате
-    prev_msg_id = storage.get(f'btn-{chat_id}-{member_id}')
+    prev_msg = storage.get(f'btn-{chat_id}-{member_id}')
     if prev_msg_id:
-        r = delete_message(chat_id, prev_msg_id)
+        r = delete_message(chat_id, prev_msg['id'])
         print(r)
         storage.remove(f'btn-{chat_id}-{member_id}')
 

tgbot/handlers/handle_startup.py

@@ -0,0 +1,18 @@
+from tgbot.storage import scan, Profile
+
+# устанавливает соответствие данных
+def handle_startup():
+    btn_ids, btns = scan(match='btn-*', count=100)
+    for btnid in btn_ids:
+        # для каждой ранее созданной кнопки
+        try:
+            btnid_str = btnid.decode("utf-8") 
+            chat_id, member_id = btnid_str[3:].split('-')
+            
+            newcomer = Profile.get(member_id)
+            if len(newcomer.get('parents', [])) > 0:
+                # принять заявку если её нажимали
+                r = approve_chat_join_request(chat_id, member_id)
+                print(r)
+        except:
+            print(f'error {btnid}')

tgbot/handlers/send_button.py

@@ -1,25 +1,49 @@
-from tgbot.api import send_message
-from tgbot.config import BUTTON_VOUCH, NEWCOMER_MSG
+from tgbot.api import send_message, send_photo, get_userphotos
 from tgbot.utils.mention import mention
+from tgbot.storage import storage
 
 def show_request_msg(msg):
+    chat_id = str(msg['chat']['id'])
+    from_id = str(msg['from']['id'])
+    lang = msg['from'].get('language_code', 'ru')
     reply_markup = {
         "inline_keyboard": [
             [
                 {
-                    "text": BUTTON_VOUCH, 
-                    "callback_data": BUTTON_VOUCH + str(msg['from']['id'])
+                    "text": 'Моё одобрение' if lang == 'ru' else 'My connection', 
+                    "callback_data": 'vouch' + from_id
                 }
             ]
         ]
     }
-    
-    r = send_message(
-        msg['chat']['id'],
-        NEWCOMER_MSG + mention(msg['from']),   
-        reply_to=msg.get('message_id', ''),
-        reply_markup=reply_markup
-    )
-    btn_msg_id = r['result']['message_id']
-    print(f'request message id: {btn_msg_id}')
-    return btn_msg_id
+    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)
+    print(r)
+    if r['ok'] and r['result']['total_count'] > 0:
+        file_id = r['result']['photos'][0][0]['file_id']
+        r = send_photo(
+            chat_id,
+            file_id,
+            caption=newcomer_message + mention(msg['from']),
+            reply_to=msg.get('message_id', ''),
+            reply_markup=reply_markup
+        )
+    else:
+        r = send_photo(
+            chat_id,
+            newcomer_message + mention(msg['from']),   
+            reply_to=msg.get('message_id', ''),
+            reply_markup=reply_markup
+        )
+    print(r)
+    if 'message_id' in r:
+        # удаляем предыдущее сообщение с кнопкой в этом чате
+        prevbtn = storage.get(f'btn-{chat_id}-{from_id}')
+        if prevbtn:
+            r = 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)