bug fixed and new configuration for proxy

BugReporter now is static

Author: b-simjoo

BugReporter.py

@@ -185,6 +185,6 @@ def index(self):
         return res
 
     @cherrypy.expose
-    @cherrypy.tools.json_out
+    @cherrypy.tools.json_out()
     def json(self):
         return get_data

Handlers.py

@@ -23,6 +23,7 @@
                         DispatcherDecorators, HandlerDecorator, auth, MessageHandlerDecorator)
 from main import BotHandler
 
+# pylint: disable=unused-variable
 
 def add_owner_handlers(server: BotHandler):
 
@@ -93,7 +94,7 @@ def unknown_command(u: Update, c: CallbackContext):
 
     dispatcher_decorators = DispatcherDecorators(server.dispatcher)
 
-    @dispatcher_decorators.messageHandler(filters=Filters.update, group=0)
+    @dispatcher_decorators.messageHandler(Filters.update, group=0)
     def log_update(u: Update, c: CallbackContext):
         message = (
             'Received a new update event from telegram\n'
@@ -111,7 +112,7 @@ def log_update(u: Update, c: CallbackContext):
                                ownerID=server.ownerID, message=html.escape(message))
 
     @dispatcher_decorators.commandHandler
-    @auth(server.ownerID, server.unknown)
+    @auth(server.ownerID, unknown_command)
     def log_updates(u: Update, c: CallbackContext):
         server.debug = not server.debug
         if server.debug:
@@ -174,13 +175,13 @@ def listchats(u: Update, c: CallbackContext):
         u.message.reply_html(res)
 
     @dispatcher_decorators.commandHandler
-    @auth
+    @admin_auth
     def send_feed_toall(u: Update, c: CallbackContext):
         server.send_feed(
             *server.read_feed(), server.get_string('last-feed'), server.iter_all_chats())
 
     @dispatcher_decorators.commandHandler
-    @auth
+    @admin_auth
     def set_interval(u: Update, c: CallbackContext):
         if len(c.args) == 1:
             if c.args[0].isdigit():
@@ -226,7 +227,7 @@ def sendall(u: Update, c: CallbackContext):
 
         return STATE_ADD
 
-    sendall_conv_handler = ConversationDecorator(sendall, per_user=True)
+    sendall_conv_handler = ConversationDecorator([sendall], per_user=True)
 
     @sendall_conv_handler.state(STATE_ADD)
     @MessageHandlerDecorator(Filters.regex("^✅Send$"))
@@ -719,7 +720,7 @@ def send(u: Update, c: CallbackContext):
         CallbackQueryHandler(cancel(STATE_CONFIRM), pattern='^no$')
     )
 
-    server.dispatcher.add_handler(sendall_conv_handler.get_handler())
+    server.dispatcher.add_handler(sendall_conv_handler.get_handler(), group = 1)
 
 def add_users_handlers(server: BotHandler):
     def unknown_msg(u: Update, c: CallbackContext):

config-example.conf

@@ -4,6 +4,21 @@
 #  in telegram use @botfather to create a bot and then paste token here
 token = your bot token
 
+#  Working behind a proxy. you can use SOCKS or HTTP proxies.
+#  username and password is optional, if you need authentication.
+#  
+#  use-proxy = true
+#
+#  http proxy: 
+#  proxy-url = http://USERNAME:PASSWORD@PROXY_HOST:PROXY_PORT/
+#
+#  SOCKS5 proxy:
+#  proxy-url = socks5h://URL_OF_THE_PROXY_SERVER:PROXY_PORT
+#  proxy-user = USERNAME
+#  proxy-pass = PASSWORD
+#
+#  if you want to use socks5 I recommend you to start proxy-url with `socks5h` instead of `socks5`
+
 source = https://pcworms.blog.ir/rss/
 language = en-us
 strings-file = Default-strings.json

decorators.py

@@ -44,9 +44,10 @@ def decorator_message(func):
 
 def CommandHandlerDecorator(_func=None, command=None, *args, **kwargs):
     def decorator_command(func):
