@@ -228,21 +228,33 @@ async def check_idle_verification():
228228 logging .info ("User %s group %s timeout, message id %s" , from_user_id , group_id , message_id )
229229 # delete captcha, ban user, and remove from redis
230230 await ban_user (group_id , from_user_id )
231- await delete_captcha (group_id , message_id )
231+ await delete_captcha (group_id , from_user_id , message_id )
232232 await invalid_queue (gid_uid )
233233 else :
234234 logging .info ("User %s in group %s still in verification queue" , from_user_id , group_id )
235235 except Exception as e :
236236 logging .info ("redis data %s is not correct:%s" , value , e )
237237
238238
239- async def delete_captcha (group_id , message_id ):
239+ async def delete_captcha (group_id , from_user_id , message_id ):
240+ # count = 0
241+ # while True:
242+ # try:
243+ # logging.info("preparing to delete captcha message %s %s in group %s", from_user_id, message_id, group_id)
244+ # count += 1
245+ # msg = await app.get_messages(group_id, message_id)
246+ # if msg.empty or count >= 5:
247+ # break
248+ # await msg.delete()
249+ # await asyncio.sleep(1)
250+ # except Exception as e:
251+ # logging.error("Failed to delete message %s in group %s: %s", message_id, group_id, e)
252+ logging .info ("preparing to delete captcha message %s %s in group %s" , from_user_id , message_id , group_id )
240253 try :
241254 msg = await app .get_messages (group_id , message_id )
242255 await msg .delete ()
243- logging .info ("Deleted captcha message %s in group %s" , message_id , group_id )
244256 except Exception as e :
245- logging .error ("Failed to delete message %s in group %s: %s" , message_id , group_id , e )
257+ logging .error ("Failed to delete message %s %s in group %s: %s" , from_user_id , message_id , group_id , e )
246258
247259
248260def keyword_hit (keyword : str , message : str | None ) -> bool :
0 commit comments