bug fix

Author: b-simjoo

Handlers.py

@@ -44,9 +44,9 @@ def gentoken(u: Update, c: CallbackContext):
             [random.choice(string.ascii_letters+string.digits) for x in range(32)])
         server.admin_token.append(admin_token)
         u.message.reply_html((
-            'one-time admin token:\n<pre>'
+            'one-time admin token:\n<pre>\n'
             f'{admin_token}'
-            '</pre>\n<i>Send this token to anyone you want to promote as admin'
+            '\n</pre>\n<i>Send this token to anyone you want to promote as admin</i>'
         ))
 
     # TODO:availability of removing admins feature
@@ -723,12 +723,6 @@ def send(u: Update, c: CallbackContext):
     server.dispatcher.add_handler(sendall_conv_handler.get_handler(), group = 1)
 
 def add_users_handlers(server: BotHandler):
-    def unknown_msg(u: Update, c: CallbackContext):
-        u.message.reply_text(server.get_string('unknown-msg'))
-
-    def unknown_command(u: Update, c: CallbackContext):
-        u.message.reply_text(server.get_string('unknown'))
-
     dispatcher_decorators = DispatcherDecorators(server.dispatcher)
 
     @dispatcher_decorators.commandHandler
@@ -809,9 +803,6 @@ def handle_edited_msg(u: Update, c:CallbackContext):
         # labels: enhancement
         u.edited_message.reply_text(server.strings['edited-message'])
 
-    dispatcher_decorators.addHandler(MessageHandler(Filters.command, unknown_command))
-    dispatcher_decorators.addHandler(MessageHandler(Filters.all, unknown_msg))
-
 def add_other_handlers(server: BotHandler):
     dispatcher_decorators = DispatcherDecorators(server.dispatcher)
 
@@ -870,3 +861,17 @@ def error_handler(update: object, context: CallbackContext) -> None:
             user_data = context.user_data,
             chat_data = context.chat_data
         )
+
+def add_unknown_handlers(server: BotHandler):
+    "this must be the last method you call while adding handlers"
+
+    dispatcher_decorators = DispatcherDecorators(server.dispatcher)
+
+    def unknown_msg(u: Update, c: CallbackContext):
+        u.message.reply_text(server.get_string('unknown-msg'))
+
+    def unknown_command(u: Update, c: CallbackContext):
+        u.message.reply_text(server.get_string('unknown'))
+
+    dispatcher_decorators.addHandler(MessageHandler(Filters.command, unknown_command),1)
+    dispatcher_decorators.addHandler(MessageHandler(Filters.all, unknown_msg),1)

main.py

@@ -121,18 +121,19 @@ def __init__(
         Handlers.add_admin_handlers(self)
         Handlers.add_owner_handlers(self)
         Handlers.add_other_handlers(self)
+        Handlers.add_unknown_handlers(self)
 
     def log_bug(self, exc:Exception, msg='', report = True, disable_notification = False,**args):
         info = BugReporter.exception(msg, exc, report = self.bug_reporter and report)
         logging.exception(msg, exc_info=exc)
         msg = html.escape(msg)
-        tb_string = html.escape(info['tb_string'])
+        escaped_info = {k:html.escape(str(v)) for k,v in info.items()}
         message = (
             '<b>An exception was raised</b>\n'
-            '<i>L{line_no}@{file_name}: {exc_type}<i>\n'
+            '<i>L{line_no}@{file_name}: {exc_type}</i>\n'
             f'{msg}\n\n'
-            f'<pre>{tb_string}</pre>'
-        ).format_map(info)
+            '<pre>{tb_string}</pre>'
+        ).format_map(escaped_info)
 
         if len(args):
             message+='\n\nExtra info:'
@@ -144,7 +145,7 @@ def log_bug(self, exc:Exception, msg='', report = True, disable_notification = F
         try:
             self.bot.send_message(chat_id = self.ownerID, text = message, parse_mode = ParseMode.HTML, disable_notification = disable_notification)
         except:
-            logging.exception('can not send message to owner')
+            logging.exception('can not send message to owner. message:\n'+message)
 
     def purge(self, html_str:str, images=True):
         tags = self.SUPPORTED_HTML_TAGS