Fix activity:interactions counter to count all interactions (#8037)
This commit is contained in:
		
							parent
							
								
									8f64b17d98
								
							
						
					
					
						commit
						a23ac107e4
					
				
					 4 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue