diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:47 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:47 +0100 |
commit | a0df694c2431b30f2f1051cd9ddc9344229d600d (patch) | |
tree | 5ed179289819d61df1a4c15851389aa7d9b42f19 /app/services/follow_service.rb | |
parent | 1b8d3375c874c0ee5374000500075df026c56a16 (diff) | |
parent | 5f511324b65f94d800dbbd3850214955d7d9eb73 (diff) |
Merge branch 'rmhasan-fix_462'
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 915f95b4c..17b3b2542 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -10,7 +10,7 @@ class FollowService < BaseService target_account = FollowRemoteAccountService.new.call(uri) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? - raise Mastodon::NotPermitted 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) if target_account.locked? request_follow(source_account, target_account) |