From 7c79b88e695abc7d80157218af1a1669f784d48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Hut?= <sebu77@gmail.com>
Date: Mon, 23 Feb 2015 14:11:19 +0100
Subject: [PATCH] Fix: Carbons messages

---
 clientapp/helpers/xmppEventHandlers.js | 35 ++++++--------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/clientapp/helpers/xmppEventHandlers.js b/clientapp/helpers/xmppEventHandlers.js
index 94490ed..20e464b 100644
--- a/clientapp/helpers/xmppEventHandlers.js
+++ b/clientapp/helpers/xmppEventHandlers.js
@@ -283,6 +283,9 @@ module.exports = function (client, app) {
                 });
             }
 
+            if (msg.carbon)
+                msg.delay.stamp = new Date(Date.now() + app.timeInterval);
+
             message.acked = true;
             var localTime = new Date(Date.now() + app.timeInterval);
             var notify = Math.round((localTime - message.created) / 1000) < 5;
@@ -339,36 +342,12 @@ module.exports = function (client, app) {
         original.receiptReceived = true;
     });
 
-    client.on('carbon:received', function (carbon) {
-        if (!me.isMe(carbon.from)) return;
+    client.on('message:sent', function (msg) {
+        if (msg.carbon) {
+            msg.delay.stamp = new Date(Date.now() + app.timeInterval);
 
-        var msg = carbon.carbonReceived.forwarded.message;
-        var delay = carbon.carbonReceived.forwarded.delay;
-        if (!delay.stamp) {
-            delay.stamp = new Date(Date.now() + app.timeInterval);
+            client.emit('message', msg);
         }
-
-        if (!msg._extensions.delay) {
-            msg.delay = delay;
-        }
-
-        client.emit('message', msg);
-    });
-
-    client.on('carbon:sent', function (carbon) {
-        if (!me.isMe(carbon.from)) return;
-
-        var msg = carbon.carbonSent.forwarded.message;
-        var delay = carbon.carbonSent.forwarded.delay;
-        if (!delay.stamp) {
-            delay.stamp = new Date(Date.now() + app.timeInterval);
-        }
-
-        if (!msg._extensions.delay) {
-            msg.delay = delay;
-        }
-
-        client.emit('message', msg);
     });
 
     client.on('disco:caps', function (pres) {