gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add: #198 contextのAPIについてwith_references対応 (#209)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-11-01 10:00:22 +09:00 • committed by GitHub
parent cc938d76a7
commit 99511ee1b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/api/v1/statuses_controller.rb
View file

@ -49,6 +49,11 @@ class Api::V1::StatusesController < Api::BaseController
loaded_descendants = cache_collection(descendants_results, Status)
loaded_references = cache_collection(references_results, Status)
unless params[:with_reference]
loaded_ancestors = (loaded_ancestors + loaded_references).uniq(&:id)
loaded_references = []
end
@context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants, references: loaded_references)
statuses = [@status] + @context.ancestors + @context.descendants + @context.references

2
app/javascript/mastodon/actions/statuses.js
View file

@ -180,7 +180,7 @@ export function fetchContext(id) {
return (dispatch, getState) => {
dispatch(fetchContextRequest(id));
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
api(getState).get(`/api/v1/statuses/${id}/context?with_reference=1`).then(response => {
dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants).concat(response.data.references)));
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants, response.data.references));