mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/features/main' into features/quote

Browse Source
This commit is contained in:
YoheiZuho
2024-02-04 11:40:23 +09:00
parent 4b2272c34e a0474b9a53
commit f16b068156
61 changed files with 770 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/timelines/home_controller.rb
View File

@@ -11,6 +11,8 @@ class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
@statuses = load_statuses
@relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
accounts = @statuses.filter_map { |status| status.quote&.account }.uniq
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
@account_relationships = AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end

1
app/controllers/api/v1/timelines/list_controller.rb
View File

@@ -10,6 +10,7 @@ class Api::V1::Timelines::ListController < Api::V1::Timelines::BaseController
def show
accounts = @statuses.filter_map { |status| status.quote&.account }.uniq
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
render json: @statuses,
each_serializer: REST::StatusSerializer,

1
app/controllers/api/v1/timelines/public_controller.rb
View File

@@ -9,6 +9,7 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
cache_if_unauthenticated!
@statuses = load_statuses
accounts = @statuses.filter_map { |status| status.quote&.account }.uniq
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),

1
app/controllers/api/v1/timelines/tag_controller.rb
View File

@@ -10,6 +10,7 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
cache_if_unauthenticated!
@statuses = load_statuses
accounts = @statuses.filter_map { |status| status.quote&.account }.uniq
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),