Merge branch 'master' of github.com:diaspora/diaspora

app/models/user.rb

@@ -180,7 +180,10 @@ class User
   
   ######### Posts and Such ###############
   def retract( post )
-    post.unsocket_from_uid(self.id) if post.respond_to? :unsocket_from_uid
+    group_ids = groups_with_post( post.id )
+    group_ids.map!{|group| group.id}
+
+    post.unsocket_from_uid(self.id, :group_ids => group_ids) if post.respond_to? :unsocket_from_uid
     retraction = Retraction.for(post)
     push_to_people retraction, people_in_groups(groups_with_post(post.id))
     retraction

lib/diaspora/websocket.rb

@@ -35,8 +35,8 @@ module Diaspora
       SocketsController.new.outgoing(id, self, opts)
     end
     
-    def unsocket_from_uid id
-      SocketsController.new.outgoing(id, Retraction.for(self))
+    def unsocket_from_uid(id, opts={})
+      SocketsController.new.outgoing(id, Retraction.for(self), opts)
     end
 
   end

public/stylesheets/application.css

@@ -589,13 +589,16 @@ h1.big_text {
   border: 1px #666666 solid; }
 
 .group,
-.requests {
+.requests,
+.remove {
   list-style: none; }
   .group h3,
-  .requests h3 {
+  .requests h3,
+  .remove h3 {
     display: inline-block; }
   .group ul,
-  .requests ul {
+  .requests ul,
+  .remove ul {
     min-height: 20px;
     margin: 0;
       margin-left: 1em;
@@ -606,7 +609,8 @@ h1.big_text {
     list-style: none;
     padding: 15px; }
   .group .person,
-  .requests .person {
+  .requests .person,
+  .remove .person {
     display: inline-block;
     margin-left: 0;
     padding: 5px;
@@ -620,12 +624,14 @@ h1.big_text {
     padding: 5px;
     border: 1px solid #999999; }
     .group .person img,
-    .requests .person img {
+    .requests .person img,
+    .remove .person img {
       height: 50px;
       width: 50px;
       display: inline-block; }
     .group .person .grey,
-    .requests .person .grey {
+    .requests .person .grey,
+    .remove .person .grey {
       font-style: italic;
       color: #666666; }