Merge commit '4b65740722
' into kb_development
This commit is contained in:
commit
83065ff389
398 changed files with 3376 additions and 2449 deletions
|
@ -82,7 +82,7 @@ class ActivityPub::ProcessAccountService < BaseService
|
|||
|
||||
set_immediate_protocol_attributes!
|
||||
|
||||
@account.save
|
||||
@account.save!
|
||||
end
|
||||
|
||||
def update_account
|
||||
|
|
|
@ -8,6 +8,8 @@ class ActivityPub::ProcessCollectionService < BaseService
|
|||
@json = original_json = Oj.load(body, mode: :strict)
|
||||
@options = options
|
||||
|
||||
return unless @json.is_a?(Hash)
|
||||
|
||||
begin
|
||||
@json = compact(@json) if @json['signature'].is_a?(Hash)
|
||||
rescue JSON::LD::JsonLdError => e
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue