diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:56:31 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:59 +0100 |
| commit | bb96a7463758687f8187ae4483becd346c2482b3 (patch) | |
| tree | 348a9c54f0152a73fd7753de3bbe9fe02ab28fe2 /app/services | |
| parent | 1b35ca17a9f214bbc4fc577baa7a86b567b2f629 (diff) | |
Revert "Add handler for Move activity (#9629)"
This reverts commit 0f938ff29c2e9bf92e3eb9c23be8d4ba3a1b97f7.
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 1 | ||||
| -rw-r--r-- | app/services/follow_service.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index d6480028f..5c865dae2 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -75,7 +75,6 @@ class ActivityPub::ProcessAccountService < BaseService @account.note = @json['summary'] || '' @account.locked = @json['manuallyApprovesFollowers'] || false @account.fields = property_values || {} - @account.also_known_as = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) } @account.actor_type = actor_type end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 9d36a1449..24b3e1f70 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) || target_account.moved? + raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) if source_account.following?(target_account) # We're already following this account, but we'll call follow! again to |