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

datastruct-fixes

Browse Source
This commit is contained in:
Untone 2023-09-18 13:01:57 +03:00
parent cbf50c7c2a
commit 1c108c7fed
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot/handlers/handle_feedback.py
View File

@ -42,7 +42,7 @@ async def handle_feedback(msg, state):
async def handle_answer(msg): async def handle_answer(msg):
logger.info("handle answering feedback") logger.info("handle answering feedback")
logger.debug(msg) logger.debug(msg)
if "reply_to_message" in msg: if msg.get("reply_to_message"):
answered_msg = msg.get("reply_to_message") answered_msg = msg.get("reply_to_message")
if "from" not in answered_msg: if "from" not in answered_msg:
answered_msg["from"] = vars(msg.from_user) answered_msg["from"] = vars(msg.from_user)

5
bot/main.py
View File

@ -27,6 +27,8 @@ 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)
data = cbq["data"] data = cbq["data"]
if data.startswith("vouch"): if data.startswith("vouch"):
await handle_button(cbq) await handle_button(cbq)
@ -38,6 +40,8 @@ async def process_callback(callback_query: CallbackQuery):
async def join_request_handler(update: ChatJoinRequest) -> None: async def join_request_handler(update: ChatJoinRequest) -> None:
print("chat join request") print("chat join request")
join_request = vars(update) join_request = vars(update)
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)
@ -45,6 +49,7 @@ 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)
msg["from"] = vars(message.from_user) msg["from"] = vars(message.from_user)
msg["reply_to_message"] = vars(message.reply_to_message)
msg["chat"] = vars(message.chat) msg["chat"] = vars(message.chat)
await handle_routing(msg, state) await handle_routing(msg, state)
await asyncio.sleep(1.0) await asyncio.sleep(1.0)