post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add handler for Move activity (#9629)

Browse source
This commit is contained in:
Eugen Rochko 2018-12-29 02:24:36 +01:00 • committed by GitHub
parent 9b475a4838
commit 0f938ff29c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 136 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/services/activitypub/process_account_service.rb
View file

@ -75,6 +75,7 @@ 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

2
app/services/follow_service.rb
View file

@ -12,7 +12,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