Add serializing/unserializing of "locked" actor attribute (#4585)

fix-uploadarea-keyup-for-upstream
Eugen Rochko 2017-08-12 17:41:03 +02:00 committed by GitHub
parent 40be4ea239
commit ccdd5a9576
4 changed files with 31 additions and 0 deletions

View File

@ -5,6 +5,10 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
:camel_lower :camel_lower
end end
def self.transform_key_casing!(value, _options)
ActivityPub::CaseTransform.camel_lower(value)
end
def serializable_hash(options = nil) def serializable_hash(options = nil)
options = serialization_options(options) options = serialization_options(options)
serialized_hash = { '@context': ActivityPub::TagManager::CONTEXT }.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)) serialized_hash = { '@context': ActivityPub::TagManager::CONTEXT }.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options))

View File

@ -0,0 +1,24 @@
# frozen_string_literal: true
module ActivityPub::CaseTransform
class << self
def camel_lower_cache
@camel_lower_cache ||= {}
end
def camel_lower(value)
case value
when Array then value.map { |item| camel_lower(item) }
when Hash then value.deep_transform_keys! { |key| camel_lower(key) }
when Symbol then camel_lower(value.to_s).to_sym
when String
camel_lower_cache[value] ||= if value.start_with?('_:')
'_:' + value.gsub(/\A_:/, '').underscore.camelize(:lower)
else
value.underscore.camelize(:lower)
end
else value
end
end
end
end

View File

@ -9,6 +9,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
has_one :public_key, serializer: ActivityPub::PublicKeySerializer has_one :public_key, serializer: ActivityPub::PublicKeySerializer
attribute :locked, key: '_:locked'
class ImageSerializer < ActiveModel::Serializer class ImageSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper

View File

@ -46,6 +46,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.avatar_remote_url = image_url('icon') @account.avatar_remote_url = image_url('icon')
@account.header_remote_url = image_url('image') @account.header_remote_url = image_url('image')
@account.public_key = public_key || '' @account.public_key = public_key || ''
@account.locked = @json['_:locked'] || false
@account.save! @account.save!
end end