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

fix quote 500 error

Browse Source
This commit is contained in:
YoheiZuho 2023-12-31 06:23:17 +00:00
parent d342d103ba
commit d89bff03c9
8 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/v1/accounts/statuses_controller.rb
View File

@ -9,10 +9,11 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
def index def index
cache_if_unauthenticated! cache_if_unauthenticated!
@statuses = load_statuses @statuses = load_statuses
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account?ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, each_serializer: REST::StatusSerializer, render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private

3
app/controllers/api/v1/bookmarks_controller.rb
View File

@ -8,9 +8,10 @@ class Api::V1::BookmarksController < Api::BaseController
def index def index
@statuses = load_statuses @statuses = load_statuses
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, each_serializer: REST::StatusSerializer, render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private

3
app/controllers/api/v1/favourites_controller.rb
View File

@ -8,9 +8,10 @@ class Api::V1::FavouritesController < Api::BaseController
def index def index
@statuses = load_statuses @statuses = load_statuses
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, each_serializer: REST::StatusSerializer, render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private

3
app/controllers/api/v1/statuses_controller.rb
View File

@ -50,10 +50,11 @@ class Api::V1::StatusesController < Api::BaseController
@context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants) @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
statuses = [@status] + @context.ancestors + @context.descendants statuses = [@status] + @context.ancestors + @context.descendants
account_ids = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @context, serializer: REST::ContextSerializer, render json: @context, serializer: REST::ContextSerializer,
relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
def create def create

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

@ -11,7 +11,9 @@ class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
@statuses = load_statuses @statuses = load_statuses
@relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) @relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
@account_relationships = AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) accounts = Account.where(id: account_ids)
@account_relationships = AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
render json: @statuses, render json: @statuses,

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

@ -10,11 +10,12 @@ class Api::V1::Timelines::ListController < Api::V1::Timelines::BaseController
def show def show
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, render json: @statuses,
each_serializer: REST::StatusSerializer, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private

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

@ -9,10 +9,11 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
cache_if_unauthenticated! cache_if_unauthenticated!
@statuses = load_statuses @statuses = load_statuses
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, each_serializer: REST::StatusSerializer, render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private

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

@ -10,10 +10,11 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
cache_if_unauthenticated! cache_if_unauthenticated!
@statuses = load_statuses @statuses = load_statuses
account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq account_ids = @statuses.filter(&:quote?).map { |status| status.quote.account_id }.uniq
accounts = Account.where(id: account_ids)
render json: @statuses, each_serializer: REST::StatusSerializer, render json: @statuses, each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id), relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
account_relationships: AccountRelationshipsPresenter.new(account_ids, current_user&.account_id) account_relationships: AccountRelationshipsPresenter.new(accounts, current_user&.account_id)
end end
private private