Merge pull request #43 from PyAr/telegram-bot-upgrade

Updated telegram bot and refactored all the project.

Author: WinnaZ

bin/run_bot.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from telegram.ext import (Updater)
+from telegram.ext import Application
 from pycamp_bot.commands import auth
 from pycamp_bot.commands import voting
 from pycamp_bot.commands import manage_pycamp
@@ -19,28 +19,28 @@
 logger = logging.getLogger(__name__)
 
 
-def set_handlers(updater):
-    base.set_handlers(updater)
-    auth.set_handlers(updater)
-    wizard.set_handlers(updater)
-    voting.set_handlers(updater)
-    manage_pycamp.set_handlers(updater)
-    projects.set_handlers(updater)
-    raffle.set_handlers(updater)
-    schedule.set_handlers(updater)
-    announcements.set_handlers(updater)
+def set_handlers(application):
+    base.set_handlers(application)
+    auth.set_handlers(application)
+    wizard.set_handlers(application)
+    voting.set_handlers(application)
+    manage_pycamp.set_handlers(application)
+    projects.set_handlers(application)
+    raffle.set_handlers(application)
+    schedule.set_handlers(application)
+    announcements.set_handlers(application)
 
 
 if __name__ == '__main__':
     logger.info('Starting PyCamp Bot')
 
     if 'TOKEN' in os.environ.keys():
-        updater = Updater(token=os.environ['TOKEN'])
-
         models_db_connection()
-        set_handlers(updater)
 
-        updater.start_polling()
+        application = Application.builder().token(os.environ['TOKEN']).build()
+    # application.add_handler(CommandHandler("start", start))
+        set_handlers(application)
+        application.run_polling()
 
     else:
         logger.info('Token not defined. Exiting.')

src/pycamp_bot/commands/announcements.py

@@ -7,7 +7,7 @@
 logger = logging.getLogger(__name__)
 
 
-def announce(bot, update):
+async def announce(update, context):
     username = update.message.from_user.username
     admins = get_admins_username()
     project_name = update.message.text.split()[1:]
@@ -16,7 +16,7 @@ def announce(bot, update):
     project = Project.select().where(Project.name == project_name)
 
     if len(project) <= 0:
