create bot reference in webhook handler, use create_references on new updates

jh0ker · jh0ker · commit d8211ecb5502 · 2016-07-30T16:58:32.000+02:00
diff --git a/telegram/ext/updater.py b/telegram/ext/updater.py
@@ -262,7 +262,8 @@ def _start_webhook(self, listen, port, url_path, cert, key, bootstrap_retries, c
             url_path = '/{0}'.format(url_path)
 
         # Create and start server
-        self.httpd = WebhookServer((listen, port), WebhookHandler, self.update_queue, url_path)
+        self.httpd = WebhookServer(
+            (listen, port), WebhookHandler, self.update_queue, url_path, self.bot)
 
         if use_ssl:
             self._check_ssl_cert(cert, key)
diff --git a/telegram/utils/webhookhandler.py b/telegram/utils/webhookhandler.py
@@ -21,11 +21,12 @@ def __init__(self, http_code):
 
 class WebhookServer(BaseHTTPServer.HTTPServer, object):
 
-    def __init__(self, server_address, RequestHandlerClass, update_queue, webhook_path):
+    def __init__(self, server_address, RequestHandlerClass, update_queue, webhook_path, bot):
         super(WebhookServer, self).__init__(server_address, RequestHandlerClass)
         self.logger = logging.getLogger(__name__)
         self.update_queue = update_queue
         self.webhook_path = webhook_path
+        self.bot = bot
         self.is_running = False
         self.server_lock = Lock()
         self.shutdown_lock = Lock()
@@ -82,7 +83,10 @@ def do_POST(self):
 
             self.logger.debug('Webhook received data: ' + json_string)
 
-            update = Update.de_json(json.loads(json_string))
+            update_dict = json.loads(json_string)
+            self.server.create_references(update_dict)
+            update = Update.de_json(update_dict)
+
             self.logger.debug('Received Update with ID %d on Webhook' % update.update_id)
             self.server.update_queue.put(update)
 
