Fix activity:interactions counter to count all interactions (#8037)

app/lib/potential_friendship_tracker.rb

@@ -20,8 +20,6 @@ class PotentialFriendshipTracker
       redis.zincrby(key, weight, target_account_id)
       redis.zremrangebyrank(key, 0, -MAX_ITEMS)
       redis.expire(key, EXPIRE_AFTER)
-
-      ActivityTracker.increment('activity:interactions')
     end
 
     def remove(account_id, target_account_id)

app/services/favourite_service.rb

@@ -37,6 +37,7 @@ class FavouriteService < BaseService
   end
 
   def bump_potential_friendship(account, status)
+    ActivityTracker.increment('activity:interactions')
     return if account.following?(status.account_id)
     PotentialFriendshipTracker.record(account.id, status.account_id, :favourite)
   end

app/services/post_status_service.rb

@@ -83,7 +83,9 @@ class PostStatusService < BaseService
   end
 
   def bump_potential_friendship(account, status)
-    return if !status.reply? || account.following?(status.in_reply_to_account_id)
+    return if !status.reply? || account.id == status.in_reply_to_account_id
+    ActivityTracker.increment('activity:interactions')
+    return if account.following?(status.in_reply_to_account_id)
     PotentialFriendshipTracker.record(account.id, status.in_reply_to_account_id, :reply)
   end
 end

app/services/reblog_service.rb

@@ -44,6 +44,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