This commit is contained in:
Henry Jameson 2026-06-18 20:53:21 +03:00
commit fe1790f217
6 changed files with 67 additions and 70 deletions

View file

@ -339,14 +339,14 @@ export const fetchFavoritedByUsers = ({ id, credentials }) =>
url: MASTODON_STATUS_FAVORITEDBY_URL(id),
method: 'GET',
credentials,
}).then(({ data, ...rest }) => ({ ...rest, data: parseUser(data) }))
}).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
export const fetchRebloggedByUsers = ({ id, credentials }) =>
promisedRequest({
url: MASTODON_STATUS_REBLOGGEDBY_URL(id),
method: 'GET',
credentials,
}).then(({ data, ...rest }) => ({ ...rest, data: parseUser(data) }))
}).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) }))
export const fetchEmojiReactions = ({ id, credentials }) =>
promisedRequest({

View file

@ -44,7 +44,7 @@ const MASTODON_DENY_USER_URL = (id) => `/api/v1/follow_requests/${id}/reject`
const MASTODON_USER_RELATIONSHIPS_URL = ({ id, withSuspended }) =>
`/api/v1/accounts/relationships/${paramsString({ id, withSuspended })}`
const MASTODON_USER_IN_LISTS = (id) => `/api/v1/accounts/${id}/lists`
export const MASTODON_LIST_URL = (id) => `/api/v1/lists/${id}`
export const MASTODON_LIST_URL = (id = '') => `/api/v1/lists/${id}`
export const MASTODON_LIST_ACCOUNTS_URL = (id) => `/api/v1/lists/${id}/accounts`
const MASTODON_USER_BLOCKS_URL = ({
maxId,

View file

@ -445,7 +445,7 @@ const conversation = {
fetchConversation({
id: this.statusId,
credentials: useOAuthStore().token,
}).then(({ ancestors, descendants }) => {
}).then(({ data: { ancestors, descendants } }) => {
this.$store.dispatch('addNewStatuses', { statuses: ancestors })
this.$store.dispatch('addNewStatuses', { statuses: descendants })
this.setHighlight(this.originalStatusId)
@ -456,7 +456,7 @@ const conversation = {
id: this.statusId,
credentials: useOAuthStore().token,
})
.then((status) => {
.then(({ data: status }) => {
this.$store.dispatch('addNewStatuses', { statuses: [status] })
this.fetchConversation()
})

View file

@ -788,12 +788,12 @@ const statuses = {
fetchFavoritedByUsers({
id,
credentials: useOAuthStore().token,
}),
}).then(({ data }) => data),
fetchRebloggedByUsers({
id,
credentials: useOAuthStore().token,
}),
]).then(([{ data: favoritedByUsers }, { data: rebloggedByUsers }]) => {
}).then(({ data }) => data),,
]).then(([favoritedByUsers, rebloggedByUsers]) => {
commit('addFavs', {
id,
favoritedByUsers,

View file

@ -244,7 +244,6 @@ export const _mergeJournal = (...journals) => {
}
})
.map((x) => x.data)
console.log(journal)
if (path.startsWith('collections')) {
const lastRemoveIndex = findLastIndex(