mirror of
https://github.com/modrinth/code.git
synced 2026-08-25 09:04:55 +00:00
feat: instance sharing thru shared-instances service (#6569)
* feat: implement instance share page + search_users backend call * feat: invite players modal * feat: use tanstack queries for friends sync across app pages * feat: base shared instances implementation * fix: admon style * feat: impl instance admonitions like server panel * fix: impl get + del usage * feat: support modpack links * feat: invite notif accepting * fix: lint + fmt * feat: impl install to play * feat: impl usage of UpdateToPlayModal * feat: warnings on deleting/disabling shared-instance version content * fix: send instance name * feat: align with backend * feat: shared instances qa * feat: wrong account protection * feat: qa * fix: smartly apply updates * fix: install bug * fix: 401/404 differentiation * fix: fmt+prepr * feat: qa * feat: qa * fix: signing out messes up revoke/deleted checks * feat: qa * fix: fmt + lint * feat: lock content if part of shared instance * fix: lint * [do not merge] feat: rough invite links impl temp (#6666) * fix: wrong cmd * feat: invite page * fix: server-manager DTO mismatch * fix: drop anonymous invite link acceptance * refactor: structured shared-instance unavailable errors * refactor: centralise error presentations * refactor: dedupe shared instance diff detection * fix: logging in reqwests * refactor: move app.vue shared instances into handler * refactor: break up Share.vue * refactor: split up shared instances state outside of instance index * refactor: dedicated shared instances install/update modals + split up page * refactor: centralized managed content * refactor: split up install shared to own runner + shared.rs split up * refactor: dedupe sql for instance metadata enrichmnt * refactor: friends composable + dedupe friends logic across usages * chore: reduced unused code * fix: align with backend * fix: lint * fix: file sha changes * fix: invite links not working due to icon signed * feat: qa * feat: reporting frontend dummy * fix: try use header * remove: file hash field * fix: pin box * feat: malware warning for shared instances * fix: cache rule * feat: config files syncing * feat: disable config sharing * fix: header * fix: use mark ready * fix: dont cause push update for configs * fix: lint * feat: sharing page in settings * feat: move config + change flow * fix: qa * fix: lint prepr * feat: proxy file upload thru shared instances backend * fix: use collapisible * fix: push config * fix: config * feat: swap out sign in modal for new one * fix: report flow * fix: exclude configs.zip from external warnings * fix: nuxi init * fix: config bundle downloading * fix: error notif * fix: polling * fix: qa * fix: lint + prepr * feat: shared instances moderation frontend + hook up report flow * fix: report copy * fix: lint * fix: lint * fix: modrinth ids being undefined * feat: instance quarantining * fix: prepr + fmt * fix: quarantined -> locked terminology * fix: missing endpoint impls + fmt * fix: missing api in build.rs * fix: share tab jittery * fix: fmt *PT bug * fix: invites count as users even if pending * fix: prepr * fix: invite page owner in users list * fix: lint * fix: qa * fix: lint * fix: members stale not clearing * fix: invite use joined_at field * fix: lint * fix: qa --------- Co-authored-by: sychic <47618543+Sychic@users.noreply.github.com>
This commit is contained in:
Calum H.
sychic
@@ -1,14 +1,6 @@
|
||||
import type { Labrinth } from '@modrinth/api-client'
|
||||
import type { AbstractModrinthClient, Labrinth, SharedInstances } from '@modrinth/api-client'
|
||||
import type { ExtendedReport, OwnershipTarget } from '@modrinth/moderation'
|
||||
import type {
|
||||
Organization,
|
||||
Project,
|
||||
Report,
|
||||
TeamMember,
|
||||
Thread,
|
||||
User,
|
||||
Version,
|
||||
} from '@modrinth/utils'
|
||||
import type { Organization, Project, TeamMember, Thread, User, Version } from '@modrinth/utils'
|
||||
|
||||
export const useModerationCache = () => ({
|
||||
threads: useState<Map<string, Thread>>('moderation-report-cache-threads', () => new Map()),
|
||||
@@ -17,10 +9,17 @@ export const useModerationCache = () => ({
|
||||
versions: useState<Map<string, Version>>('moderation-report-cache-versions', () => new Map()),
|
||||
teams: useState<Map<string, TeamMember[]>>('moderation-report-cache-teams', () => new Map()),
|
||||
orgs: useState<Map<string, Organization>>('moderation-report-cache-orgs', () => new Map()),
|
||||
sharedInstances: useState<Map<string, SharedInstances.Instances.v1.Instance>>(
|
||||
'moderation-report-cache-shared-instances',
|
||||
() => new Map(),
|
||||
),
|
||||
})
|
||||
|
||||
// TODO: @AlexTMjugador - backend should do all of these functions.
|
||||
export async function enrichReportBatch(reports: Report[]): Promise<ExtendedReport[]> {
|
||||
export async function enrichReportBatch(
|
||||
reports: Labrinth.Reports.v3.Report[],
|
||||
client: AbstractModrinthClient,
|
||||
): Promise<ExtendedReport[]> {
|
||||
if (reports.length === 0) return []
|
||||
|
||||
const cache = useModerationCache()
|
||||
@@ -41,8 +40,16 @@ export async function enrichReportBatch(reports: Report[]): Promise<ExtendedRepo
|
||||
.filter((r) => r.item_type === 'project')
|
||||
.map((r) => r.item_id)
|
||||
.filter((id) => !cache.projects.value.has(id))
|
||||
const sharedInstanceIDs = [
|
||||
...new Set(
|
||||
reports
|
||||
.filter((r) => r.item_type === 'shared-instance')
|
||||
.map((r) => r.item_id)
|
||||
.filter((id) => !cache.sharedInstances.value.has(id)),
|
||||
),
|
||||
]
|
||||
|
||||
const [newThreads, newVersions, newUsers] = await Promise.all([
|
||||
const [newThreads, newVersions, newUsers, newSharedInstances] = await Promise.all([
|
||||
threadIDs.length > 0
|
||||
? (fetchSegmented(threadIDs, (ids) => `threads?ids=${asEncodedJsonArray(ids)}`) as Promise<
|
||||
Thread[]
|
||||
@@ -59,11 +66,22 @@ export async function enrichReportBatch(reports: Report[]): Promise<ExtendedRepo
|
||||
(ids) => `users?ids=${asEncodedJsonArray(ids)}`,
|
||||
) as Promise<User[]>)
|
||||
: Promise.resolve([]),
|
||||
Promise.allSettled(
|
||||
sharedInstanceIDs.map(async (instanceId) => ({
|
||||
id: instanceId,
|
||||
instance: await client.sharedinstances.instances_v1.get(instanceId),
|
||||
})),
|
||||
),
|
||||
])
|
||||
|
||||
newThreads.forEach((t) => cache.threads.value.set(t.id, t))
|
||||
newVersions.forEach((v) => cache.versions.value.set(v.id, v))
|
||||
newUsers.forEach((u) => cache.users.value.set(u.id, u))
|
||||
newSharedInstances.forEach((result) => {
|
||||
if (result.status === 'fulfilled') {
|
||||
cache.sharedInstances.value.set(result.value.id, result.value.instance)
|
||||
}
|
||||
})
|
||||
|
||||
const allVersions = [...newVersions, ...Array.from(cache.versions.value.values())]
|
||||
const fullProjectIds = new Set([
|
||||
@@ -177,6 +195,10 @@ export async function enrichReportBatch(reports: Report[]): Promise<ExtendedRepo
|
||||
user: report.item_type === 'user' ? cache.users.value.get(report.item_id) : undefined,
|
||||
version,
|
||||
target,
|
||||
shared_instance:
|
||||
report.item_type === 'shared-instance'
|
||||
? cache.sharedInstances.value.get(report.item_id)
|
||||
: undefined,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user