Merge branch 'master' into glitch-soc/merge-upstream

2018-07-17 22:05:25 +02:00
parent 1fb78602c5 6277a6db2a
commit 7dbed4dab9
20 changed files with 360 additions and 36 deletions
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -47,6 +47,7 @@ class ReblogService < BaseService
  end

  def bump_potential_friendship(account, reblog)
+    ActivityTracker.increment('activity:interactions')
    return if account.following?(reblog.reblog.account_id)
    PotentialFriendshipTracker.record(account.id, reblog.reblog.account_id, :reblog)
  end