diff options
| author | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
| commit | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (patch) | |
| tree | 66f1db08a2f6f9ae2254ba7a81b71835039d671e /app/services/follow_service.rb | |
| parent | 22a55edc158352003a3953964c9d332a60c86428 (diff) | |
Revert "Merge branch 'glitch'"
Login is broken This reverts commit 22a55edc158352003a3953964c9d332a60c86428, reversing changes made to 5902299384d15249fe4b84b8761d4a49f3c7f6fd.
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 4d19002c4..dc47804c0 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -18,13 +18,14 @@ 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. - return source_account.follow!(target_account, reblogs: reblogs) + source_account.follow!(target_account, reblogs: reblogs) + return 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 req + return end ActivityTracker.increment('activity:interactions') |