From cbe9db4932264534a065444992a1767186bf7b19 Mon Sep 17 00:00:00 2001 From: tonyrewin Date: Sat, 22 Apr 2023 04:17:50 +0300 Subject: [PATCH] 0.0.6 chat_id is not fixed --- CHANGELOG.md | 8 ++ README.md | 7 +- api/webhook.py | 17 +++-- tgbot/api.py | 29 +++++-- tgbot/config.py | 8 +- tgbot/handlers.py | 187 +++++++++++++++++++++------------------------- tgbot/profile.py | 9 ++- 7 files changed, 136 insertions(+), 129 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80867a6..8eb829a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ +## [0.0.6] + +- совместимость с механизмом заявок для публичных групп +- бот работает во всех чатах, где он админ +- убраны кнопки ответов + + ## [0.0.5] - добавлена возможность поручиться - обычные сообщения в общем чате больше никак не обрабатываются - унифицированный механизм хранения профилей пользователей +- рефакторинг ## [0.0.4] diff --git a/README.md b/README.md index acf8bbe..f70504a 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,6 @@ 4. Настроить переменные среды: - BOT_TOKEN - токен бота созданный с помощью @BotFather - - CHAT_ID - айди чата, который бот защищает (можно посмотреть в урле веб-версии клиента) - - WELCOME_MSG - текст сообщения приветствия - - BUTTON_OK - текст правильного ответа - - BUTTON_VOUCH - текст кнопки поручения - - BUTTON_NO - текст неправильного ответа + - NEWCOMER_MSG - текст сообщения о новом пользователе, за которым следует его имя + - BUTTON_VOUCH - текст кнопки "поручиться" - FEEDBACK_CHAT_ID - айди чата для обратной связи diff --git a/api/webhook.py b/api/webhook.py index 6708b80..485fba3 100644 --- a/api/webhook.py +++ b/api/webhook.py @@ -1,6 +1,6 @@ -from tgbot.config import WEBHOOK, FEEDBACK_CHAT_ID, CHAT_ID # init storage there +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, handle_left, handle_button, handle_join_request from tgbot.api import register_webhook from sanic import Sanic from sanic.response import text @@ -17,6 +17,7 @@ async def register(req): print(f'\n\t\t\tWEBHOOK REGISTERED:\n{r.json()}') app.config.REGISTERED = True print(r.json()) + return text('ok') return text('skipped') @@ -33,16 +34,16 @@ async def handle(req): elif str(msg['chat']['id']) == FEEDBACK_CHAT_ID \ and 'reply_to_message' in msg: handle_answer(msg) - elif str(msg['chat']['id']) == CHAT_ID: + else: if 'new_chat_member' in msg: handle_join(msg) elif 'left_chat_member' in msg: handle_left(msg) - if 'callback_query' in update: - callback_query = update['callback_query'] - chat_id = str(callback_query['message']['chat']['id']) - if chat_id == CHAT_ID: - handle_button(callback_query) + elif 'callback_query' in update: + handle_button(update['callback_query']) + elif 'chat_join_request' in update: + print('chat join request') + handle_join_request(update) except Exception: import traceback traceback.print_exc() diff --git a/tgbot/api.py b/tgbot/api.py index 5d0e74b..2023f38 100644 --- a/tgbot/api.py +++ b/tgbot/api.py @@ -48,7 +48,7 @@ def unban_member(chat_id, user_id): return r # https://core.telegram.org/bots/api#addchatmember -def add_chatmember(chat_id, user_id): +def add_member(chat_id, user_id): url = apiBase + f"addChatMember?chat_id={chat_id}&user_id={user_id}" r = requests.post(url) return r @@ -61,11 +61,28 @@ def forward_message(cid, mid, to_chat_id): return r -# https://core.telegram.org/bots/api#setchatpermissions -def set_chatpermissions(chat_id, chat_permissions): - chat_permissions = json.dumps(chat_permissions) +# https://core.telegram.org/bots/api#restrictchatmember +def mute_member(chat_id, member_id): + chat_permissions = json.dumps({ "can_send_messages": False }) chat_permissions = requests.utils.quote(chat_permissions) - url = apiBase + f'setChatPermissions?chat_id={chat_id}' + \ - f'&permissions={chat_permissions}' + url = apiBase + f'restrictChatMember?chat_id={chat_id}' + \ + f'&user_id={user_id}&permissions={chat_permissions}' r = requests.post(url) return r + + +# https://core.telegram.org/bots/api#restrictchatmember +def unmute_member(chat_id, member_id): + chat_permissions = json.dumps({ "can_send_messages": True }) + chat_permissions = requests.utils.quote(chat_permissions) + url = apiBase + f'restrictChatMember?chat_id={chat_id}' + \ + f'&user_id={user_id}&permissions={chat_permissions}' + r = requests.post(url) + return r + +# https://core.telegram.org/bots/api#approvechatjoinrequest +def approve_chat_join_request(chat_id, user_id): + url = apiBase + f"approveChatJoinRequest?chat_id={chat_id}" + \ + f'&user_id={user_id}' + r = requests.post(url) + return r \ No newline at end of file diff --git a/tgbot/config.py b/tgbot/config.py index 3a5218d..b942a8f 100644 --- a/tgbot/config.py +++ b/tgbot/config.py @@ -1,12 +1,8 @@ import os -REDIS_URL = os.environ.get('REDIS_URL') or 'redis://localhost:6379' WEBHOOK = os.environ.get('VERCEL_URL') or 'http://localhost:8000' -WELCOME_MSG = os.environ.get('WELCOME_MSG') or "Welcome! Press the button or wait for a few others' connections" -BUTTON_OK = os.environ.get('BUTTON_OK') or 'Ok' +REDIS_URL = os.environ.get('REDIS_URL') or 'redis://localhost:6379' +NEWCOMER_MSG = os.environ.get('WELCOME_MSG') or "There is a newcomer, press the button if you are connected" BUTTON_VOUCH = os.environ.get('BUTTON_VOUCH') or 'My connection!' -BUTTON_NO = os.environ.get('BUTTON_NO') or 'No' - -CHAT_ID = os.environ.get('CHAT_ID').replace("-", "-100") FEEDBACK_CHAT_ID = os.environ.get('FEEDBACK_CHAT_ID').replace("-", "-100") \ No newline at end of file diff --git a/tgbot/handlers.py b/tgbot/handlers.py index 1bd27df..86eab72 100644 --- a/tgbot/handlers.py +++ b/tgbot/handlers.py @@ -1,7 +1,7 @@ from tgbot.api import send_message, forward_message, delete_message, \ - ban_member, unban_member, set_chatpermissions -from tgbot.config import FEEDBACK_CHAT_ID, WELCOME_MSG, BUTTON_NO, \ - BUTTON_OK, CHAT_ID, REDIS_URL + ban_member, unban_member, mute_member, unmute_member, \ + approve_chat_join_request +from tgbot.config import REDIS_URL, FEEDBACK_CHAT_ID, BUTTON_VOUCH, NEWCOMER_MSG import json import redis from tgbot.profile import Profile as ProfileObj @@ -13,6 +13,29 @@ storage = redis.from_url(REDIS_URL) # хранение необходимой информации о пользователях Profile = ProfileObj(storage) +def show_request_msg(msg): + reply_markup = { + "inline_keyboard": [ + [ + { + "text": BUTTON_VOUCH, + "callback_data": BUTTON_VOUCH + str(msg['from']['id']) + } + ] + ] + } + + r = send_message( + msg['chat']['id'], + NEWCOMER_MSG + f"{msg['from']['first_name']} {msg['from']['last_name']}({msg['from']['username']})", + reply_to=msg['message_id'], + reply_markup=reply_markup + ) + welcome_msg_id = r.json()['result']['message_id'] + print(r.json()) + print(f'welcome message id: {welcome_msg_id}') + return welcome_msg_id + def handle_feedback(msg): mid = msg['message_id'] @@ -40,127 +63,91 @@ def handle_answer(msg): def handle_join(msg): chat_id = str(msg['chat']['id']) from_id = str(msg['from']['id']) - member_id = str(msg['new_chat_member']['id']) + actor = Profile.get(from_id) - if from_id == member_id: - newcomer = Profile.get(member_id) + actor["name"] = msg['from']['first_name'] + msg['from'].get('last_name', '') + actor["mention"] = msg['from'].get('username', '') - print(f'new self-joined member {member_id}') - reply_markup = { - "inline_keyboard": [ - [ - {"text": BUTTON_NO, "callback_data": BUTTON_NO}, - {"text": BUTTON_OK, "callback_data": BUTTON_OK}, - {"text": BUTTON_VOUCH, "callback_data": BUTTON_VOUCH} - ] - ] - } - r = send_message( - chat_id, - WELCOME_MSG, - reply_to=msg['message_id'], - reply_markup=reply_markup - ) - welcome_msg_id = r.json()['result']['message_id'] - print(r.json()) - print(f'welcome message id: {welcome_msg_id}') - newcomer["newcomer"] = True - newcomer["welcome_id"] = welcome_msg_id - perms = { - "can_send_messages": False - } - r = set_chatpermissions(CHAT_ID, perms) - print(r.json()) - # обновляем профиль новичка - Profile.save(newcomer) + if from_id == str(msg['new_chat_member']['id']): + if len(actor['parents']) == 0: + # показываем сообщение с кнопкой "поручиться" + welcome_msg_id = show_request_msg(msg) - elif 'new_chat_members' in msg: - # кто-то пригласил новых участников - print(f'{len(msg["new_chat_members"])} members were invited by {from_id}') - # получаем его профиль - inviter = Profile.get(from_id) - + # обновляем профиль присоединившегося + actor['welcome_id'] = welcome_msg_id + Profile.save(actor) + else: + # за пользователя поручились ранее + r = delete_message(chat_id, actor['welcome_id']) + print(r.json()) + 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['vouched_by'].append(from_id) + newcomer['parents'].append(from_id) Profile.save(newcomer) + actor['children'].append(m['id']) - inviter['vouched_for'].append(m['id']) # обновляем профиль пригласившего - Profile.save(inviter) + Profile.save(actor) def handle_left(msg): print(f'handling member leaving') - member_id = msg["left_chat_member"]["id"] # профиль покидающего чат leaver = Profile.get(member_id) - r = delete_message(CHAT_ID, leaver['welcome_id']) + # удаление сообщения с кнопкой + r = delete_message(msg['chat']['id'], leaver['welcome_id']) print(r.json()) Profile.leaving(leaver) def handle_button(callback_query): - if 'reply_to_message' not in callback_query['message']: - # удаляет сообщение с кнопкой, если оно уже ни на что не отвечает - r = delete_message(CHAT_ID, callback_query['message']) - print(r.json()) - else: - member_id = str(callback_query['from']['id']) - callback_data = callback_query['data'] - welcomed_member_id = str(callback_query['message']['reply_to_message']['from']['id']) - welcome_msg_id = str(callback_query['message']['message_id']) - enter_msg_id = str(callback_query['message']['reply_to_message']['message_id']) - - # получаем профиль нажавшего кнопку - actor = Profile.get(member_id) - - if welcomed_member_id == member_id: - print(f'callback_query in {CHAT_ID}') - - if callback_data == BUTTON_NO: - print('wrong answer, cleanup') - r = delete_message(CHAT_ID, enter_msg_id) - print(r.json()) - r = delete_message(CHAT_ID, welcome_msg_id) - print(r.json()) - print('ban member') - r = ban_member(CHAT_ID, member_id) - print(r.json()) + # получаем профиль нажавшего кнопку + actor_id = str(callback_query['from']['id']) + actor = Profile.get(actor_id) - # обработка профиля заблокированного пользователя - Profile.leaving(actor) + callback_data = callback_query['data'] + if callback_data.startswith(BUTTON_VOUCH): + print(f'vouch button pressed by {actor_id}') - elif callback_data == BUTTON_OK: - print('proper answer, cleanup') - r = delete_message(CHAT_ID, welcome_msg_id) - print(r.json()) - actor['newcomer'] = False - - r = delete_message(CHAT_ID, author["welcome_id"]) - print(r.json()) - - r = set_chatpermissions(CHAT_ID, { "can_send_messages": True }) - print(r.json()) - - # обновление профиля нажавшего правильную кнопку - Profile.save(actor) - - elif callback_data == BUTTON_VOUCH: - # это кнопка поручения - print(f'vouch button pressed by {member_id}') - newcomer = Profile.get(welcomed_member_id) - if welcomed_member_id not in inviter['vouched_for'] and \ - member_id not in newcomer['vouched_by']: - newcomer['vouched_by'].append(welcomed_member_id) - actor['vouched_for'].append(member_id) + newcomer_id = callback_data[len(BUTTON_VOUCH):] + newcomer = Profile.get(newcomer_id) + if newcomer_id not in inviter['children'] and \ + actor_id not in newcomer['parents']: + newcomer['parents'].append(newcomer_id) + actor['children'].append(actor_id) Profile.save(newcomer) Profile.save(actor) - print('vouch success, unban member') - r = unban_member(CHAT_ID, member_id) - print(r.json()) - + try: + chat_id = str(callback_query['message']['chat']['id']) + + print('accept join request for public chat') + r = approve_chat_join_request(chat_id, newcomer_id) + print(r.json()) + + print('unmute newcomer') + r = unmute_member(chat_id, newcomer_id) + print(r.json()) + except: + pass + + +def handle_join_request(update): + print(f'handle join request') + chat_id = str(update['message']['chat']['id']) + from_id = str(update['message']['from']['id']) + actor = Profile.get(from_id) + + actor["name"] = update['message']['from']['first_name'] + update['message']['from'].get('last_name', '') + actor["mention"] = update['message']['from'].get('username', '') + + if from_id == str(update['message']['new_chat_member']['id']): + if len(actor['parents']) == 0: + # показываем сообщение с кнопкой "поручиться" + welcome_msg_id = show_request_msg(update) \ No newline at end of file diff --git a/tgbot/profile.py b/tgbot/profile.py index d2decac..a64a675 100644 --- a/tgbot/profile.py +++ b/tgbot/profile.py @@ -9,10 +9,11 @@ class Profile: def create(self, member_id): s = { "id": member_id, - "newcomer": True, + "name": "newcomer", + "mention": "", "welcome_id": 0, - "vouched_by": [], - "vouched_for": [] + "parents": [], + "children": [] } self.storage.set(f'usr-{member_id}', json.dumps(s)) return s @@ -24,5 +25,5 @@ class Profile: return json.loads(self.storage.get(f'usr-{member_id}')) or self.create_session(member_id) def leaving(self, s): - if len(s['vouched_by']) == 0: + if len(s['parents']) == 0: self.storage.delete(f'usr-{s["id"]}')