Merge commit '42698b4c5c' into kb_migration

This commit is contained in:
KMY 2023-07-21 18:40:40 +09:00
commit 152b8eb4e6
215 changed files with 1302 additions and 914 deletions

View file

@ -101,9 +101,17 @@ class REST::StatusSerializer < ActiveModel::Serializer
status_reference_ids.size
end
def reblogs_count
relationships&.attributes_map&.dig(object.id, :reblogs_count) || object.reblogs_count
end
def favourites_count
relationships&.attributes_map&.dig(object.id, :favourites_count) || object.favourites_count
end
def favourited
if instance_options && instance_options[:relationships]
instance_options[:relationships].favourites_map[object.id] || false
if relationships
relationships.favourites_map[object.id] || false
else
current_user.account.favourited?(object)
end
@ -125,40 +133,40 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def reblogged
if instance_options && instance_options[:relationships]
instance_options[:relationships].reblogs_map[object.id] || false
if relationships
relationships.reblogs_map[object.id] || false
else
current_user.account.reblogged?(object)
end
end
def muted
if instance_options && instance_options[:relationships]
instance_options[:relationships].mutes_map[object.conversation_id] || false
if relationships
relationships.mutes_map[object.conversation_id] || false
else
current_user.account.muting_conversation?(object.conversation)
end
end
def bookmarked
if instance_options && instance_options[:relationships]
instance_options[:relationships].bookmarks_map[object.id] || false
if relationships
relationships.bookmarks_map[object.id] || false
else
current_user.account.bookmarked?(object)
end
end
def pinned
if instance_options && instance_options[:relationships]
instance_options[:relationships].pins_map[object.id] || false
if relationships
relationships.pins_map[object.id] || false
else
current_user.account.pinned?(object)
end
end
def filtered
if instance_options && instance_options[:relationships]
instance_options[:relationships].filters_map[object.id] || []
if relationships
relationships.filters_map[object.id] || []
else
current_user.account.status_matches_filters(object)
end
@ -183,6 +191,12 @@ class REST::StatusSerializer < ActiveModel::Serializer
object.active_mentions.to_a.sort_by(&:id)
end
private
def relationships
instance_options && instance_options[:relationships]
end
class ApplicationSerializer < ActiveModel::Serializer
attributes :name, :website