aho/welcomecenterbot
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes-dict

Browse Source
This commit is contained in:
Untone
2023-10-21 13:16:01 +03:00
parent 1619679056
commit 839224a950
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bot/main.py
View File

@@ -34,17 +34,7 @@ async def command_start_handler(message: Message) -> None:
@router.callback_query() @router.callback_query()
async def process_callback(callback_query: CallbackQuery): async def process_callback(callback_query: CallbackQuery):
cbq = vars(callback_query) cbq = vars(callback_query)
cbq["from"] = vars(callback_query.from_user)
cbq["message"] = vars(callback_query.message)
cbq["message"]["chat"] = vars(callback_query.message.chat)
data = cbq["data"]
if data.startswith("vouch"):
await handle_button(cbq)
elif data.startswith("unlink"):
await handle_unlink(cbq, state)
try: try:
cbq["from"] = vars(callback_query.from_user)
cbq["message"] = vars(callback_query.message)
data = cbq["data"] data = cbq["data"]
if data.startswith("vouch"): if data.startswith("vouch"):
await handle_button(cbq) await handle_button(cbq)
@@ -60,8 +50,6 @@ async def join_request_handler(update: ChatJoinRequest) -> None:
print("chat join request") print("chat join request")
join_request = vars(update) join_request = vars(update)
try: try:
join_request["from"] = vars(update.from_user)
join_request["chat"] = vars(update.chat)
await handle_join_request(join_request) await handle_join_request(join_request)
except Exception as e: except Exception as e:
logger.error(f"[main.join_request_handler] ERROR {e}") logger.error(f"[main.join_request_handler] ERROR {e}")
@@ -72,10 +60,6 @@ async def join_request_handler(update: ChatJoinRequest) -> None:
async def all_handler(message: Message) -> None: async def all_handler(message: Message) -> None:
msg = vars(message) msg = vars(message)
try: try:
msg["from"] = vars(message.from_user)
msg["chat"] = vars(message.chat)
if message.reply_to_message:
msg["reply_to_message"] = vars(message.reply_to_message)
await handle_routing(msg, state) await handle_routing(msg, state)
await asyncio.sleep(1.0) await asyncio.sleep(1.0)
except Exception as e: except Exception as e:
@@ -87,11 +71,8 @@ async def all_handler(message: Message) -> None:
async def chat_members_change(update: ChatMemberUpdated): async def chat_members_change(update: ChatMemberUpdated):
msg = vars(update) msg = vars(update)
try: try:
msg["chat"] = vars(update.chat) old_member = update["old_chat_member"]
msg["from"] = vars(update.from_user) new_member = update["new_chat_member"]
logger.debug(msg)
old_member = update.old_chat_member
new_member = update.new_chat_member
if old_member: if old_member:
if old_member.status == ChatMemberStatus.KICKED: if old_member.status == ChatMemberStatus.KICKED:
Profile.erase(update.from_user.id) Profile.erase(update.from_user.id)
@@ -103,7 +84,7 @@ async def chat_members_change(update: ChatMemberUpdated):
except Exception as e: except Exception as e:
logger.error(f"[main.all_handler] ERROR {e}") logger.error(f"[main.all_handler] ERROR {e}")
logger.debu(msg) logger.debug(msg)
async def main() -> None: async def main() -> None:

2
bot/utils/mention.py
View File

@@ -12,7 +12,7 @@ def mention(user):
def userdata_extract(user): def userdata_extract(user):
ln = " " + user.get('last_name') if user.get('last_name') else "" ln = " " + user.get('last_name', "") if user.get('last_name', "") else ""
identity = f"{user['first_name']}{ln}" identity = f"{user['first_name']}{ln}"
uid = user["id"] uid = user["id"]
username = user.get("username", "") username = user.get("username", "")