base/app/models/actor.rb in social_stream-0.24.1 vs base/app/models/actor.rb in social_stream-0.25.0

- old
+ new

@@ -111,9 +111,11 @@ scope :contacted_from, lambda { |a| joins(:received_contacts).merge(Contact.active.sent_by(a)) } + scope :followed, joins(:activity_object).merge(ActivityObject.followed) + scope :followed_by, lambda { |a| select("DISTINCT actors.*"). joins(:received_ties => { :relation => :permissions }). merge(Contact.sent_by(a)). merge(Permission.follow)