diff options
author | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
---|---|---|
committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
commit | 144ecfcfc7d9974117f1563084409a9558290a60 (patch) | |
tree | a26bd8374e4b8264dbae815fbfbd3b91ae51450b /app/services/follow_service.rb | |
parent | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (diff) |
Revert "Revert "Merge branch 'glitch'""
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r-- | app/services/follow_service.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index dc47804c0..4d19002c4 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -18,14 +18,13 @@ class FollowService < BaseService if source_account.following?(target_account) # We're already following this account, but we'll call follow! again to # make sure the reblogs status is set correctly. - source_account.follow!(target_account, reblogs: reblogs) - return + return source_account.follow!(target_account, reblogs: reblogs) elsif source_account.requested?(target_account) # This isn't managed by a method in AccountInteractions, so we modify it # ourselves if necessary. req = source_account.follow_requests.find_by(target_account: target_account) req.update!(show_reblogs: reblogs) - return + return req end ActivityTracker.increment('activity:interactions') |