unbloat-code

This commit is contained in:
2024-01-07 12:19:46 +03:00
parent f181f68078
commit a80727e97f
24 changed files with 179 additions and 975 deletions

View File

@@ -1,60 +0,0 @@
from bot.api import send_message, delete_message, kick_member
from handlers.command_my import handle_command_my
from handlers.callback_vouch import update_button
from utils.mention import userdata_extract
from storage import Profile
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
# remove link of callback sender
# from member vouched before
async def handle_unlink(payload, state):
logger.info("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))
Profile.save(actor)
# удаляем связь с предком
linked = Profile.get(linked_id)
linked["parents"].remove(str(from_id))
Profile.save(linked)
# удаляем старое сообщение с кнопками-unlink
reply_msg_id = payload["message"]["message_id"]
r = await delete_message(from_id, reply_msg_id)
logger.debug(r)
# если ещё есть связи - посылаем новое сообщение
if len(actor["children"]) > 0:
await handle_command_my(payload, state)
lang = payload["from"].get("language_code", "ru")
for chat_id in linked["chats"]:
# если больше никто не поручился - kick out
if len(linked["parents"]) == 0:
r = await kick_member(chat_id, linked_id)
logger.debug(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 = await send_message(chat_id, body)
logger.debug(r)
# обновление счётчика
await update_button(linked_id, chat_id)

View File

@@ -1,62 +0,0 @@
from bot.api import approve_chat_join_request, edit_replymarkup
from storage import Profile, storage
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
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")
newcomer = Profile.get(member_id)
amount = len(newcomer["parents"]) + 1
text = f"❤️ {amount}"
rm = {
"inline_keyboard": [[{"text": text, "callback_data": "vouch" + member_id}]]
}
r = await edit_replymarkup(chat_id, button_message_id, reply_markup=rm)
print(r)
async def handle_button(callback_query):
# получаем профиль нажавшего кнопку
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}")
newcomer_id = callback_data[5:]
print(f"button pressed for {newcomer_id}")
newcomer = Profile.get(newcomer_id)
print(f"newcomer profile {newcomer}")
if newcomer_id == actor_id:
# нажал сам, не реагируем, прописываем данные
_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(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(vars(callback_query["message"]["chat"])["id"])
print("accept join request")
r = await approve_chat_join_request(chat_id, newcomer_id)
print(r)
await update_button(chat_id, newcomer_id)

View File

@@ -1,21 +0,0 @@
from storage import Profile
from handlers.send_button import show_request_msg
from bot.api import get_member
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def handle_command_ask(msg):
logger.info("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)
logger.debug(r)
m = {}
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:
logger.error(r)

View File

@@ -1,15 +0,0 @@
from utils.graph import generate_chart
from bot.api import send_document
from storage import storage, scan
import json
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def handle_command_graph(msg):
_usr_ids, members = scan(match="usr-*", count=100)
data = generate_chart(members)
if data:
r = await send_document(msg["chat"]["id"], data, "chart.svg")
logger.debug(r)

View File

@@ -1,55 +0,0 @@
from storage import Profile, scan
from bot.api import get_member, send_message
from utils.mention import userdata_extract
import json
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def construct_unlink_buttons(actor):
print(f"constructing unlink buttons for {actor['children']}")
buttons = []
for vouch in actor["children"]:
for chat_id in actor["chats"]:
r = await get_member(chat_id, vouch)
logger.debug(r)
if "result" in r:
member = r["result"]["user"]
_uid, identity, username = userdata_extract(member)
buttons.append(
{"text": f"{identity} {username}", "callback_data": "unlink" + vouch}
)
return buttons
async def handle_command_my(msg, state):
logger.info("handle my command")
from_id = str(msg["from"]["id"])
sender = Profile.get(from_id, msg)
# генерируем кнопки для всех, за кого поручились
buttons = await construct_unlink_buttons(sender)
reply_markup = {
"inline_keyboard": [
buttons,
]
}
if len(buttons) == 0:
if msg["from"].get("language_code", "ru") == "ru":
body = "Вас ещё никто не узнал? Напишите, я передам нашему кругу"
else:
body = (
"Nobody recognized you? Speak, I will pass your message to the circle"
)
r = await send_message(from_id, body)
logger.debug(r)
chat_id = msg["chat"]["id"]
state.make_talking(from_id, chat_id)
else:
if msg["from"].get("language_code", "ru") == "ru":
body = "Нажмите кнопки ниже, чтобы удалить ваши связи"
else:
body = "Unlink your connections pressing the buttons below"
r = await send_message(from_id, body, reply_markup=reply_markup)
print(r)

View File

@@ -1,46 +0,0 @@
from bot.api import send_message, delete_message, get_chat_administrators
from handlers.command_my import handle_command_my
from storage import Profile, storage
from handlers.send_button import show_request_msg
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def handle_default(msg, state):
logger.info(f"default handler for all messages {msg}")
chat_id = str(msg["chat"]["id"])
from_id = str(msg["from"]["id"])
sender = Profile.get(from_id, msg)
text = msg.get("text", "")
if text.startswith("/my"):
# команда в групповом чате
logger.info("remove some messages in group chat")
# удалить сообщение с командой /my
r = await delete_message(chat_id, msg["message_id"])
logger.debug(r)
# показать связи в личке
await handle_command_my(msg, state)
else:
# любое другое сообщение
if len(sender["parents"]) == 0:
# владелец чата автоматически ручается
logger.info(f"setting owner as parent for {from_id}")
r = await get_chat_administrators(chat_id)
logger.debug(r)
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))
# обновляем профиль владельца
owner = Profile.get(owner_id)
owner["children"].append(str(from_id))
Profile.save(owner)
# сохранить профиль отправителя
Profile.save(sender)

View File

@@ -1,65 +0,0 @@
import json
from bot.api import (
send_message,
forward_message,
get_chat_administrators,
)
from storage import storage
from bot.config import FEEDBACK_CHAT_ID
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def handle_feedback(msg, state):
mid = msg["message_id"]
cid = msg["chat"]["id"]
uid = msg["from"]["id"]
if msg["text"] == "/start":
r = await send_message(cid, "Напишите своё сообщение для администрации чата")
logger.debug(r)
elif state.is_talking(uid):
r = await forward_message(cid, mid, state.talking[uid])
logger.debug(r)
state.aho(uid)
else:
r = await forward_message(cid, mid, FEEDBACK_CHAT_ID)
logger.debug(r)
support_msg_id = r["result"]["message_id"]
# сохранение айди сообщения в приватной переписке с ботом
storage.set(
f"fbk-{support_msg_id}",
json.dumps(
{"author_id": uid, "message_id": mid, "chat_id": cid}
),
)
async def handle_answer(msg):
logger.info("handle answering feedback")
logger.debug(msg)
answered_msg = msg.get("reply_to_message")
if answered_msg:
if "from" not in answered_msg:
answered_msg["from"] = msg.get("from_user")
r = await get_chat_administrators(msg["chat"]["id"])
logger.debug(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"])
# получение сохраненного информации о сообщении для ответа
stored_feedback = storage.get(f"fbk-{support_msg_id}")
if stored_feedback:
logger.info("handle an answer from feedback group")
stored_feedback = json.loads(stored_feedback)
r = await send_message(
f'{stored_feedback["chat_id"]}',
msg["text"],
reply_to=stored_feedback["message_id"],
)
logger.debug(r)

View File

@@ -1,22 +1,28 @@
from bot.api import approve_chat_join_request, delete_message
from handlers.send_button import show_request_msg
from storage import Profile, storage
from bot.api import telegram_api
from bot.announce import show_announce
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
positive_reactions = [] # TODO: set positive reaction kinds
async def handle_join_request(join_request):
logger.info(f"handle join request {join_request}")
chat_id = str(join_request["chat"]["id"])
from_id = str(join_request["from"]["id"])
actor = Profile.get(from_id, join_request)
if len(actor["parents"]) == 0:
# показываем сообщение с кнопкой "поручиться"
await show_request_msg(join_request)
else:
# за пользователя поручились ранее
r = await approve_chat_join_request(chat_id, from_id)
# показываем сообщение с кнопкой "поручиться"
await show_announce(join_request)
async def handle_reaction_on_request(update):
chat_id = str(update["chat"]["id"])
from_id = str(update["from"]["id"])
logger.debug(update)
reaction = None # TODO: get reaction kind from update
if reaction in positive_reactions:
# за пользователя поручились
r = await telegram_api("approveChatJoinRequest", chat_id=chat_id, from_id=from_id)
logger.debug(r)
Profile.save(actor)

View File

@@ -1,47 +0,0 @@
from handlers.send_button import show_request_msg
from bot.api import delete_message
from storage import Profile, storage
from bot.config import FEEDBACK_CHAT_ID
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
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"])
if from_id == newcomer_id:
if len(actor["parents"]) == 0 and str(chat_id) != FEEDBACK_CHAT_ID:
# показываем сообщение с кнопкой "поручиться"
r = await show_request_msg(msg)
logger.debug(r)
else:
# за пользователя поручились ранее
pass
else:
# пользователи приглашены другим участником
logger.info(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"]))
# обновляем профиль пригласившего
Profile.save(actor)
async def handle_left(msg):
logger.info("handling member leaving")
member_id = msg["left_chat_member"]["id"]
chat_id = msg["chat"]["id"]
# удаление сообщения с кнопкой в этом чате
prev_msg = storage.get(f"btn-{chat_id}-{member_id}")
if prev_msg:
r = await delete_message(chat_id, prev_msg["message_id"])
logger.debug(r)
storage.remove(f"btn-{chat_id}-{member_id}")

View File

@@ -0,0 +1,26 @@
from bot.config import FEEDBACK_CHAT_ID
from bot.announce import edit_announce
from bot.api import telegram_api
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
start_message = {
'en': "Welcome home! You can type any message here to be passed to chat",
'ru': "Доброе утро! Можешь напечатать здесь любое сообщение для передачи в чат"
}
async def handle_private(msg, state):
text = msg.get("text")
sender = msg.get("from", {})
lang = sender.get("language_code", "ru")
if lang != "ru" and lang != "en":
lang = "en"
if text.startswith("/"):
if text == '/start':
await telegram_api("sendMessage", chat_id=sender.get("id"), text=start_message[lang])
else:
await telegram_api("forwardMessage", from_chat_id=sender.get("id"), message_id=msg.get("id"), chat_id=FEEDBACK_CHAT_ID)
else:
await edit_announce(msg)

View File

@@ -1,45 +0,0 @@
from bot.config import FEEDBACK_CHAT_ID
from storage import scan, Profile
from bot.api import approve_chat_join_request, kick_member, send_message
from handlers.callback_vouch import update_button
from utils.mention import userdata_extract
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def revalidate_storage():
# поддерживает консистентность данных
btn_ids, _btns = scan(match="btn-*", count=100)
logger.info(f"storage data revalidation for {len(btn_ids)} entries")
for btnid in btn_ids:
# для каждой ранее созданной кнопки
btnid_str = btnid.decode("utf-8").replace("btn-", "")
parts = btnid_str.split("-")
logger.debug(parts)
_, chat_id, member_id = parts
chat_id = "-" + chat_id
newcomer = Profile.get(member_id)
if len(newcomer.get("parents", [])) > 0:
# принять заявку если её нажимали
r = await approve_chat_join_request(chat_id, member_id)
logger.debug(r)
await update_button(chat_id, member_id)
elif len(newcomer.get("parents", [])) == 0:
r = await kick_member(chat_id, member_id)
logger.debug(r)
if r["ok"]:
_, identity, username = userdata_extract(newcomer["result"]["user"])
# feedback report
body = f"Участник {identity} {username} был удалён"
r = await send_message(FEEDBACK_CHAT_ID, body)
logger.debug(r)
# pm report
body = f"Вы утратили поддержку в чате и были удалены"
r = await send_message(member_id, body)
logger.debug(r)
async def handle_startup():
await revalidate_storage()

View File

@@ -0,0 +1,32 @@
from bot.api import telegram_api
from bot.config import FEEDBACK_CHAT_ID
import logging
from handlers.handle_private import handle_private
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def messages_routing(msg, state):
cid = msg["chat"]["id"]
uid = msg["from"]["id"]
text = msg.get("text")
if cid == uid:
# сообщения в личке с ботом
logger.info("private chat message")
await handle_private(msg, state)
elif str(cid) == FEEDBACK_CHAT_ID:
# сообщения из группы обратной связи
logger.info("feedback chat message")
logger.debug(msg)
reply_msg = msg.get("reply_to_message")
if reply_msg:
reply_chat_id = reply_msg.get("chat", {}).get("id")
if reply_chat_id != FEEDBACK_CHAT_ID:
await telegram_api("sendMessage", chat_id=reply_chat_id, text=text, reply_to=reply_msg.get("message_id"))
else:
pass

View File

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

View File

@@ -1,56 +0,0 @@
from bot.api import send_message, send_photo, get_userphotos, delete_message
from utils.mention import mention, userdata_extract
from storage import storage
import logging
logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
async def show_request_msg(msg, auto = False):
logger.info("showing request with button")
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}]]
}
newcomer_message = (
"Нажмите, чтобы одобрить заявку "
if lang == "ru"
else "There is a newcomer, press the button if you are connected with "
)
r = await get_userphotos(user_id=from_id)
logger.debug(r)
if r["ok"] and r["result"]["total_count"] > 0:
logger.info("showing button with photo")
file_id = r["result"]["photos"][0][0]["file_id"]
_uid, identity, username = userdata_extract(msg["from"])
r = await send_photo(
chat_id,
file_id,
caption=newcomer_message + f"{identity}{username}",
reply_to=msg.get("message_id", ""),
reply_markup=reply_markup,
)
else:
logger.info("showing button without photo")
r = await send_message(
chat_id,
newcomer_message + mention(msg["from"]),
reply_to=msg.get("message_id", ""),
reply_markup=reply_markup,
)
logger.debug(r)
if "message_id" in r:
# удаляем предыдущее сообщение с кнопкой в этом чате
prevbtn = storage.get(f"btn-{chat_id}-{from_id}")
if prevbtn:
r = await delete_message(chat_id, prevbtn)
logger.debug(r)
# создаём новое
newbtn = r["message_id"]
logger.info(f"button message id: {newbtn}")
storage.set(f"btn-{chat_id}-{from_id}", newbtn)