Refactoring code

Author: ProgrammingLanguageLeader

Procfile

@@ -1,4 +1,4 @@
-web: python wsgi.py
+web: python webhook.py
 init: python manage.py db init
 migrate: python manage.py db migrate
 upgrade: python manage.py db upgrade

math_bot/logic.py

@@ -1,12 +1,12 @@
 from telegram import ReplyKeyboardMarkup, KeyboardButton, ReplyKeyboardRemove
 from telegram.ext import Updater, CommandHandler, MessageHandler, Filters, \
     ConversationHandler
+import logging
 
 from math_bot.app import db
 from math_bot.tools import send_typing, write_logs, remember_new_user
 from math_bot.wolfram import make_wolfram_query
 from math_bot.models import User
-from math_bot.error import handle_errors
 from config import Config
 
 
@@ -362,6 +362,10 @@ def handle_other_messages(bot, update):
     return ConversationHandler.END
 
 
+def handle_errors(bot, update, error):
+    logging.warning('Update {} caused {} error'.format(update, error))
+
+
 def init_updater():
     updater = Updater(
         Config.TELEGRAM_TOKEN,

requirements.txt

@@ -16,11 +16,12 @@ Mako==1.0.7
 MarkupSafe==1.0
 more-itertools==4.0.1
 nginxparser-eb==0.0.9
+pkg-resources==0.0.0
 psycopg2==2.7.4
 pyparsing==2.2.0
 python-dateutil==2.6.1
 python-editor==1.0.3
-python-telegram-bot==9.0.0
+python-telegram-bot==10.0.1
 requests==2.18.4
 six==1.11.0
 SQLAlchemy==1.2.4

webhook.py

@@ -1,35 +1,22 @@
-from flask import request
-from telegram import Update
 import logging
 import os
 
-from math_bot.app import app
 from math_bot.logic import init_updater
 from config import Config
 
 
-logging.basicConfig(
-    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-    level=logging.INFO
-)
-updater = init_updater()
-updater.start_webhook(
-    listen='0.0.0.0',
-    port=int(os.environ.get('PORT', '8443')),
-    url_path=Config.TELEGRAM_TOKEN
-)
-updater.bot.set_webhook(
-    url='{}/{}'.format(Config.URL, Config.TELEGRAM_TOKEN)
-)
-updater.idle()
-
-
-@app.route('/{}'.format(Config.TELEGRAM_TOKEN), methods=['POST'])
-def handle_update():
-    dispatcher = updater.dispatcher
-    update = Update.de_json(
-        request.get_json(force=True),
-        dispatcher.bot
+if __name__ == '__main__':
+    logging.basicConfig(
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        level=logging.INFO
+    )
+    updater = init_updater()
+    updater.start_webhook(
+        listen='0.0.0.0',
+        port=int(os.environ.get('PORT', '8443')),
+        url_path=Config.TELEGRAM_TOKEN
+    )
+    updater.bot.set_webhook(
+        url='{}/{}'.format(Config.URL, Config.TELEGRAM_TOKEN)
     )
-    dispatcher.process_update(update)
-    return 'OK'
+    updater.idle()