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

Fix other_setting merging values

Browse source
This commit is contained in:
KMY 2023-05-14 13:43:52 +09:00
parent 062da7f31d
commit 6735a422ab
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/serializers/activitypub/actor_serializer.rb
View file

@ -172,9 +172,9 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end end
def other_setting def other_setting
hash = [] config = { 'noindex' => object.noindex?, 'noai' => object.noai?, 'hide_network' => object.hide_collections }
if object.settings.present? config.merge(object.settings) if object.settings.present?
hash = object.settings.map do |k, v| config.map do |k, v|
{ {
type: 'PropertyValue', type: 'PropertyValue',
name: k, name: k,
@ -182,9 +182,6 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
} }
end end
end end
hash << { type: 'PropertyValue', name: 'noindex', value: object.noindex? }
hash << { type: 'PropertyValue', name: 'noai', value: object.noai? }
end
class CustomEmojiSerializer < ActivityPub::EmojiSerializer class CustomEmojiSerializer < ActivityPub::EmojiSerializer
end end