MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove useBaseFetch for @modrinth/api-client (#5596)

Browse Source 
* Reapply "fix: start swapping useBaseFetch usages to api-client"

This reverts commit f4f33db7019ea861addb2c66c204d736800b7b6c.

* fix: bugs

* fix: analytics

* fix: lint
This commit is contained in:
Calum H.
2026-03-17 20:06:19 +00:00
committed by GitHub
parent 58c1e225c8
commit 87c86c7d0d
64 changed files with 2073 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/frontend/src/pages/collection/[id].vue
View File

@@ -418,7 +418,6 @@ import dayjs from 'dayjs'
import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
import NavTabs from '~/components/ui/NavTabs.vue'
import { asEncodedJsonArray, fetchSegmented } from '~/utils/fetch-helpers.ts'
const { handleError } = injectNotificationManager()
const api = injectModrinthClient()
@@ -589,7 +588,7 @@ const refreshCollection = async () => {
// Query for creator (only for regular collections)
const { data: fetchedCreator, isPending: creatorIsPending } = useQuery({
queryKey: computed(() => ['user', collection.value?.user]),
queryFn: () => useBaseFetch(`user/${collection.value?.user}`),
queryFn: () => api.labrinth.users_v2.get(collection.value.user),
enabled: computed(() => !isFollowingCollection.value && !!collection.value?.user),
})
@@ -606,7 +605,7 @@ const {
} = useQuery({
queryKey: computed(() => ['user', auth.value.user?.id, 'follows']),
queryFn: async () => {
const projects = await useBaseFetch(`user/${auth.value.user.id}/follows`)
const projects = await api.labrinth.users_v2.getFollowedProjects(auth.value.user.id)
for (const project of projects) {
project.categories = project.categories.concat(project.loaders)
}
@@ -624,10 +623,16 @@ const {
} = useQuery({
queryKey: computed(() => ['projects', collection.value?.projects]),
queryFn: async () => {
const projects = await fetchSegmented(
collection.value.projects,
(ids) => `projects?ids=${asEncodedJsonArray(ids)}`,
const projectIds = collection.value.projects
const segmentSize = 800
const segments = []
for (let i = 0; i < projectIds.length; i += segmentSize) {
segments.push(projectIds.slice(i, i + segmentSize))
}
const results = await Promise.all(
segments.map((ids) => api.labrinth.projects_v2.getMultiple(ids)),
)
const projects = results.flat()
for (const project of projects) {
project.categories = project.categories.concat(project.loaders)
}