-        if not isinstance(command,str):
-            command = func.__name__
-        return CommandHandler(command,func,*args,**kwargs)
+        command_ = command
+        if not isinstance(command_,str):
+            command_ = func.__name__
+        return CommandHandler(command_,func,*args,**kwargs)
 
     if _func:
         return decorator_command(_func)
@@ -59,11 +60,12 @@ def __init__(self, dispatcher:Dispatcher):
 
     def commandHandler(self, _func=None, command=None, group=1, *args, **kwargs):
         def decorator_command(func):
-            if not isinstance(command,str):
-                command = func.__name__
-            logging.debug(f'add command handler. command:{command} => {func}')
+            command_ = command
+            if not isinstance(command_, str):
+                command_ = func.__name__
+            logging.debug(f'add command handler. command:{command_} => {func}')
             try:
-                self.dispatcher.add_handler(CommandHandler(command,func,*args,**kwargs), group)
+                self.dispatcher.add_handler(CommandHandler(command_,func,*args,**kwargs), group)
             except:
                 logging.exception('exception while trying to add a command')
                 BugReporter.exception('exception while trying to add a command')
@@ -76,7 +78,7 @@ def decorator_command(func):
         else:
             return decorator_command
 
-    def messageHandler(self, _func=None, filters=Filters.all, group=1, *args, **kwargs):
+    def messageHandler(self, filters=Filters.all, group=1, *args, **kwargs):
         def decorator_message(func):
             logging.debug(f'add message handler. handler: {func}')
             try:
@@ -86,11 +88,7 @@ def decorator_message(func):
                 BugReporter.exception('exception while trying to add a command')
 
             return func
-        
-        if _func:
-            return decorator_message(_func)
-        else:
-            return decorator_message
+        return decorator_message
 
     def addHandler(self, handler_:Handler = None, group=1):
         def decorator_handler(handler:Handler):
@@ -135,4 +133,8 @@ def fallback(self, handler:Handler):
         return handler
 
     def get_handler(self):
-        return ConversationHandler(self.entry_points, self.state, self.fallbacks, **self.__kwargs)
+        return ConversationHandler(
+            entry_points= self.entry_points,
+            states= self.states,
+            fallbacks= self.fallbacks,
+            **self.__kwargs)

main.py

@@ -96,15 +96,10 @@ def __init__(
         data_db,
         strings: dict,
         bug_reporter = False,
-        debug = False):
-        #----[USE SOCKES]----
-        #import socks
-        #s = socks.socksocket()
-        #s.set_proxy(socks.SOCKS5, "localhost", 9090)
-        #self.updater = Updater(Token, request_kwargs = {'proxy_url': 'socks5h://127.0.0.1:9090/'})
-        #-----[NO PROXY]-----
-        self.updater = Updater(Token)
-        #--------------------
+        debug = False,
+        request_kwargs=None):
+        
+        self.updater = Updater(Token, request_kwargs=request_kwargs)
         self.bot = self.updater.bot
         self.dispatcher = self.updater.dispatcher
         self.token = Token
@@ -448,8 +443,20 @@ def idle(self):
 
     debug = main_config.getboolean('debug',fallback=False)
 
+    use_proxy = main_config.getboolean('use-proxy', fallback=False)
+    proxy_info = None
+    if use_proxy:
+        proxy_info={
+            'proxy_url': main_config.get('proxy-url','socks5h://127.0.0.1:9090')
+        }
+        if 'proxy-user' in main_config:
+            proxy_info['urllib3_proxy_kwargs'] = {
+                'username': main_config.get('proxy-user'),
+                'password': main_config.get('proxy-pass')
+            }
+
     bot_handler = BotHandler(token, main_config.get('source','https://pcworms.blog.ir/rss/'), env,
-                             chats_db, data_db, strings, not bug_reporter_mode == 'off', debug)
+                             chats_db, data_db, strings, not bug_reporter_mode == 'off', debug, proxy_info)
     bot_handler.run()
     bot_handler.idle()
     if bug_reporter_mode in ('online', 'offline'):