Merge branch 'stable' into develop

Changelog.md

@@ -89,6 +89,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)
 * Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
 * Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
+* Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)
 
 # 0.5.2.0
 

app/assets/javascripts/app/models/stream.js

@@ -83,6 +83,10 @@ app.models.Stream = Backbone.Collection.extend({
     this.trigger("fetched");
   },
 
+  remove : function(models) {
+    this.items.remove(models);
+  },
+
   preloadOrFetch : function(){ //hai, plz test me THNX
     return $.when(app.hasPreload("stream") ? this.preload() : this.fetch());
   },

app/assets/javascripts/app/views/stream_faces_view.js

@@ -11,6 +11,7 @@ app.views.StreamFaces = app.views.Base.extend({
   initialize : function(){
     this.updatePeople();
     app.stream.items.bind("add", this.updatePeople, this);
+    app.stream.items.bind("remove", this.updatePeople, this);
   },
 
   presenter : function() {

app/assets/javascripts/app/views/stream_post_views.js

@@ -91,6 +91,7 @@ app.views.StreamPost = app.views.Post.extend({
 
   remove : function() {
     $(this.el).slideUp(400, _.bind(function(){this.$el.remove()}, this));
+    app.stream.remove(this.model);
     return this;
   },
 

spec/javascripts/app/views/stream_faces_view_spec.js

@@ -21,11 +21,15 @@ describe("app.views.StreamFaces", function(){
     expect(this.view.people.length).toBe(5);
   });
 
-  it("findsPeople when the collection changes", function(){
+  it("Finds people that were added to the collection", function() {
     this.posts.add(factory.post({author : factory.author({name : "Harriet Tubman"})}));
     expect(this.view.people.length).toBe(6);
   });
 
+  it("Finds people that were removed from the collection", function() {
+    this.posts.remove([this.post2, this.post3]);
+    expect(this.view.people.length).toBe(3);
+  });
 
   describe(".render", function(){
     beforeEach(function(){