Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-31 01:17:25 +00:00
parent e7b3a4263e c61c4565ab
commit 165b5dc7f5
28 changed files with 508 additions and 157 deletions
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -187,4 +187,15 @@ module AccountInteractions
  def pinned?(status)
    status_pins.where(status: status).exists?
  end
+
+  def followers_for_local_distribution
+    followers.local
+             .joins(:user)
+             .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+  end
+
+  def lists_for_local_distribution
+    lists.joins(account: :user)
+         .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+  end
 end