From ce36c36bd0d6409f2e2a1a04b07bc239b94113cd Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Mon, 23 Mar 2015 19:08:05 -0700
Subject: [PATCH] Include outgoing control messages in message history

So you know it worked.
---
 js/models/conversations.js        | 16 ++++++++++++++++
 js/views/new_conversation_view.js | 12 ++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index ad4f94956..27e448239 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -112,14 +112,30 @@
 
     endSession: function() {
         if (this.get('type') === 'private') {
+            var now = Date.now();
             textsecure.messaging.closeSession(this.id);
+            this.messageCollection.add({
+                conversationId : this.id,
+                type           : 'outgoing',
+                sent_at        : now,
+                received_at    : now,
+                flags          : textsecure.protobuf.PushMessageContent.Flags.END_SESSION
+            }).save();
         }
 
     },
 
     leaveGroup: function() {
+        var now = Date.now();
         if (this.get('type') === 'group') {
             textsecure.messaging.leaveGroup(this.id);
+            this.messageCollection.add({
+                group_update: { left: 'You' },
+                conversationId : this.id,
+                type           : 'outgoing',
+                sent_at        : now,
+                received_at    : now
+            }).save();
         }
     },
 
diff --git a/js/views/new_conversation_view.js b/js/views/new_conversation_view.js
index f93ade58e..be788d0c1 100644
--- a/js/views/new_conversation_view.js
+++ b/js/views/new_conversation_view.js
@@ -127,6 +127,18 @@
                 group.save().then(function() {
                     this.trigger('open', {modelId: groupId});
                 }.bind(this));
+                var now = Date.now();
+                group.messageCollection.add({
+                    conversationId : this.id,
+                    type           : 'outgoing',
+                    sent_at        : now,
+                    received_at    : now,
+                    group_update   : {
+                        name: group.get('name'),
+                        avatar: group.get('avatar'),
+                        joined: group.get('members')
+                    }
+                }).save();
                 textsecure.messaging.updateGroup(
                     group.id,
                     group.get('name'),