-        bot.send_message(
+        await context.bot.send_message(
             chat_id=update.message.chat_id,
             text=f"El proyecto '{project_name}' no existe o esta mal escroto.\n"
             "El formato de este comando es:\n"
@@ -25,7 +25,7 @@ def announce(bot, update):
         return
 
     if not (project.get().owner.username == username or username in admins):
-        bot.send_message(
+        await context.bot.send_message(
             chat_id=update.message.chat_id,
             text="No sos ni admin ni el owner de este proyecto, Careta."
         )
@@ -36,15 +36,15 @@ def announce(bot, update):
     chat_id_list = [user.pycampista.chat_id for user in pycampistas]
 
     for chat_id in chat_id_list:
-        bot.send_message(
+        await context.bot.send_message(
             chat_id=chat_id,
             text=f"Esta por empezar {project_name} a cargo de @{project.get().owner.username}."
         )
-    bot.send_message(
+    await context.bot.send_message(
         chat_id=update.message.chat_id,
         text="Anunciado!"
     )
 
 
-def set_handlers(updater):
-    updater.dispatcher.add_handler(CommandHandler('anunciar', announce))
+def set_handlers(application):
+    application.add_handler(CommandHandler('anunciar', announce))

src/pycamp_bot/commands/auth.py

@@ -16,7 +16,7 @@ def get_admins_username():
     return admins
 
 
-def is_admin(bot, update):
+def is_admin(update, context):
     """Checks if the user is authorized as admin"""
     username = update.message.from_user.username
     authorized = get_admins_username()
@@ -30,27 +30,27 @@ def is_admin(bot, update):
 
 
 def admin_needed(f):
-    def wrap(*args, **kargs):
+    async def wrap(*args, **kargs):
         logger.info('Admin nedeed wrapper')
-        bot, update = args
+        update, context = args
         if is_admin(*args):
-            return f(*args)
+            return await f(*args)
         else:
-            bot.send_message(
+            await context.bot.send_message(
                 chat_id=update.message.chat_id,
                 text="No estas Autorizadx para hacer esta acción"
             )
     return wrap
 
 
-def grant_admin(bot, update):
+async def grant_admin(update, context):
     username = update.message.from_user.username
     chat_id = update.message.chat_id
     text = update.message.text
 
     parameters = text.split(' ')
     if not len(parameters) == 2:
-        bot.send_message(chat_id=chat_id,
+        await context.bot.send_message(chat_id=chat_id,
                          text='Parametros incorrectos.')
         return
 
@@ -69,17 +69,17 @@ def grant_admin(bot, update):
         logger.error('PYCAMP_BOT_MASTER_KEY env not set.')
         rply_msg = 'Hay un problema en el servidor, avisale a un admin.'
 
-    bot.send_message(chat_id=chat_id, text=rply_msg)
+    await context.bot.send_message(chat_id=chat_id, text=rply_msg)
 
 
 @admin_needed
-def revoke_admin(bot, update):
+async def revoke_admin(update, context):
     chat_id = update.message.chat_id
     text = update.message.text
 
     parameters = text.split(' ')
     if not len(parameters) == 2:
-        bot.send_message(chat_id=chat_id,
+        await context.bot.send_message(chat_id=chat_id,
                          text='Parametros incorrectos.')
         return
 
@@ -88,11 +88,11 @@ def revoke_admin(bot, update):
     user = Pycampista.select().where(Pycampista.username == fallen_admin)[0]
     user.admin = False
     user.save()
-    bot.send_message(chat_id=chat_id,
+    await context.bot.send_message(chat_id=chat_id,
                      text='Un admin a caido --{}--.'.format(fallen_admin))
 
 
-def list_admins(bot, update):
+async def list_admins(update, context):
     chat_id = update.message.chat_id
 
     admins = get_admins_username()
@@ -102,10 +102,10 @@ def list_admins(bot, update):
         rply_msg += admin
         rply_msg += '\n'
 
-    bot.send_message(chat_id=chat_id, text=rply_msg)
+    await context.bot.send_message(chat_id=chat_id, text=rply_msg)
 
 
-def set_handlers(updater):
-    updater.dispatcher.add_handler(CommandHandler('su', grant_admin))
-    updater.dispatcher.add_handler(CommandHandler('degradar', revoke_admin))
-    updater.dispatcher.add_handler(CommandHandler('admins', list_admins))
+def set_handlers(application):
+    application.add_handler(CommandHandler('su', grant_admin))
+    application.add_handler(CommandHandler('degradar', revoke_admin))
+    application.add_handler(CommandHandler('admins', list_admins))

src/pycamp_bot/commands/base.py

@@ -6,45 +6,45 @@
 logger = logging.getLogger(__name__)
 
 
-def msg_to_active_pycamp_chat(bot, text):
+async def msg_to_active_pycamp_chat(bot, text):
     chat_id = -220368252  # Prueba
-    bot.send_message(
+    await bot.send_message(
         chat_id=chat_id,
         text=text
         )
 
 
-def start(bot, update):
+async def start(update, context):
     logger.info('Start command')
     chat_id = update.message.chat_id
 
     if update.message.from_user.username is None:
-        bot.send_message(
+        await context.bot.send_message(
                 chat_id=chat_id,
                 text="""Hola! Necesitas tener un username primero.
                         \nCreate uno siguiendo esta guia: https://ewtnet.com/technology/how-to/how-to-add-a-username-on-telegram-android-app.
                         Y despues dame /start the nuevo :) """)
 
     elif update.message.from_user.username:
-        bot.send_message(
+        await context.bot.send_message(
                 chat_id=chat_id,
                 text='Hola ' + update.message.from_user.username +
                      '! Bienvenidx'
                 )
 
 
-def help(bot, update):
+async def help(update, context):
     logger.info('Returning help message')
-    bot.send_message(chat_id=update.message.chat_id, text=get_help(bot, update))
+    await context.bot.send_message(chat_id=update.message.chat_id, text=get_help(update, context))
 
 
-def error(bot, update, error):
-    '''Log Errors caused by Updates.'''
-    logger.warning('Update {} caused error {}'.format(update, error))
+# async def error(update, context):
+#     '''Log Errors caused by Updates.'''
+#     logger.warning('Update {} caused error {}'.format(update, context.error))
 
 
-def set_handlers(updater):
-    updater.dispatcher.add_error_handler(error)
+def set_handlers(application):
+#     application.add_error_handler(error)
 
-    updater.dispatcher.add_handler(CommandHandler('start', start))
-    updater.dispatcher.add_handler(CommandHandler('ayuda', help))
+    application.add_handler(CommandHandler('start', start))
+    application.add_handler(CommandHandler('ayuda', help))

src/pycamp_bot/commands/help_msg.py

@@ -71,7 +71,7 @@
 ''' + user_commands_help
 
 
-def get_help(bot, update):
-    if is_admin(bot, update):
+def get_help(update, context):
+    if is_admin(update, context):
         return HELP_MESSAGE_ADMIN
     return HELP_MESSAGE