tfw/components/frontend/message_sender.py

@@ -1,22 +1,17 @@
-DEFAULT_ORIGINATOR = 'avataobot'
-
-
 class MessageSender:
     def __init__(self, uplink):
         self.uplink = uplink
 
-    def send(self, message, originator=DEFAULT_ORIGINATOR, buttons=None):
+    def send(self, message, originator=None):
         message = {
             'key': 'message.send',
             'message': message
         }
         if originator:
             message['originator'] = originator
-        if buttons:
-            message['buttons'] = buttons
         self.uplink.send_message(message)
 
-    def queue_messages(self, messages, originator=DEFAULT_ORIGINATOR, buttons=None):
+    def queue_messages(self, messages, originator=None):
         message_queue = {
             'key': 'message.queue',
             'messages': []
@@ -26,6 +21,10 @@ class MessageSender:
             if originator:
                 next_message['originator'] = originator
             message_queue['messages'].append(next_message)
-        if buttons and message_queue['messages']:
-            message_queue['messages'][-1]['buttons'] = buttons
         self.uplink.send_message(message_queue)
+
+    def set_originator(self, originator):
+        self.uplink.send_message({
+            'key': 'message.config',
+            'originator': originator
+        })