Extract private methods in `StatusCacheHydrator` (#26177)
parent
a2dca50ef3
commit
84d520ee80
|
@ -11,7 +11,7 @@ class StatusCacheHydrator
|
||||||
|
|
||||||
# If we're delivering to the author who disabled the display of the application used to create the
|
# If we're delivering to the author who disabled the display of the application used to create the
|
||||||
# status, we need to hydrate the application, since it was not rendered for the basic payload
|
# status, we need to hydrate the application, since it was not rendered for the basic payload
|
||||||
payload[:application] = @status.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:application].nil? && @status.account_id == account_id
|
payload[:application] = payload_application if payload[:application].nil? && @status.account_id == account_id
|
||||||
|
|
||||||
# We take advantage of the fact that some relationships can only occur with an original status, not
|
# We take advantage of the fact that some relationships can only occur with an original status, not
|
||||||
# the reblog that wraps it, so we can assume that some values are always false
|
# the reblog that wraps it, so we can assume that some values are always false
|
||||||
|
@ -19,11 +19,13 @@ class StatusCacheHydrator
|
||||||
payload[:muted] = false
|
payload[:muted] = false
|
||||||
payload[:bookmarked] = false
|
payload[:bookmarked] = false
|
||||||
payload[:pinned] = false if @status.account_id == account_id
|
payload[:pinned] = false if @status.account_id == account_id
|
||||||
payload[:filtered] = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status.reblog).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json }
|
payload[:filtered] = CustomFilter
|
||||||
|
.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status.reblog)
|
||||||
|
.map { |filter| serialized_filter(filter) }
|
||||||
|
|
||||||
# If the reblogged status is being delivered to the author who disabled the display of the application
|
# If the reblogged status is being delivered to the author who disabled the display of the application
|
||||||
# used to create the status, we need to hydrate it here too
|
# used to create the status, we need to hydrate it here too
|
||||||
payload[:reblog][:application] = @status.reblog.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.reblog.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
|
payload[:reblog][:application] = payload_reblog_application if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
|
||||||
|
|
||||||
payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
|
payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
|
||||||
payload[:reblog][:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
|
payload[:reblog][:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
|
||||||
|
@ -51,7 +53,9 @@ class StatusCacheHydrator
|
||||||
payload[:muted] = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
|
payload[:muted] = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
|
||||||
payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
|
payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
|
||||||
payload[:pinned] = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
|
payload[:pinned] = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
|
||||||
payload[:filtered] = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json }
|
payload[:filtered] = CustomFilter
|
||||||
|
.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status)
|
||||||
|
.map { |filter| serialized_filter(filter) }
|
||||||
|
|
||||||
if payload[:poll]
|
if payload[:poll]
|
||||||
payload[:poll][:voted] = @status.account_id == account_id
|
payload[:poll][:voted] = @status.account_id == account_id
|
||||||
|
@ -61,4 +65,35 @@ class StatusCacheHydrator
|
||||||
|
|
||||||
payload
|
payload
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def serialized_filter(filter)
|
||||||
|
ActiveModelSerializers::SerializableResource.new(
|
||||||
|
filter,
|
||||||
|
serializer: REST::FilterResultSerializer
|
||||||
|
).as_json
|
||||||
|
end
|
||||||
|
|
||||||
|
def payload_application
|
||||||
|
@status.application.present? ? serialized_status_application_json : nil
|
||||||
|
end
|
||||||
|
|
||||||
|
def serialized_status_application_json
|
||||||
|
ActiveModelSerializers::SerializableResource.new(
|
||||||
|
@status.application,
|
||||||
|
serializer: REST::StatusSerializer::ApplicationSerializer
|
||||||
|
).as_json
|
||||||
|
end
|
||||||
|
|
||||||
|
def payload_reblog_application
|
||||||
|
@status.reblog.application.present? ? serialized_status_reblog_application_json : nil
|
||||||
|
end
|
||||||
|
|
||||||
|
def serialized_status_reblog_application_json
|
||||||
|
ActiveModelSerializers::SerializableResource.new(
|
||||||
|
@status.reblog.application,
|
||||||
|
serializer: REST::StatusSerializer::ApplicationSerializer
|
||||||
|
).as_json
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Reference in New Issue