Merge branch 'develop' into release

Author: b-simjoo

BugReporter.py

@@ -1,5 +1,6 @@
 import json
 import subprocess
+import logging
 from os.path import exists
 
 class __reporter__:
@@ -24,7 +25,12 @@ def bug(self, tag, message=None, custom_prop={}):
 class BugReporter:
     def __init__(self, file_path = 'bugs.json'):
         if exists(file_path):
-            self.reports = json.load(open(file_path))
+            try:
+                self.reports = json.load(open(file_path, encoding='utf8'))
+            except Exception as ex:
+                logging.exception(f'Exception while trying to parse "{file_path}".')
+                logging.warning('skipping parse bugs file.')
+                self.reports = dict()
         else:
             self.reports = dict()
         self.file_path = file_path
@@ -36,7 +42,7 @@ def __call__(self, group):
         return reporter
 
     def dump(self):
-        json.dump(self.reports, open(self.file_path, 'w'), indent = 2, ensure_ascii = False)
+        json.dump(self.reports, open(self.file_path, 'w', encoding='utf8'), indent = 2, ensure_ascii = False)
 
     def dumps(self):
         return json.dumps(self.reports, indent = 2, ensure_ascii = False)

default-strings.json

@@ -30,7 +30,8 @@
         ],
         "time-limit-error": "Sorry, I can not answer you right now because of time limitation between two request, try again 2 mins later.",
         "unknown": "Unknown command",
-        "unknown-msg": "Sorry, I can't chat with anyone right now!"
+        "unknown-msg": "Sorry, I can't chat with anyone right now!",
+        "edited-message": "Sorry this bot can not handle edited messages, please resend your message"
     },
     "fa-ir": {
         "welcome": [
@@ -68,6 +69,7 @@
         ],
         "time-limit-error": ".با عرض پوزش اکنون به دلیل محدودیت زمان بین تو درخواست نمی توانم به شما پاسخ دهم. بعد از دو دقیقه مجددا تلاش کنید",
         "unknown": "متأسفم، دستوری که وارد کردید صحیح نیست",
-        "unknown-msg": "!متأسفم، در حال حاضر نمی توانم با کاربران چت کنم"
+        "unknown-msg": "!متأسفم، در حال حاضر نمی توانم با کاربران چت کنم",
+        "edited-message": "با عرض پوزش این ربات در حال حاضر از ویرایش پیام پشتیبانی نمی کند"
     }
 }

main.py

@@ -19,6 +19,7 @@
 from telegram.utils.helpers import DEFAULT_NONE
 from telegram.bot import Bot
 from telegram.ext import *
+from telegram.error import NetworkError
 from dateutil.parser import parse
 from datetime import datetime, timedelta
 from threading import Timer
@@ -118,6 +119,14 @@ def __init__(
         self.__check__ = True
         self.reporter = bug_reporter if bug_reporter else None
 
+        def handle_edited_msg(u: Update, c:CallbackContext):
+            #TODO: Handle editing messages
+            # Handle messages editing in /send_all could be usefull
+            # labels: enhancement
+            u.edited_message.reply_text(self.strings['edited-message'])
+        
+        self.dispatcher.add_handler(MessageHandler(Filters.update.edited_message,handle_edited_msg))
+
         @self.command
         def start(update: Update, _: CallbackContext):
             chat = update.effective_chat
@@ -266,8 +275,6 @@ def set_interval(u: Update, c: CallbackContext):
                     self.interval = int(c.args[0])
                     self.__set_data__(
                         'interval', self.interval, self.data_db)
-                    #TODO: exception on message editing
-                    # labels: bug
                     u.message.reply_text('✅ Interval changed to'+str(self.interval))
                     return
             u.message.reply_markdown_v2('❌ Bad command, use `/set_interval {new interval in seconds}`')
@@ -847,6 +854,9 @@ def error_handler(update: object, context: CallbackContext) -> None:
             logging.error(msg = "Exception while handling an update:",
                          exc_info = context.error)
 
+            if type(context.error) is type(NetworkError):
+                return
+
             # traceback.format_exception returns the usual python message about an exception, but as a
             # list of strings rather than a single string, so we have to join them together.
             tb_list = traceback.format_exception(
@@ -856,7 +866,7 @@ def error_handler(update: object, context: CallbackContext) -> None:
             s = traceback.extract_tb(tb)
             f = s[-1]
             lineno = f.lineno
-            filename = f.filename
+            filename = os.path.basename(f.filename)
             exception_type = type(context.error).__name__
             if self.reporter:
                 self.reporter.bug(f'L{lineno}@{filename}: {exception_type}',tb_string, {'line':lineno, 'file':filename})
@@ -1138,7 +1148,7 @@ def index(self):
                                 max-height: 30%;
                                 margin: auto;
                                 background-color: #f39c12;
-                                color:  #641e16;
+                                color:  black;
                                 border-radius: 10px;
                                 padding: 10px;
                                 overflow-x: auto;
@@ -1163,7 +1173,7 @@ def index(self):
                                     lineno = content['custom-prop']['line']
                                     filename = content['custom-prop']['file']
                                     if os.path.exists(filename):
-                                        link = f' <a href="https://github.com/bsimjoo/Telegram-RSS-Bot/blob/main/{filename}#L{lineno}">🔸L{lineno}@{filename}</a></h3>'
+                                        link = f' <a href="https://github.com/bsimjoo/Telegram-RSS-Bot/blob/main/{filename}#L{lineno}">🔸may be here: L{lineno}@{filename}</a></h3>'
                                 res+=f'<h3>&bull;Tag: <kbd>"{tag}"</kbd> Count: {content["count"]} {link}</h3>'
                                 res+=f'<pre>{content["message"]}</pre>'