From 2601c3cc3a5bc3d51e6b99acf60832bfae68644f Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Sun, 18 May 2014 13:36:56 -0700
Subject: [PATCH] Rename some things to be a little more semantic

The 'sender' field actually holds the recipient for outgoing
messages. Rename that field to 'person', indicating the 2nd
party generically.

Also decouples the thread name from thread recipients at the
view layer, in preparation for group support.
---
 js/models/messages.js |  6 +++---
 js/popup.js           |  2 +-
 js/views/messages.js  | 17 ++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 18ec0c9fe6..31dfcf77a1 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -11,7 +11,7 @@ var Whisper = Whisper || {};
 
     addIncomingMessage: function(decrypted) {
       Whisper.Messages.add({
-        sender: decrypted.pushMessage.source,
+        person: decrypted.pushMessage.source,
         group: decrypted.message.group,
         body: decrypted.message.body,
         type: 'incoming',
@@ -19,9 +19,9 @@ var Whisper = Whisper || {};
       }).save();
     },
 
-    addOutgoingMessage: function(messageProto, sender) {
+    addOutgoingMessage: function(messageProto, recipients) {
       Whisper.Messages.add({
-        sender: sender,
+        person: recipients[0], // TODO: groups
         body: messageProto.body,
         type: 'outgoing',
         timestamp: new Date().getTime()
diff --git a/js/popup.js b/js/popup.js
index f3fb5948b3..3e8fafe7d1 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -53,7 +53,7 @@ textsecure.registerOnLoadFunction(function() {
 			}
 			var messageProto = new PushMessageContentProtobuf();
 			messageProto.body = $("#popup_send_text").val();
-			Whisper.Messages.addOutgoingMessage(messageProto, numbers[0]);
+			Whisper.Messages.addOutgoingMessage(messageProto, numbers);
 			textsecure.sendMessage(numbers, messageProto,
 				//TODO: Handle result
 				function(thing) {console.log(thing);});
diff --git a/js/views/messages.js b/js/views/messages.js
index fdbe1d79d6..4c71a8cd70 100644
--- a/js/views/messages.js
+++ b/js/views/messages.js
@@ -45,15 +45,14 @@ var Whisper = Whisper || {};
     initialize: function(options) {
       this.$el.addClass('closed');
       this.$header = $('<div class="header">').
-        append($('<span>').text(options.sender)).appendTo(this.$el);
+        append($('<span>').text(options.name)).appendTo(this.$el);
       this.$header.prepend($('<div class="avatar">'));
       this.$collapsable = $('<div class="collapsable">').hide();
       this.$messages = $('<ul>').addClass('messages').appendTo(this.$collapsable);
 
       this.$button = $('<button class="btn">').attr('id', 'button' + this.id).
         append($('<span>').text('Send'));
-      this.$input = $('<input type="text" id="text' + options.threadId + '">').
-        attr('autocomplete','off');
+      this.$input = $('<input type="text">').attr('autocomplete','off');
       this.$form = $("<form class='container'>").append(this.$input, this.$button);
       this.$form.appendTo(this.$collapsable);
       this.$collapsable.appendTo(this.$el);
@@ -82,14 +81,12 @@ var Whisper = Whisper || {};
         $button.attr("disabled", "disabled");
         $button.find('span').text("Sending");
 
-        var sendDestinations = [options.sender];
-
         var messageProto = new PushMessageContentProtobuf();
         messageProto.body = $input.val();
 
-        Whisper.Messages.addOutgoingMessage(messageProto, options.sender);
+        Whisper.Messages.addOutgoingMessage(messageProto, options.recipients);
 
-        textsecure.sendMessage(sendDestinations, messageProto, function(result) {
+        textsecure.sendMessage(options.recipients, messageProto, function(result) {
           console.log(result);
           $button.removeAttr("disabled");
           $button.find('span').text("Send");
@@ -127,9 +124,11 @@ var Whisper = Whisper || {};
 
     addMessage: function (message) {
       // todo: find the right existing view
-      var threadId = message.get('sender'); // TODO: groups
+      var threadId = message.get('person'); // TODO: groups
       if (this.views[threadId] === undefined) {
-        this.views[threadId] = new ConversationView({threadId: threadId, sender: message.get('sender')});
+        this.views[threadId] = new ConversationView({
+          name: threadId, recipients: [threadId]
+        });
         this.$el.append(this.views[threadId].render().el);
       }