diff options
| author | pluralcafe-docker <git@plural.cafe> | 2019-01-12 04:24:14 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2019-01-12 04:24:14 +0000 |
| commit | ae24ef877b82466cab026a76ea6ed8598ddaae18 (patch) | |
| tree | 584c25ada377f2e6da49a9b45b3da947501b1831 /app/services/follow_service.rb | |
| parent | fa1ab7fbe4166f3d8b481891dcc443df5aa212bb (diff) | |
| parent | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 24b3e1f70..9d36a1449 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -10,7 +10,7 @@ class FollowService < BaseService target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? - raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) + raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? if source_account.following?(target_account) # We're already following this account, but we'll call follow! again to |