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

types-fix

Browse Source
This commit is contained in:
Untone 2024-01-06 14:42:00 +03:00
parent 91e2d41cb6
commit f181f68078
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
main.py
View File

@ -30,12 +30,9 @@ async def command_start_handler(message):
await message.answer(caption) await message.answer(caption)
async def process_callback(callback_query): async def process_callback(cbq):
cbq = vars(callback_query)
try: try:
cbq["from"] = vars(callback_query.from_user) data = cbq.get("data")
cbq["message"] = vars(callback_query.message)
data = cbq["data"]
if data.startswith("vouch"): if data.startswith("vouch"):
await handle_button(cbq) await handle_button(cbq)
elif data.startswith("unlink"): elif data.startswith("unlink"):
@ -48,12 +45,8 @@ async def process_callback(callback_query):
await send_message(FEEDBACK_CHAT_ID, text) await send_message(FEEDBACK_CHAT_ID, text)
async def join_request_handler(update): async def join_request_handler(join_request):
print("chat join request")
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}")
@ -64,41 +57,31 @@ async def join_request_handler(update):
async def all_handler(message): async def all_handler(message):
msg = vars(message)
try: try:
msg["from"] = vars(message.from_user) await handle_routing(message, state)
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 asyncio.sleep(1.0)
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.debug(msg) logger.debug(message)
import traceback import traceback
text = traceback.format_exc() text = traceback.format_exc()
await send_message(FEEDBACK_CHAT_ID, text) await send_message(FEEDBACK_CHAT_ID, text)
async def chat_members_change(update): async def chat_members_change(update):
member_updated = vars(update)
try: try:
member_updated["chat"] = vars(update.chat) old = update.get("old_chat_member")
member_updated["from"] = vars(update.from_user) if old:
old_member = vars(member_updated["old_chat_member"]) if old.get("status") == 'KICKED':
new_member = vars(member_updated["new_chat_member"]) Profile.erase(update["from"]["id"])
if old_member: await handle_left(update)
if old_member.status == 'KICKED': elif update.get("new_chat_member"):
Profile.erase(member_updated["from"]["id"]) await handle_join(update)
await handle_left(member_updated)
elif new_member:
await handle_join(member_updated)
else: else:
logger.info("unhandled members update") logger.info("unhandled members update")
except Exception as e: except Exception as e:
logger.error(f"[main.my_chat_member] ERROR {e}") logger.error(f"[main.my_chat_member] ERROR {e}")
logger.debug(member_updated) logger.debug(update)
import traceback import traceback
text = traceback.format_exc() text = traceback.format_exc()
await send_message(FEEDBACK_CHAT_ID, text) await send_message(FEEDBACK_CHAT_ID, text)