diff options
| author | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
| commit | 01001ba118d7adcd4966c893cf95db32fe76c273 (patch) | |
| tree | fc8b580c8f0a3c1e14a8ca20e3bea5bd7acb4ff1 /app/lib/activitypub/activity/follow.rb | |
| parent | 1e75b3d874973dd71ea74b158ebeb501d9ac68a3 (diff) | |
| parent | 65db9df011a3e13efa79f4e56343aa69bdad7716 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/activitypub/activity/follow.rb')
| -rw-r--r-- | app/lib/activitypub/activity/follow.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index 28f1da19f..ec92f4255 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -21,7 +21,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id']) - if target_account.locked? + if target_account.locked? || @account.silenced? NotifyService.new.call(target_account, follow_request) else AuthorizeFollowService.new.call(@account, target_account) |