From eab21831cf13c9afdafc59adde32c85b9716e76b Mon Sep 17 00:00:00 2001 From: clarkzjw Date: Wed, 22 Feb 2023 11:08:15 -0800 Subject: fix /cancel flow --- callback.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'callback.py') diff --git a/callback.py b/callback.py index a7f7181..6a09421 100644 --- a/callback.py +++ b/callback.py @@ -43,8 +43,6 @@ async def callback_location_sharing(update: Update, context: ContextTypes.DEFAUL context.user_data["status_id"] = status["id"] context.user_data["status_content"] = content - print("status_id", context.user_data["status_id"]) - await update.message.reply_text( text=f"Selected place: {poi['name']}, \nPosted to Mastodon: {status['url']}", parse_mode=ParseMode.MARKDOWN, @@ -78,8 +76,6 @@ async def callback_manual_location(update: Update, context: ContextTypes.DEFAULT context.user_data["status_id"] = status["id"] context.user_data["status_content"] = content - print("status_id", context.user_data["status_id"]) - await update.message.reply_text( text=f"Manually selected place: {loc}, \nPosted to Mastodon: {status['url']}", parse_mode=ParseMode.MARKDOWN, @@ -109,8 +105,6 @@ async def callback_location_confirmation(update: Update, context: ContextTypes.D context.user_data["status_id"] = status["id"] context.user_data["status_content"] = content - print("status_id", context.user_data["status_id"]) - await query.message.reply_text( text=f"Selected place: {poi['name']}, `{query.data}`\nPosted to Mastodon: {status['url']}", parse_mode=ParseMode.MARKDOWN, @@ -125,12 +119,12 @@ async def callback_location_confirmation(update: Update, context: ContextTypes.D async def callback_location_keyword_search(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int: await context.bot.delete_message(update.effective_chat.id, context.user_data[PROMPT_LOCATION_KEYWORD]) - location_search = update.effective_message.text + location_search_keyword = update.effective_message.text latitude = context.user_data["latitude"] longitude = context.user_data["longitude"] keyboard = [] - poi_result = query_poi(location_search, latitude, longitude) + poi_result = query_poi(location_search_keyword, latitude, longitude) if len(poi_result) == 0: poi_result = query_poi("", latitude, longitude) @@ -140,13 +134,13 @@ async def callback_location_keyword_search(update: Update, context: ContextTypes ]) if len(keyboard) == 0: - await update.message.reply_text(PROMPT_NO_NEARBY_POI) - return LOCATION_CONFIRMATION + msg = await update.message.reply_text(PROMPT_NO_NEARBY_POI) else: reply_markup = InlineKeyboardMarkup(keyboard) - context.user_data["location_search"] = location_search - await update.message.reply_text(PROMPT_CHOOSE_POI_FROM_LIST, reply_markup=reply_markup) + context.user_data["location_search"] = location_search_keyword + msg = await update.message.reply_text(PROMPT_CHOOSE_POI_FROM_LIST, reply_markup=reply_markup) + context.user_data[PROMPT_CHOOSE_POI_FROM_LIST] = msg.message_id return LOCATION_CONFIRMATION @@ -188,7 +182,9 @@ async def callback_add_comment(update: Update, context: ContextTypes.DEFAULT_TYP async def callback_skip_comment(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int: await context.bot.delete_message(update.effective_chat.id, context.user_data[PROMPT_ADD_COMMENT]) - prompt_attach_photo_msg = await update.message.reply_text(PROMPT_ADD_MEDIA, reply_markup=INLINE_SKIP_MENU) + prompt_attach_photo_msg = await context.bot.send_message(chat_id=update.effective_chat.id, + text=PROMPT_ADD_MEDIA, + reply_markup=INLINE_SKIP_MENU) context.user_data[PROMPT_ADD_MEDIA] = prompt_attach_photo_msg.message_id return ADD_MEDIA -- cgit v1.2.3