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

This commit is contained in:
Thibaut Girka
2018-07-17 22:05:25 +02:00
20 changed files with 360 additions and 36 deletions
+3 -1
View File
@@ -86,7 +86,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