fix recipient for events

diff --git a/distbot/bot/action_worker.py b/distbot/bot/action_worker.py
index c800760081d771afd19781d4aa1454b462d8f727..4ceaa3d8e61ae81750b882c66b0481966f189d23 100644 (file)
--- a/distbot/bot/action_worker.py
+++ b/distbot/bot/action_worker.py
@@ -123,7 +123,7 @@ class ActionThread(threading.Thread):
         if action.command:
             replay_body = json.dumps({
                 "from": None,
-                "to": None,
+                "to": action.recipient,
                 "body": ' '.join(action.command.split('.')[1:]),
             })
             process_message(routing_key=action.command, body=replay_body)

diff --git a/distbot/bot/worker.py b/distbot/bot/worker.py
index d4bdcf8278c3bc496e2c5882653de16e145b11b6..cc42b71fb581d3517cadc157767b13eafcb4e1db 100644 (file)
--- a/distbot/bot/worker.py
+++ b/distbot/bot/worker.py
@@ -79,7 +79,7 @@ class Worker(threading.Thread):
             logger.debug("no action taken")
             return
         action.sender = body["from"]
-        action.recipient = body["to"]
+        action.recipient = action.recipient or body["to"]
         send_action(self.actionqueue, action)
 
         if ack: