Modify handler and callback calling order.

before callback -> handler after handler -> callback
conbus · Aug 25, 2016 · f344ebe · f344ebe
1 parent 2ea9007
commit f344ebe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fbmq/__init__.py b/fbmq/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.7.0b3'
+__version__ = '1.7.0b4'
 
 from .fbmq import QuickReply, Page
 from . import attachment as Attachment

diff --git a/fbmq/fbmq.py b/fbmq/fbmq.py
@@ -49,15 +49,15 @@ def handle_webhook(self, payload, optin=None, message=None, echo=None, delivery=
                     if event.get("message", {}).get("is_echo"):
                         self._call_handler('echo', echo, event)
                     else:
+                        self._call_handler('message', message, event)
                         if self.is_quick_reply(event) and self.has_quick_reply_callback(event):
                             self.call_quick_reply_callback(event)
-                        self._call_handler('message', message, event)
                 elif 'delivery' in event:
                     self._call_handler('delivery', delivery, event)
                 elif 'postback' in event:
+                    self._call_handler('postback', postback, event)
                     if self.has_postback_callback(event):
                         self.call_postback_callback(event)
-                    self._call_handler('postback', postback, event)
                 elif 'read' in event:
                     self._call_handler('read', read, event)
                 elif 'account_linking' in event: