From 87bc9dad1d265bb3e0df4195054e46911ccd9ee7 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 15:27:12 -0700
Subject: [PATCH 01/13] DG IZ added group id to the action hash

---
 app/controllers/sockets_controller.rb |  2 +-
 app/helpers/sockets_helper.rb         |  6 +++---
 app/models/user.rb                    | 11 ++++++++---
 app/views/js/_websocket_js.haml       | 18 +++++++++++-------
 lib/diaspora/websocket.rb             |  4 ++--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index fd966afeb..ab6a70109 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -7,7 +7,7 @@ class SocketsController < ApplicationController
     Rails.logger.info("Socket received connection to: #{msg}")
   end
   
-  def outgoing(uid,object)
+  def outgoing(uid,object,opts={})
     @_request = ActionDispatch::Request.new({})
     Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object))
   end
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 7c9cd2898..00c57959b 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -5,7 +5,7 @@ module SocketsHelper
     (object.is_a? Post) ? object.id : object.post_id
   end
 
-  def action_hash(uid, object)
+  def action_hash(uid, object, opts={})
     begin
       user = User.find_by_id(uid)
       v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction
@@ -13,7 +13,7 @@ module SocketsHelper
       Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")
       raise e 
     end
-    action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
+    action_hash = {:class =>object.class.to_s.underscore.pluralize, :group => opts[:group] , :html => v, :post_id => obj_id(object)}
     
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
@@ -21,7 +21,7 @@ module SocketsHelper
       action_hash[:status_message_hash] = object.latest_hash
       action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
     end
-    
+
     action_hash.to_json
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index e8a087d85..17e962648 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,7 +45,8 @@ class User
     post.creator_signature = post.sign_with_key(encryption_key)
     post.save
     post.notify_people
-    post.socket_to_uid owner.id if (owner_id && post.respond_to?(:socket_to_uid))
+
+    post.socket_to_uid(id) if post.respond_to?(:socket_to_uid)
 
     self.posts << post
     self.save
@@ -252,7 +253,9 @@ class User
 
       self.posts << object
       self.save
-      object.socket_to_uid(id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
+
+      group = groups.find_by_person_id(object.person.id)
+      object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
       dispatch_comment object if object.is_a?(Comment) && !owns?(object) 
 
     elsif object.is_a?(Comment) && object.verify_post_creator_signature
@@ -264,7 +267,9 @@ class User
     elsif object.verify_creator_signature == true 
       Rails.logger.debug("Saving object: #{object}")
       object.save
-      object.socket_to_uid(id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
+
+      group = groups.find_by_person_id(object.person.id)
+      object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
     end
   end
 
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index e65962761..fd4789bb6 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -12,7 +12,7 @@
     //Attach onmessage to websocket
       ws.onmessage = function(evt) {
         var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class']);
+        debug("got a " + obj['class'] + 'for group' + obj['group']);
 
         if (obj['class']=="retractions"){
           processRetraction(obj['post_id']);
@@ -23,9 +23,9 @@
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
         }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'])
+          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group'])
         }else{
-          processPost(obj['class'], obj['html'])
+          processPost(obj['class'], obj['html'], obj['group'])
         }
 
         
@@ -52,8 +52,8 @@
           toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
       }
 
-      function processPost(className, html){
-        if(onPageForClass(className)){
+      function processPost(className, html, groupId){
+        if(onPageForClass(className) || onPageForGroup(groupId)){
           $("#stream").prepend(
             $(html).fadeIn("fast", function(){
               $("#stream label:first").inFieldLabels();
@@ -62,8 +62,8 @@
         }
       }
 
-      function processStatusMessage(className, html, messageHash){
-        processPost(className, html);
+      function processStatusMessage(className, html, messageHash, group_id){
+        processPost(className, html, group_id);
         console.log(messageHash)
         if(messageHash['mine?']){
           updateMyLatestStatus(messageHash);
@@ -92,6 +92,10 @@
       function onPageForClass(className){
         return ((location.href.indexOf(className) != -1 ) || (location.pathname == '/')) && onPageOne();
       }
+
+      function onPageForGroup(groupId){
+        alert( groupId);
+      }
       
       function onPageOne() {
           var c = document.location.search.charAt(document.location.search.length-1);
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index bfbc69c26..36f8bf9c5 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -31,8 +31,8 @@ module Diaspora
   end
 
   module Socketable
-    def socket_to_uid id
-      SocketsController.new.outgoing(id, self)
+    def socket_to_uid(id, opts={})
+      SocketsController.new.outgoing(id, self, :group => opts[:group_id])
     end
     
     def unsocket_from_uid id

From 7d68089c8b83521d5b34c5e56f6cc491904202e2 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:02:12 -0700
Subject: [PATCH 02/13] DG IZ using group_id when passing the id around the app

---
 app/controllers/sockets_controller.rb | 2 +-
 app/helpers/sockets_helper.rb         | 2 +-
 app/views/js/_websocket_js.haml       | 8 ++++----
 lib/diaspora/websocket.rb             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index ab6a70109..cdb2b5c2e 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -9,7 +9,7 @@ class SocketsController < ApplicationController
   
   def outgoing(uid,object,opts={})
     @_request = ActionDispatch::Request.new({})
-    Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object))
+    Diaspora::WebSocket.push_to_user(uid, action_hash(uid, object, :group_id => opts[:group_id]))
   end
   
 end
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 00c57959b..9fa8f2f74 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -13,7 +13,7 @@ module SocketsHelper
       Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")
       raise e 
     end
-    action_hash = {:class =>object.class.to_s.underscore.pluralize, :group => opts[:group] , :html => v, :post_id => obj_id(object)}
+    action_hash = {:class =>object.class.to_s.underscore.pluralize, :group_id => opts[:group_id] , :html => v, :post_id => obj_id(object)}
     
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index fd4789bb6..5e6777a23 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -12,7 +12,7 @@
     //Attach onmessage to websocket
       ws.onmessage = function(evt) {
         var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class'] + 'for group' + obj['group']);
+        debug("got a " + obj['class'] + " for group " + obj['group']);
 
         if (obj['class']=="retractions"){
           processRetraction(obj['post_id']);
@@ -62,8 +62,8 @@
         }
       }
 
-      function processStatusMessage(className, html, messageHash, group_id){
-        processPost(className, html, group_id);
+      function processStatusMessage(className, html, messageHash, groupId){
+        processPost(className, html, groupId);
         console.log(messageHash)
         if(messageHash['mine?']){
           updateMyLatestStatus(messageHash);
@@ -94,7 +94,7 @@
       }
 
       function onPageForGroup(groupId){
-        alert( groupId);
+        alert( groupId );
       }
       
       function onPageOne() {
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index 36f8bf9c5..d3ca511bb 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -32,7 +32,7 @@ module Diaspora
 
   module Socketable
     def socket_to_uid(id, opts={})
-      SocketsController.new.outgoing(id, self, :group => opts[:group_id])
+      SocketsController.new.outgoing(id, self, :group_id => opts[:group_id])
     end
     
     def unsocket_from_uid id

From f70cf4a60af55e49e3caf53df8237e138ee73354 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:09:55 -0700
Subject: [PATCH 03/13] DG IZ first group for now, added logging statements

---
 app/models/user.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 17e962648..b07533f8a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -246,7 +246,7 @@ class User
       person.save  
 
     elsif object.is_a?(Post) && object.verify_creator_signature == true 
-      Rails.logger.debug("Saving post: #{object}")
+      Rails.logger.debug("Saving post: #{object.inspect}")
 
       object.user_refs += 1
       object.save
@@ -254,7 +254,9 @@ class User
       self.posts << object
       self.save
 
-      group = groups.find_by_person_id(object.person.id)
+
+      group = groups.first
+      Rails.logger("pushing a message to group: #{group.name}")
       object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
       dispatch_comment object if object.is_a?(Comment) && !owns?(object) 
 

From 5e95650ae367630f934190099d96cc305573471a Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:11:25 -0700
Subject: [PATCH 04/13] DG IZ logger info

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index b07533f8a..85a118b50 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -256,7 +256,7 @@ class User
 
 
       group = groups.first
-      Rails.logger("pushing a message to group: #{group.name}")
+      Rails.logger.info("pushing a message to group: #{group.name}")
       object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
       dispatch_comment object if object.is_a?(Comment) && !owns?(object) 
 

From d5d1a2d00ffc038fdd8325b374c04785bc2ab461 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:29:51 -0700
Subject: [PATCH 05/13] DG IZ; javascript variable misnamed

---
 app/views/js/_websocket_js.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 5e6777a23..76df723ae 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -12,7 +12,7 @@
     //Attach onmessage to websocket
       ws.onmessage = function(evt) {
         var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class'] + " for group " + obj['group']);
+        debug("got a " + obj['class'] + " for group " + obj['group_id']);
 
         if (obj['class']=="retractions"){
           processRetraction(obj['post_id']);
@@ -23,9 +23,9 @@
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
         }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group'])
+          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'])
         }else{
-          processPost(obj['class'], obj['html'], obj['group'])
+          processPost(obj['class'], obj['html'], obj['group_id'])
         }
 
         

From d211abb1bce019d1b38be044a5d27705450cfd17 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:32:14 -0700
Subject: [PATCH 06/13] DG IZ on page for group js method now returns true

---
 app/views/js/_websocket_js.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 76df723ae..c458fe43e 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -94,7 +94,7 @@
       }
 
       function onPageForGroup(groupId){
-        alert( groupId );
+        return (location.href.indexOf(groupId) != -1 ) 
       }
       
       function onPageOne() {

From e5036862f6d6a72ee6e643582f34048e8011fc1e Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:49:58 -0700
Subject: [PATCH 07/13] DG IZ removed the latest message javascript as well as
 the hash

---
 app/helpers/sockets_helper.rb   |  6 +++---
 app/models/status_message.rb    |  3 ---
 app/views/js/_websocket_js.haml | 14 +++-----------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 9fa8f2f74..e3824b86d 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -17,9 +17,9 @@ module SocketsHelper
     
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
-    elsif object.is_a? StatusMessage
-      action_hash[:status_message_hash] = object.latest_hash
-      action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
+    end
+    if object.person.owner_id == uid
+      acton_hash[:mine?] == true
     end
 
     action_hash.to_json
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 3fb9aa39d..3df72f6ba 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -21,8 +21,5 @@ class StatusMessage < Post
         XML
   end
   
-  def latest_hash
-    { :text => message}
-  end
 end
 
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index c458fe43e..57f628073 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -22,10 +22,10 @@
         
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
-        }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'])
         }else{
-          processPost(obj['class'], obj['html'], obj['group_id'])
+          if( (obj['mine?'] == true)|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
+            processPost(obj['class'], obj['html'])
+          }
         }
 
         
@@ -62,14 +62,6 @@
         }
       }
 
-      function processStatusMessage(className, html, messageHash, groupId){
-        processPost(className, html, groupId);
-        console.log(messageHash)
-        if(messageHash['mine?']){
-          updateMyLatestStatus(messageHash);
-        }
-      }
-      
       function updateMyLatestStatus(messageHash){
         $("#latest_message").text(messageHash['text']);
         $("#latest_message_time").text(' - just now');

From c1ff8544d315a84ae39e77e13713b7bb9907fdb5 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 17:04:37 -0700
Subject: [PATCH 08/13] removed a couple of js lines

---
 app/views/js/_websocket_js.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 57f628073..0853b867b 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -23,7 +23,7 @@
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
         }else{
-          if( (obj['mine?'] == true)|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
+          if( (obj['mine?'])|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
             processPost(obj['class'], obj['html'])
           }
         }

From 054dafdf99ac8e8b33b710d6fda2582fa0930efd Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 17:16:11 -0700
Subject: [PATCH 09/13] couple more

---
 app/views/js/_websocket_js.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 0853b867b..52e95daf4 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -12,7 +12,8 @@
     //Attach onmessage to websocket
       ws.onmessage = function(evt) {
         var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class'] + " for group " + obj['group_id']);
+        debug("got a " + obj['class'] );
+        
 
         if (obj['class']=="retractions"){
           processRetraction(obj['post_id']);
@@ -24,6 +25,7 @@
           processPhotoInAlbum(obj['photo_hash'])
         }else{
           if( (obj['mine?'])|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
+            
             processPost(obj['class'], obj['html'])
           }
         }

From f15b3c46b2b1d41dc3ca38c17161d0bf0add178a Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 17:40:48 -0700
Subject: [PATCH 10/13] DG IZ; reverted to before removing latest message
 methods

---
 app/helpers/sockets_helper.rb   |  6 +++---
 app/models/status_message.rb    |  3 +++
 app/views/js/_websocket_js.haml | 18 ++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index e3824b86d..9fa8f2f74 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -17,9 +17,9 @@ module SocketsHelper
     
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
-    end
-    if object.person.owner_id == uid
-      acton_hash[:mine?] == true
+    elsif object.is_a? StatusMessage
+      action_hash[:status_message_hash] = object.latest_hash
+      action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
     end
 
     action_hash.to_json
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 3df72f6ba..3fb9aa39d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -21,5 +21,8 @@ class StatusMessage < Post
         XML
   end
   
+  def latest_hash
+    { :text => message}
+  end
 end
 
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 52e95daf4..c458fe43e 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -12,8 +12,7 @@
     //Attach onmessage to websocket
       ws.onmessage = function(evt) {
         var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class'] );
-        
+        debug("got a " + obj['class'] + " for group " + obj['group_id']);
 
         if (obj['class']=="retractions"){
           processRetraction(obj['post_id']);
@@ -23,11 +22,10 @@
         
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
+        }else if (obj['class']=='status_messages'){
+          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'])
         }else{
-          if( (obj['mine?'])|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
-            
-            processPost(obj['class'], obj['html'])
-          }
+          processPost(obj['class'], obj['html'], obj['group_id'])
         }
 
         
@@ -64,6 +62,14 @@
         }
       }
 
+      function processStatusMessage(className, html, messageHash, groupId){
+        processPost(className, html, groupId);
+        console.log(messageHash)
+        if(messageHash['mine?']){
+          updateMyLatestStatus(messageHash);
+        }
+      }
+      
       function updateMyLatestStatus(messageHash){
         $("#latest_message").text(messageHash['text']);
         $("#latest_message_time").text(' - just now');

From daf08cd9f913129ad6782e66d7e3718079b08b27 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 18:06:28 -0700
Subject: [PATCH 11/13] DG IZ posts by the user get websocketed on the group
 page and albums get signed?

---
 app/helpers/sockets_helper.rb   |  4 ++++
 app/models/album.rb             | 19 +++++++++++++++++++
 app/views/js/_websocket_js.haml | 12 ++++++------
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 9fa8f2f74..d4765feb7 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -22,6 +22,10 @@ module SocketsHelper
       action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
     end
 
+    if object.person.owner_id == uid
+      action_hash[:mine?] = true
+    end
+
     action_hash.to_json
   end
 
diff --git a/app/models/album.rb b/app/models/album.rb
index 03dc5ed1a..0275b43fe 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -3,6 +3,7 @@ class Album
   include MongoMapper::Document
   include ROXML
   include Diaspora::Webhooks
+  include Encryptable
 
   xml_reader :name
   xml_reader :person, :as => Person
@@ -42,6 +43,24 @@ class Album
     p_photo ? p_photo : self.photos.sort(:created_at.desc).last
   end
 
+  #ENCRYPTION
+  xml_accessor :creator_signature
+  key :creator_signature, String
+  
+  def signable_accessors
+    accessors = self.class.roxml_attrs.collect{|definition| 
+      definition.accessor}
+    accessors.delete 'person'
+    accessors.delete 'creator_signature'
+    accessors
+  end
+
+  def signable_string
+    signable_accessors.collect{|accessor| 
+      (self.send accessor.to_sym).to_s}.join ';'
+  end
+
+
   protected
   def destroy_photos
     photos.each{|p| p.destroy}
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index c458fe43e..a823d644d 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -23,9 +23,9 @@
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
         }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'])
+          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'], obj['mine?'])
         }else{
-          processPost(obj['class'], obj['html'], obj['group_id'])
+          processPost(obj['class'], obj['html'], obj['group_id'], obj['mine?'])
         }
 
         
@@ -52,8 +52,8 @@
           toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
       }
 
-      function processPost(className, html, groupId){
-        if(onPageForClass(className) || onPageForGroup(groupId)){
+      function processPost(className, html, groupId, mineBool){
+        if(mineBool || onPageForClass(className) || onPageForGroup(groupId)){
           $("#stream").prepend(
             $(html).fadeIn("fast", function(){
               $("#stream label:first").inFieldLabels();
@@ -62,8 +62,8 @@
         }
       }
 
-      function processStatusMessage(className, html, messageHash, groupId){
-        processPost(className, html, groupId);
+      function processStatusMessage(className, html, messageHash, groupId, mineBool){
+        processPost(className, html, groupId, mineBool);
         console.log(messageHash)
         if(messageHash['mine?']){
           updateMyLatestStatus(messageHash);

From f4f377e7e7ba1d8ba8ec5b2139ffd06c612774bc Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 18:26:48 -0700
Subject: [PATCH 12/13] DG IZ finding albums by person_id

---
 app/models/album.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/album.rb b/app/models/album.rb
index 0275b43fe..157abe463 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -27,7 +27,7 @@ class Album
 
   def self.mine_or_friends(friend_param, current_user)
     if friend_param
-      Album.where(:person_id => current_user.friend_ids)
+      Album.find_by_person_id(current_user.friend_ids)
     else
       current_user.person.albums
     end

From 2614cb5add14c149f6a1365f7d76291a2729a13a Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 18:37:08 -0700
Subject: [PATCH 13/13] DG IZ; find_all_by instead of find_by

---
 app/models/album.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/album.rb b/app/models/album.rb
index 157abe463..7b9a746aa 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -27,7 +27,7 @@ class Album
 
   def self.mine_or_friends(friend_param, current_user)
     if friend_param
-      Album.find_by_person_id(current_user.friend_ids)
+      Album.find_all_by_person_id(current_user.friend_ids)
     else
       current_user.person.albums
     end