@@ -160,8 +166,11 @@ import { useQuery } from '@tanstack/vue-query'
import ConfettiExplosion from 'vue-confetti-explosion'
import ModerationQueueCard from '~/components/ui/moderation/ModerationQueueCard.vue'
+import QueueSummaryModal from '~/components/ui/moderation/QueueSummaryModal.vue'
import { type ModerationProject, toModerationProjects } from '~/helpers/moderation.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
+import { findNextEligibleQueueProject } from '~/services/moderation/queue-eligibility.ts'
useHead({ title: 'Projects queue - Modrinth' })
@@ -172,6 +181,8 @@ const route = useRoute()
const router = useRouter()
const client = injectModrinthClient()
+const queueSummaryModal = ref()
+
const visible = ref(false)
if (import.meta.client && history && history.state && history.state.confetti) {
setTimeout(async () => {
@@ -184,6 +195,14 @@ if (import.meta.client && history && history.state && history.state.confetti) {
}, 1000)
}
+if (import.meta.client && history && history.state && history.state.queueSummary) {
+ setTimeout(async () => {
+ history.state.queueSummary = false
+ await nextTick()
+ queueSummaryModal.value?.show()
+ }, 1000)
+}
+
const messages = defineMessages({
moderate: {
id: 'moderation.moderate',
@@ -498,60 +517,36 @@ function goToPage(page: number) {
currentPage.value = page
}
-function notifySkippedProjects(skippedCount: number) {
- if (skippedCount <= 0) return
- addNotification({
- title: 'Skipped projects',
- text: `Skipped ${skippedCount} project(s) already moderated or locked by others.`,
- type: 'info',
- autoCloseMs: 2000,
- })
-}
-
async function findFirstEligibleProject(): Promise
{
- let skippedCount = 0
-
- while (moderationQueue.hasItems) {
- const currentId = moderationQueue.getCurrentProjectId()
- if (!currentId) return null
-
- const project = projectsById.value.get(currentId)
-
- if (project && project.project.status !== 'processing') {
- await moderationQueue.completeCurrentProject(currentId, 'skipped')
- skippedCount++
- continue
- }
+ const candidateIds = [...moderationQueue.currentQueue.items]
+ if (candidateIds.length === 0) return null
- try {
- const lockStatus = await moderationQueue.checkLock(currentId)
+ const next = await findNextEligibleQueueProject(client, moderationQueue, candidateIds)
- if (!lockStatus.locked || lockStatus.expired || lockStatus.is_own_lock) {
- notifySkippedProjects(skippedCount)
- return currentId
- }
-
- await moderationQueue.completeCurrentProject(currentId, 'skipped')
- skippedCount++
- } catch {
- return currentId
- }
+ if (!next) {
+ await Promise.all(candidateIds.map((id) => moderationQueue.excludeProject(id)))
+ return null
}
- notifySkippedProjects(skippedCount)
-
- return null
+ await Promise.all(next.excluded.map((id) => moderationQueue.excludeProject(id)))
+ return next.project
}
function getProjectRouteParam(projectId: string): string {
return projectsById.value.get(projectId)?.project.slug || projectId
}
+function getProjectRouteType(projectId: string): string {
+ const projectType = projectsById.value.get(projectId)?.project.project_types[0]
+ if (!projectType) return 'project'
+ return getProjectTypeForUrlShorthand(projectType, [])
+}
+
async function navigateToModerationProject(projectId: string) {
await navigateTo({
name: 'type-project',
params: {
- type: 'project',
+ type: getProjectRouteType(projectId),
project: getProjectRouteParam(projectId),
},
state: {
@@ -593,12 +588,8 @@ async function moderateAllInFilter() {
async function startFromProject(projectId: string) {
const allFilteredProjectIds = await getFilteredProjectIds()
const projectIndex = allFilteredProjectIds.indexOf(projectId)
- if (projectIndex === -1) {
- await moderationQueue.setSingleProject(projectId)
- } else {
- const projectIds = allFilteredProjectIds.slice(projectIndex)
- await moderationQueue.setQueue(projectIds)
- }
+ const projectIds = projectIndex === -1 ? [projectId] : allFilteredProjectIds.slice(projectIndex)
+ await moderationQueue.setQueue(projectIds)
const targetProjectId = await findFirstEligibleProject()
@@ -613,4 +604,21 @@ async function startFromProject(projectId: string) {
await navigateToModerationProject(targetProjectId)
}
+
+async function reviewSkippedQueue() {
+ await moderationQueue.startSkippedReview()
+
+ const targetProjectId = await findFirstEligibleProject()
+
+ if (!targetProjectId) {
+ addNotification({
+ title: 'No projects available',
+ text: 'All previously skipped projects are already moderated or locked by others.',
+ type: 'warning',
+ })
+ return
+ }
+
+ await navigateToModerationProject(targetProjectId)
+}
diff --git a/apps/frontend/src/services/moderation/checklist-session-storage.ts b/apps/frontend/src/services/moderation/checklist-session-storage.ts
new file mode 100644
index 0000000000..5b1c5238be
--- /dev/null
+++ b/apps/frontend/src/services/moderation/checklist-session-storage.ts
@@ -0,0 +1,38 @@
+export interface SessionChecklistState {
+ visitedStages?: string[]
+}
+
+function sessionStorageKey(projectId: string): string {
+ return `moderation-checklist-session:${projectId}`
+}
+
+export function getSessionChecklistState(projectId: string): SessionChecklistState {
+ try {
+ const raw = sessionStorage.getItem(sessionStorageKey(projectId))
+ return raw ? JSON.parse(raw) : {}
+ } catch {
+ return {}
+ }
+}
+
+export function patchSessionChecklistState(
+ projectId: string,
+ patch: Partial,
+): void {
+ try {
+ sessionStorage.setItem(
+ sessionStorageKey(projectId),
+ JSON.stringify({ ...getSessionChecklistState(projectId), ...patch }),
+ )
+ } catch {
+ // Shush
+ }
+}
+
+export function clearSessionChecklistState(projectId: string): void {
+ try {
+ sessionStorage.removeItem(sessionStorageKey(projectId))
+ } catch {
+ // Shush
+ }
+}
diff --git a/apps/frontend/src/services/moderation-checklist-storage.ts b/apps/frontend/src/services/moderation/checklist-storage.ts
similarity index 95%
rename from apps/frontend/src/services/moderation-checklist-storage.ts
rename to apps/frontend/src/services/moderation/checklist-storage.ts
index 3b4c1b356c..fa5c13d215 100644
--- a/apps/frontend/src/services/moderation-checklist-storage.ts
+++ b/apps/frontend/src/services/moderation/checklist-storage.ts
@@ -1,6 +1,6 @@
-import type { NodeState } from '@modrinth/moderation'
+import type { NodeState } from '@modrinth/moderation/src/types/node'
-import { dbDelete, dbGet, dbPut, dbScan } from './moderation-db.ts'
+import { dbDelete, dbGet, dbPut, dbScan } from './db.ts'
export interface PersistedChecklistState {
savedAt: string
@@ -9,6 +9,7 @@ export interface PersistedChecklistState {
stage?: string
message?: string
state?: Record>
+ activatedStages?: string[]
}
const STORE = 'checklist'
diff --git a/apps/frontend/src/services/moderation-db.ts b/apps/frontend/src/services/moderation/db.ts
similarity index 100%
rename from apps/frontend/src/services/moderation-db.ts
rename to apps/frontend/src/services/moderation/db.ts
diff --git a/apps/frontend/src/services/moderation/queue-eligibility.ts b/apps/frontend/src/services/moderation/queue-eligibility.ts
new file mode 100644
index 0000000000..25da387057
--- /dev/null
+++ b/apps/frontend/src/services/moderation/queue-eligibility.ts
@@ -0,0 +1,91 @@
+import type { AbstractModrinthClient } from '@modrinth/api-client'
+
+import type { ModerationQueueService } from './queue.ts'
+
+export interface QueueCandidateCheck {
+ locked: boolean
+ expired?: boolean
+ isOwnLock?: boolean
+ slug?: string
+ projectType?: string
+ status?: string
+ isProcessing: boolean
+}
+
+export interface EligibleQueueProject {
+ project: string
+ result: QueueCandidateCheck
+ excluded: string[]
+}
+
+const BATCH_SIZE = 5
+
+export function isEligibleQueueCandidate(result: QueueCandidateCheck | undefined): boolean {
+ if (!result?.isProcessing) return false
+ return !result.locked || !!result.expired || !!result.isOwnLock
+}
+
+export async function batchCheckQueueCandidates(
+ client: AbstractModrinthClient,
+ moderationQueue: ModerationQueueService,
+ projectIds: string[],
+): Promise> {
+ const results = new Map()
+
+ const projects = await client.labrinth.projects_v3.getMultiple(projectIds).catch(() => [])
+ const projectsById = new Map(projects.map((project) => [project.id, project]))
+
+ const checks = await Promise.allSettled(
+ projectIds.map(async (id) => {
+ const lockResponse = await moderationQueue.checkLock(id)
+ const project = projectsById.get(id) ?? null
+
+ return {
+ id,
+ locked: lockResponse.locked,
+ expired: lockResponse.expired,
+ isOwnLock: lockResponse.is_own_lock,
+ slug: project?.slug,
+ projectType: project?.project_types[0],
+ status: project?.status,
+ isProcessing: project === null ? true : project.status === 'processing',
+ }
+ }),
+ )
+
+ checks.forEach((result, index) => {
+ if (result.status === 'fulfilled') {
+ results.set(result.value.id, result.value)
+ } else {
+ results.set(projectIds[index], { locked: false, isProcessing: true })
+ }
+ })
+
+ return results
+}
+
+export async function findNextEligibleQueueProject(
+ client: AbstractModrinthClient,
+ moderationQueue: ModerationQueueService,
+ candidateIds: string[],
+): Promise {
+ const excluded: string[] = []
+ let checkedCount = 0
+
+ while (checkedCount < candidateIds.length) {
+ const batch = candidateIds.slice(checkedCount, checkedCount + BATCH_SIZE)
+ checkedCount += batch.length
+
+ const results = await batchCheckQueueCandidates(client, moderationQueue, batch)
+
+ for (const id of batch) {
+ const result = results.get(id)
+ if (isEligibleQueueCandidate(result)) {
+ return { project: id, result: result!, excluded: [...excluded] }
+ }
+ excluded.push(id)
+ }
+ }
+
+ return null
+}
diff --git a/apps/frontend/src/services/moderation-queue-storage.ts b/apps/frontend/src/services/moderation/queue-storage.ts
similarity index 87%
rename from apps/frontend/src/services/moderation-queue-storage.ts
rename to apps/frontend/src/services/moderation/queue-storage.ts
index d90ac1121d..22a450a337 100644
--- a/apps/frontend/src/services/moderation-queue-storage.ts
+++ b/apps/frontend/src/services/moderation/queue-storage.ts
@@ -1,13 +1,13 @@
-import { dbDelete, dbGet, dbPut } from './moderation-db.ts'
+import { dbDelete, dbGet, dbPut } from './db.ts'
export interface PersistedModerationQueueState {
version: 1
savedAt: string
currentQueue: {
items: string[]
+ skipped?: string[]
total: number
- completed: number
- skipped: number
+ completed: string[]
lastUpdated: string
}
isQueueMode: boolean
@@ -31,9 +31,9 @@ function isPersistedStateCandidate(value: unknown): value is PersistedModeration
const queue = candidate.currentQueue
if (!queue || typeof queue !== 'object') return false
if (!isStringArray(queue.items)) return false
+ if (queue.skipped !== undefined && !isStringArray(queue.skipped)) return false
if (typeof queue.total !== 'number' || Number.isNaN(queue.total)) return false
- if (typeof queue.completed !== 'number' || Number.isNaN(queue.completed)) return false
- if (typeof queue.skipped !== 'number' || Number.isNaN(queue.skipped)) return false
+ if (!isStringArray(queue.completed)) return false
if (typeof queue.lastUpdated !== 'string') return false
return true
diff --git a/apps/frontend/src/services/moderation-queue.ts b/apps/frontend/src/services/moderation/queue.ts
similarity index 76%
rename from apps/frontend/src/services/moderation-queue.ts
rename to apps/frontend/src/services/moderation/queue.ts
index 2ebe96e8c6..9c0a45a884 100644
--- a/apps/frontend/src/services/moderation-queue.ts
+++ b/apps/frontend/src/services/moderation/queue.ts
@@ -6,13 +6,13 @@ import {
loadQueueState,
type PersistedModerationQueueState,
saveQueueState,
-} from './moderation-queue-storage.ts'
+} from './queue-storage.ts'
export interface ModerationQueue {
items: string[]
+ skipped: string[]
total: number
- completed: number
- skipped: number
+ completed: string[]
lastUpdated: Date
}
@@ -29,11 +29,14 @@ export interface ModerationQueueService {
queueLength: number
hasItems: boolean
+ hasSkipped: boolean
progress: number
setQueue(projectIds: string[]): Promise
- setSingleProject(projectId: string): Promise
- completeCurrentProject(projectId: string, status?: 'completed' | 'skipped'): Promise
+ completeProject(projectId: string): Promise
+ deferProject(projectId: string): Promise
+ excludeProject(projectId: string): Promise
+ startSkippedReview(): Promise
getCurrentProjectId(): string | null
resetQueue(): Promise
@@ -46,31 +49,31 @@ export interface ModerationQueueService {
const EMPTY_QUEUE: ModerationQueue = {
items: [],
+ skipped: [],
total: 0,
- completed: 0,
- skipped: 0,
+ completed: [],
lastUpdated: new Date(),
}
function createEmptyQueue(): ModerationQueue {
- return { ...EMPTY_QUEUE, lastUpdated: new Date(), items: [] }
+ return { ...EMPTY_QUEUE, lastUpdated: new Date(), items: [], skipped: [], completed: [] }
}
function sanitizeQueue(raw: PersistedModerationQueueState['currentQueue']): ModerationQueue {
const lastUpdated = new Date(raw.lastUpdated)
const items = raw.items.filter((id): id is string => typeof id === 'string')
- const completed = Number.isFinite(raw.completed) ? Math.max(Math.trunc(raw.completed), 0) : 0
- const skipped = Number.isFinite(raw.skipped) ? Math.max(Math.trunc(raw.skipped), 0) : 0
- const minimumTotal = items.length + completed + skipped
+ const skipped = (raw.skipped ?? []).filter((id): id is string => typeof id === 'string')
+ const completed = (raw.completed ?? []).filter((id): id is string => typeof id === 'string')
+ const minimumTotal = items.length + completed.length
const total = Number.isFinite(raw.total)
? Math.max(Math.trunc(raw.total), minimumTotal)
: minimumTotal
return {
items,
+ skipped,
total,
completed,
- skipped,
lastUpdated: Number.isNaN(lastUpdated.getTime()) ? new Date() : lastUpdated,
}
}
@@ -84,9 +87,9 @@ function persistedPayload(
savedAt: new Date().toISOString(),
currentQueue: {
items: [...queue.items],
+ skipped: [...queue.skipped],
total: queue.total,
- completed: queue.completed,
- skipped: queue.skipped,
+ completed: [...queue.completed],
lastUpdated: queue.lastUpdated.toISOString(),
},
isQueueMode,
@@ -101,9 +104,10 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
const queueLength = computed(() => currentQueue.value.items.length)
const hasItems = computed(() => currentQueue.value.items.length > 0)
+ const hasSkipped = computed(() => currentQueue.value.skipped.length > 0)
const progress = computed(() => {
if (currentQueue.value.total === 0) return 0
- return (currentQueue.value.completed + currentQueue.value.skipped) / currentQueue.value.total
+ return (currentQueue.value.total - currentQueue.value.items.length) / currentQueue.value.total
})
let mutationChain = Promise.resolve()
@@ -148,51 +152,70 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
return result
}
- function setQueueState(items: string[], mode: boolean) {
- isQueueMode.value = mode
+ function setQueueState(items: string[]) {
+ isQueueMode.value = true
currentQueue.value = {
items: [...items],
+ skipped: [],
total: items.length,
- completed: 0,
- skipped: 0,
+ completed: [],
lastUpdated: new Date(),
}
}
async function setQueue(projectIds: string[]): Promise {
await withMutation(() => {
- setQueueState(projectIds, true)
+ setQueueState(projectIds)
})
}
- async function setSingleProject(projectId: string): Promise {
- await withMutation(() => {
- setQueueState([projectId], false)
+ async function completeProject(projectId: string): Promise {
+ return withMutation(() => {
+ if (!currentQueue.value.items.includes(projectId)) {
+ return currentQueue.value.items.length > 0
+ }
+
+ currentQueue.value.completed = [...currentQueue.value.completed, projectId]
+ currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
+ currentQueue.value.lastUpdated = new Date()
+
+ return currentQueue.value.items.length > 0
})
}
- async function completeCurrentProject(
- projectId: string,
- status: 'completed' | 'skipped' = 'completed',
- ): Promise {
+ async function excludeProject(projectId: string): Promise {
return withMutation(() => {
if (!currentQueue.value.items.includes(projectId)) {
return currentQueue.value.items.length > 0
}
- if (status === 'completed') {
- currentQueue.value.completed++
- } else {
- currentQueue.value.skipped++
+ currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
+ currentQueue.value.lastUpdated = new Date()
+
+ return currentQueue.value.items.length > 0
+ })
+ }
+
+ async function deferProject(projectId: string): Promise {
+ return withMutation(() => {
+ if (!currentQueue.value.items.includes(projectId)) {
+ return currentQueue.value.items.length > 0
}
currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
+ currentQueue.value.skipped = [...currentQueue.value.skipped, projectId]
currentQueue.value.lastUpdated = new Date()
return currentQueue.value.items.length > 0
})
}
+ async function startSkippedReview(): Promise {
+ await withMutation(() => {
+ setQueueState(currentQueue.value.skipped)
+ })
+ }
+
function getCurrentProjectId(): string | null {
return currentQueue.value.items[0] || null
}
@@ -294,11 +317,14 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
queueLength,
hasItems,
+ hasSkipped,
progress,
setQueue,
- setSingleProject,
- completeCurrentProject,
+ completeProject,
+ deferProject,
+ excludeProject,
+ startSkippedReview,
getCurrentProjectId,
resetQueue,
diff --git a/apps/frontend/src/store/moderation.ts b/apps/frontend/src/store/moderation.ts
index d9ac077d57..d488524b7f 100644
--- a/apps/frontend/src/store/moderation.ts
+++ b/apps/frontend/src/store/moderation.ts
@@ -4,8 +4,8 @@ import type {
LockStatusResponse,
ModerationQueue,
ModerationQueueService,
-} from '~/services/moderation-queue.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+} from '~/services/moderation/queue.ts'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
export type {
LockAcquireResponse,
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 0b524d52ad..0038e7d6cf 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -182,6 +182,7 @@ import _LogInIcon from './icons/log-in.svg?component'
import _LogOutIcon from './icons/log-out.svg?component'
import _MailIcon from './icons/mail.svg?component'
import _ManageIcon from './icons/manage.svg?component'
+import _MapPinIcon from './icons/map-pin.svg?component'
import _MaximizeIcon from './icons/maximize.svg?component'
import _MemoryStickIcon from './icons/memory-stick.svg?component'
import _MessageIcon from './icons/message.svg?component'
@@ -614,6 +615,7 @@ export const LogInIcon = _LogInIcon
export const LogOutIcon = _LogOutIcon
export const MailIcon = _MailIcon
export const ManageIcon = _ManageIcon
+export const MapPinIcon = _MapPinIcon
export const MaximizeIcon = _MaximizeIcon
export const MemoryStickIcon = _MemoryStickIcon
export const MessageIcon = _MessageIcon
diff --git a/packages/assets/icons/map-pin.svg b/packages/assets/icons/map-pin.svg
new file mode 100644
index 0000000000..40c440cd95
--- /dev/null
+++ b/packages/assets/icons/map-pin.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/moderation/.prettierignore b/packages/moderation/.prettierignore
index 754475f4e8..e4a11a1c2f 100644
--- a/packages/moderation/.prettierignore
+++ b/packages/moderation/.prettierignore
@@ -1 +1,2 @@
src/locales/**
+src/types/node/pipe.ts
diff --git a/packages/moderation/package.json b/packages/moderation/package.json
index c037661678..5409c54d5e 100644
--- a/packages/moderation/package.json
+++ b/packages/moderation/package.json
@@ -18,6 +18,7 @@
"devDependencies": {
"@formatjs/cli": "^6.2.12",
"@modrinth/tooling-config": "workspace:*",
- "@modrinth/ui": "workspace:*"
+ "@modrinth/ui": "workspace:*",
+ "typescript": "^5.4.5"
}
}
diff --git a/packages/moderation/src/data/checklist.ts b/packages/moderation/src/data/checklist.ts
index 4e5383715c..929552718f 100644
--- a/packages/moderation/src/data/checklist.ts
+++ b/packages/moderation/src/data/checklist.ts
@@ -1,8 +1,6 @@
import type { Ref } from 'vue'
-import { provide, ref } from 'vue'
-import type { NodeState, StageFn, StageNodeBuilder } from '../types/node'
-import { group, STAGES_KEY } from '../types/node'
+import type { NodeState, StageNode } from '../types/node'
import useCategoriesStage from './stages/categories'
import useDescriptionStage from './stages/description'
import useGalleryStage from './stages/gallery'
@@ -13,7 +11,7 @@ import usePermissionsStage from './stages/permissions'
import usePostApprovalStage from './stages/post-approval'
import useReReviewStage from './stages/re-review'
import useReuploadsStage from './stages/reupload'
-import useOtherRulesStage from './stages/other-rules'
+import useRulesStage from './stages/rules'
import useStatusAlertsStage from './stages/status-alerts'
import useSummaryStage from './stages/summary'
import useTitleSlugStage from './stages/title-slug'
@@ -22,8 +20,8 @@ import useVersionsStage from './stages/versions'
export function useStages(
globalState: Ref>>,
-): StageNodeBuilder[] {
- const mainStages: StageNodeBuilder[] = [
+): StageNode[] {
+ const mainStages: StageNode[] = [
usePostApprovalStage(),
useUndefinedProjectStage(),
useReReviewStage(),
@@ -38,12 +36,7 @@ export function useStages(
useVersionsStage(),
useReuploadsStage(),
usePermissionsStage(),
- useOtherRulesStage(),
+ useRulesStage(),
]
- provide(STAGES_KEY, ref(mainStages))
return [...mainStages, useStatusAlertsStage(mainStages, globalState)]
}
-
-export const stages: ReadonlyArray = []
-
-export default group()
diff --git a/packages/moderation/src/data/keybinds.ts b/packages/moderation/src/data/keybinds.ts
index d4eb0fab10..d6f7813b49 100644
--- a/packages/moderation/src/data/keybinds.ts
+++ b/packages/moderation/src/data/keybinds.ts
@@ -1,6 +1,7 @@
-import type { KeybindListener } from '../types/keybinds'
import type { Labrinth } from '@modrinth/api-client'
+import type { KeybindListener } from '../types/keybinds'
+
const copyProjectLink = async (
project: Labrinth.Projects.v2.Project,
permalink: boolean,
@@ -32,7 +33,6 @@ const keybinds: { [id: string]: KeybindListener } = {
keybind: 'ArrowRight',
description: 'Go to next stage',
scope: 'checklist',
- enabled: (ctx) => !ctx.state.isDone,
action: (ctx) => ctx.actions.tryGoNext(),
},
'previous-stage': {
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
index 4e4934805a..68f69b9e31 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
@@ -2,5 +2,3 @@
Per section 2.1 of %RULES%, your %PROJECT_DESCRIPTION_FLINK% should clearly inform the reader of the content, purpose, and appeal of your %PROJECT_TYPE%.
Currently, it looks like there are some missing details.
-
-%CUSTOM_ADVICE%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
new file mode 100644
index 0000000000..8498e5c58b
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
@@ -0,0 +1,4 @@
+## Missing Dependencies
+
+Per section 5.6 of %RULES%, it is important that relevant dependencies be listed in the dependencies section of your project.
+Please ensure that all relevant dependencies are included in the Dependencies section of each version of your project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md
new file mode 100644
index 0000000000..a6a6a128d6
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md
@@ -0,0 +1 @@
+This project should have the following game version(s) selected: %GAME_VERSIONS%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
new file mode 100644
index 0000000000..b2d18df43a
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
@@ -0,0 +1,5 @@
+## Game Version Metadata
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which Minecraft versions are selected.
+
+%CORRECT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md
new file mode 100644
index 0000000000..321e8f36aa
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md
@@ -0,0 +1 @@
+This project should have the following loader(s) selected: %LOADERS%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
new file mode 100644
index 0000000000..a1cf5e0f98
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
@@ -0,0 +1,5 @@
+## Loader Metadata
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which loaders are selected.
+
+%CORRECT%
diff --git a/packages/moderation/src/data/nags/links.ts b/packages/moderation/src/data/nags/links.ts
index a6df4d51f4..e83557824a 100644
--- a/packages/moderation/src/data/nags/links.ts
+++ b/packages/moderation/src/data/nags/links.ts
@@ -1,8 +1,7 @@
import { defineMessage, formatProjectTypeSentence, useVIntl } from '@modrinth/ui'
import type { Nag, NagContext } from '../../types/nags'
-import { licenseRequiresSource, licensesRequiringSource, notSourceAsDistributed } from '../../utils'
-import license from '../stages/license'
+import { licenseRequiresSource, notSourceAsDistributed } from '../../utils'
export const commonLinkDomains = {
source: [
diff --git a/packages/moderation/src/data/priorities.ts b/packages/moderation/src/data/priorities.ts
index 6aea35ea99..0df99942ee 100644
--- a/packages/moderation/src/data/priorities.ts
+++ b/packages/moderation/src/data/priorities.ts
@@ -8,4 +8,5 @@ export const Priorities = new (class extends Priority {
rejected = this.before()
withheld = this.before()
note = this.after()
+ tempLast = this.after()
})()
diff --git a/packages/moderation/src/data/stages/categories.tsx b/packages/moderation/src/data/stages/categories.tsx
index ea2154dbb8..46768def6f 100644
--- a/packages/moderation/src/data/stages/categories.tsx
+++ b/packages/moderation/src/data/stages/categories.tsx
@@ -36,7 +36,7 @@ export default function () {
),
group().children(
- toggle('inaccurate', 'Inaccurate').suggestedStatus('flagged').severity('low').message(),
+ toggle('inaccurate', 'Inaccurate').suggestedStatus('flagged').message(),
toggle('optimization-misused', 'Optimization')
.shown(
@@ -47,7 +47,6 @@ export default function () {
),
)
.suggestedStatus('flagged')
- .severity('low')
.rawMessage(optimizationMsg)
.fix(
fix().project((patch) => {
@@ -61,7 +60,6 @@ export default function () {
toggle('resolutions-misused', 'Resolutions')
.shown(computed(() => project.value.project_types.includes('resourcepack')))
.suggestedStatus('flagged')
- .severity('low')
.rawMessage(resolutionsMsg)
.fix(
fix().project((patch) => {
diff --git a/packages/moderation/src/data/stages/description.tsx b/packages/moderation/src/data/stages/description.tsx
index 3ca0cb1694..87ab2cf33e 100644
--- a/packages/moderation/src/data/stages/description.tsx
+++ b/packages/moderation/src/data/stages/description.tsx
@@ -15,24 +15,23 @@ export default function () {
'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892#2e15ee711bf080508042e70089dd787e',
)
.icon(LibraryIcon)
- .navigate('/')
+ .navigate()
.children(
group()
.title('Description Issues?')
.children(
toggle('insufficient', 'Insufficient')
.suggestedStatus('flagged')
- .severity('medium')
- .message('insufficient/header', (s) => ({ CUSTOM_ADVICE: s.custom?.explainer }))
+ .message('insufficient/header')
.children(
group()
.title('Why is this Description Insufficient?')
- .multiSelect('reason')
.children(
toggle('custom', 'Custom').children(
markdown('explainer')
.title('How can the author improve their description?')
- .required(),
+ .required()
+ .rawMessage((state) => `${state.value}\n\n`),
),
toggle('fork', 'Fork').message('piece/fork'),
toggle('unfinished', 'Unfinished').message('piece/unfinished'),
@@ -44,15 +43,13 @@ export default function () {
`insufficient/default/${project.value?.minecraft_java_server ? 'servers' : project.value?.project_types?.includes('modpack') ? 'packs' : 'projects'}`,
)
.rawMessage(async (state) => {
- const reasons = state?.reason instanceof Set ? state.reason : new Set()
- return SHOW_SPOILER_ADVICE.some((reason) => reasons.has(reason))
+ return SHOW_SPOILER_ADVICE.some((reason) => state?.[reason] === true)
? await md('checklist/messages/description/insufficient/piece/spoiler-guide')(state)
: ''
}),
toggle('non-english', 'Non-english')
.suggestedStatus('flagged')
- .severity('medium')
.message(() => `non-english${project.value.minecraft_java_server ? '-server' : ''}`)
.shown(
computed(() => {
@@ -63,25 +60,13 @@ export default function () {
}),
),
- toggle('headers-as-body', 'Headers as body text')
- .suggestedStatus('flagged')
- .severity('low')
- .message(),
+ toggle('headers-as-body', 'Headers as body text').suggestedStatus('flagged').message(),
- toggle('image-only', 'Image-only')
- .suggestedStatus('flagged')
- .severity('medium')
- .message(),
+ toggle('image-only', 'Image-only').suggestedStatus('flagged').message(),
- toggle('non-standard-text', 'Non-standard text')
- .suggestedStatus('flagged')
- .severity('medium')
- .message(),
+ toggle('non-standard-text', 'Non-standard text').suggestedStatus('flagged').message(),
- toggle('clarity', 'Unclear / Misleading')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('clarity', 'Unclear / Misleading').suggestedStatus('rejected').message(),
),
)
}
diff --git a/packages/moderation/src/data/stages/gallery.tsx b/packages/moderation/src/data/stages/gallery.tsx
index 2bfe4b1ca8..b2c86ab592 100644
--- a/packages/moderation/src/data/stages/gallery.tsx
+++ b/packages/moderation/src/data/stages/gallery.tsx
@@ -16,18 +16,14 @@ export default function () {
.navigate('/gallery')
.children(
group().children(
- toggle('insufficient', 'Insufficient').suggestedStatus('flagged').severity('low').message(),
+ toggle('insufficient', 'Insufficient').suggestedStatus('flagged').message(),
toggle('not-relevant', 'Not relevant')
.shown(computed(() => project.value.gallery.length > 0))
.suggestedStatus('flagged')
- .severity('low')
.message(),
- toggle('showcase-clarity', 'Showcase Clarity')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('showcase-clarity', 'Showcase Clarity').suggestedStatus('rejected').message(),
),
)
}
diff --git a/packages/moderation/src/data/stages/license.tsx b/packages/moderation/src/data/stages/license.tsx
index e595507dc6..3f4dc243b8 100644
--- a/packages/moderation/src/data/stages/license.tsx
+++ b/packages/moderation/src/data/stages/license.tsx
@@ -53,7 +53,6 @@ export default function () {
toggle('invalid-link', 'Invalid Link')
.shown(computed(() => !!project.value.license?.url))
.suggestedStatus('flagged')
- .severity('medium')
.message()
.children(check('custom-license', 'Invalid Link: Custom License').message())
.collect(),
@@ -61,12 +60,11 @@ export default function () {
toggle('no-source', 'No Source')
.shown(needSource)
.suggestedStatus('rejected')
- .severity('medium')
.rawMessage(async (state) => {
if (state.fork) return noSourceForkMsg(state)
return noSourceMsg(state)
})
- .children(check('fork', 'No Source: Fork').severity('high')),
+ .children(check('fork', 'No Source: Fork')),
),
)
}
diff --git a/packages/moderation/src/data/stages/links.tsx b/packages/moderation/src/data/stages/links.tsx
index 5110950ad8..0b480b6d40 100644
--- a/packages/moderation/src/data/stages/links.tsx
+++ b/packages/moderation/src/data/stages/links.tsx
@@ -3,15 +3,15 @@ import { injectProjectPageContext } from '@modrinth/ui'
import type { Ref } from 'vue'
import { computed } from 'vue'
-import { group, md, mdOptional, stage, toggle } from '../../types/node'
-import type { ChildEntry, GroupNodeBuilder } from '../../types/node'
import { promptSourceRequired } from '../..'
+import type { ChildEntry, GroupNode } from '../../types/node'
+import { group, md, mdOptional, stage, toggle } from '../../types/node'
export default function () {
const { projectV3: project } = injectProjectPageContext()
const linkNames: Record = {}
- type LinkSectionBuilder = GroupNodeBuilder & {
+ type LinkSectionBuilder = GroupNode & {
children(...extras: ChildEntry[]): LinkSectionBuilder
label(badge: Ref): LinkSectionBuilder
}
@@ -75,7 +75,6 @@ export default function () {
.navigate('/settings/links')
.shown(computed(() => Object.keys(project.value.link_urls).length > 0))
.suggestedStatus('flagged')
- .severity('low')
.rawMessage(async (state) => {
const sections = Object.entries(state).filter(
([, s]) => s && typeof s === 'object' && !(s instanceof Set),
diff --git a/packages/moderation/src/data/stages/metadata.tsx b/packages/moderation/src/data/stages/metadata.tsx
index 4aeda58cbf..9817081489 100644
--- a/packages/moderation/src/data/stages/metadata.tsx
+++ b/packages/moderation/src/data/stages/metadata.tsx
@@ -3,7 +3,16 @@ import { DatabaseIcon } from '@modrinth/assets'
import { ENVIRONMENTS_COPY, injectProjectPageContext, injectTags } from '@modrinth/ui'
import { computed } from 'vue'
-import { dropdown, fix, group, md, option, stage, toggle } from '../../types/node'
+import {
+ appComponent as _appComponent,
+ dropdown,
+ fix,
+ group,
+ md,
+ option,
+ stage,
+ toggle,
+} from '../../types/node'
import { requiresEnvironmentInfo } from '../../utils'
const loaderLabels: Record = {
@@ -13,7 +22,7 @@ const loaderLabels: Record = {
resourcepack: 'Resource Pack',
}
-function formatLoaderLabel(id: string): string {
+function _formatLoaderLabel(id: string): string {
return (
loaderLabels[id] ??
id
@@ -25,7 +34,11 @@ function formatLoaderLabel(id: string): string {
export default function () {
const { projectV3: project } = injectProjectPageContext()
- const { loaders } = injectTags()
+ const { loaders: _loaders, gameVersions: _gameVersions } = injectTags()
+
+ const _currentGameVersions = computed(
+ () => (project.value.game_versions as string[] | undefined) ?? [],
+ )
return (
stage('metadata', 'Metadata')
@@ -64,7 +77,6 @@ export default function () {
toggle('environment', 'Environment')
.shown(computed(() => requiresEnvironmentInfo(project.value.project_types)))
.suggestedStatus('flagged')
- .severity('low')
.rawMessage(async (state) => {
const correctEnvironment = state?.['correct-environment'] as string | undefined
@@ -94,7 +106,7 @@ export default function () {
.title('Correct Environment')
.children(
dropdown('correct-environment')
- .children(
+ .options(
...(Object.keys(ENVIRONMENTS_COPY) as Labrinth.Projects.v3.Environment[])
.filter((id) => id !== 'unknown')
.map((id) => option(id, ENVIRONMENTS_COPY[id].title.defaultMessage ?? id)),
@@ -103,67 +115,96 @@ export default function () {
.none('Unknown'),
),
),
- // TODO: chyz, fix pls (make into single set of buttons where current loaders start selected and non current start non selected
- // toggle('loader', `Loader${project.value.loaders.length > 1 ? 's' : ''}`).children(
- // group()
- // .title('Loader Issues?')
- // .action(
- // action()
- // .suggestedStatus('flagged')
- // .severity('medium')
- // .message(async (state) => {
- // //TODO: chyz
- // //TODO: coolbot this one is a bit of a doozy
- // const header = await md('checklist/messages/metadata/loader/incorrect')(state)
- // const selected = state.loaders
- // if (selected instanceof Set && selected.size > 0) {
- // const list = [...selected]
- // .map((id) => `- ${formatLoaderLabel(id)}`)
- // .join('\n')
- // return `${header}\n${list}`
- // }
- // return header
- // }),
- // )
- // .children(
- // toggle('incorrect', 'Incorrect').children(
- // group()
- // .title('Incorrect Loaders')
- // .multiSelect('loaders')
- // .children(
- // ...project.value.loaders.map((id) => option(id, formatLoaderLabel(id))),
- // ),
- // ),
- // TODO: chyz, this should be the same interface as incorrect, as a corrections scheme, with selected loaders default on.
- // toggle('missing', 'Missing').children(
- // group()
- // .title('Missing Loaders')
- // .multiSelect('loaders')
- // .children(
- // ...(() => {
- // //TODO: chyz maybe this can be done better
- // // (plugin loaders and datapack are marked as valid for mods which makes this suck)
- // const existingTypes = new Set(
- // loaders.value
- // .filter((l) => project.value.loaders.includes(l.name))
- // .flatMap((l) => l.supported_project_types),
- // )
- // const referenceTypes =
- // existingTypes.size > 0
- // ? existingTypes
- // : new Set(project.value.project_types)
- // return loaders.value
- // .filter(
- // (loader) =>
- // loader.supported_project_types.every((t) => referenceTypes.has(t)) &&
- // !project.value.loaders.includes(loader.name),
- // )
- // .map((loader) => option(loader.name, formatLoaderLabel(loader.name)))
- // })(),
- // )/
- // ),
- // ),
- // ),
+
+ toggle('dependencies', 'Dependencies').suggestedStatus('flagged').message(),
+
+ // toggle('loader', 'Loaders (WIP)')
+ // .suggestedStatus('flagged')
+ // .rawMessage(async (state) => {
+ // const selected =
+ // state.loaders instanceof Set ? state.loaders : new Set(project.value.loaders)
+ // const current = new Set(project.value.loaders)
+ // const isCorrected =
+ // selected.size !== current.size || [...selected].some((id) => !current.has(id))
+ //
+ // let correct = ''
+ // if (isCorrected) {
+ // const list = [...selected].map((id) => formatLoaderLabel(id)).join(', ')
+ // correct = await md('checklist/messages/metadata/loader/correction', () => ({
+ // LOADERS: list || 'none',
+ // }))(state)
+ // }
+ //
+ // return md('checklist/messages/metadata/loader/inaccurate', () => ({
+ // CORRECT: correct,
+ // }))(state)
+ // })
+ // .fix(
+ // fix().project((patch, state) => {
+ // const selected =
+ // state.loaders instanceof Set ? state.loaders : new Set(project.value.loaders)
+ // const next = [...selected]
+ // const current = project.value.loaders
+ // if (next.length === current.length && next.every((id) => current.includes(id)))
+ // return
+ // patch.loaders = next
+ // }),
+ // )
+ // .children(
+ // appComponent('loaders', 'loader-picker')
+ // .valueKind('set')
+ // .initial(() => new Set(project.value.loaders))
+ // .props((ctx) => ({
+ // loaders: loaders.value,
+ // toggleLoader: ctx.toggleSetValue,
+ // })),
+ // ),
+ //
+ // toggle('game-version', 'Game Versions (WIP)')
+ // .suggestedStatus('flagged')
+ // .rawMessage(async (state) => {
+ // const selected =
+ // state['game-versions'] instanceof Set
+ // ? state['game-versions']
+ // : new Set(currentGameVersions.value)
+ // const current = new Set(currentGameVersions.value)
+ // const isCorrected =
+ // selected.size !== current.size || [...selected].some((id) => !current.has(id))
+ //
+ // let correct = ''
+ // if (isCorrected) {
+ // const list = [...selected].join(', ')
+ // correct = await md('checklist/messages/metadata/game-version/correction', () => ({
+ // GAME_VERSIONS: list || 'none',
+ // }))(state)
+ // }
+ //
+ // return md('checklist/messages/metadata/game-version/inaccurate', () => ({
+ // CORRECT: correct,
+ // }))(state)
+ // })
+ // .fix(
+ // fix().project((patch, state) => {
+ // const selected =
+ // state['game-versions'] instanceof Set
+ // ? state['game-versions']
+ // : new Set(currentGameVersions.value)
+ // const next = [...selected]
+ // const current = currentGameVersions.value
+ // if (next.length === current.length && next.every((id) => current.includes(id)))
+ // return
+ // patch.game_versions = next
+ // }),
+ // )
+ // .children(
+ // appComponent('game-versions', 'game-version-picker')
+ // .valueKind('set')
+ // .initial(() => new Set(currentGameVersions.value))
+ // .props(() => ({
+ // gameVersions: gameVersions.value,
+ // noHeader: true,
+ // })),
+ // ),
),
)
)
diff --git a/packages/moderation/src/data/stages/permissions.tsx b/packages/moderation/src/data/stages/permissions.tsx
index 4baad99d57..45d5ba3889 100644
--- a/packages/moderation/src/data/stages/permissions.tsx
+++ b/packages/moderation/src/data/stages/permissions.tsx
@@ -1,11 +1,30 @@
+import type { Labrinth } from '@modrinth/api-client'
import { SignatureIcon } from '@modrinth/assets'
-import { injectProjectPageContext } from '@modrinth/ui'
+import { injectModrinthClient, injectProjectPageContext } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
import { computed } from 'vue'
import { group, stage, toggle } from '../../types/node'
+function isResolved(attributionGroup: Labrinth.Attribution.Internal.AttributionGroup): boolean {
+ const attribution = attributionGroup.attribution
+ if (!attribution) return false
+ if (attribution.kind === 'globally_allowed') return true
+ return attribution.moderation_status?.kind === 'approved'
+}
+
export default function () {
const { projectV3: project } = injectProjectPageContext()
+ const { labrinth } = injectModrinthClient()
+
+ const { data: attributionData } = useQuery({
+ queryKey: ['project-attribution', project.value.id],
+ queryFn: () => labrinth.attribution_internal.listProjectAttribution(project.value.id),
+ })
+
+ const unresolvedCount = computed(
+ () => (attributionData.value ?? []).filter((g) => !isResolved(g)).length,
+ )
return stage('permissions', 'Modpack Permissions')
.hint("Does this project's external content have any issues?")
@@ -16,30 +35,24 @@ export default function () {
computed(
() =>
(project.value.project_types?.includes('modpack') ?? false) &&
- !project.value.minecraft_server,
+ !project.value.minecraft_server &&
+ unresolvedCount.value > 0,
),
)
+ .sticky()
.children(
group().children(
- toggle('invalid-permissions', 'Invalid permissions')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('invalid-permissions', 'Invalid permissions').suggestedStatus('rejected').message(),
toggle('prohibited-external-content', 'Prohibited externals')
.suggestedStatus('rejected')
- .severity('high')
.message(),
- toggle('missing-permissions', 'Missing permissions')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('missing-permissions', 'Missing permissions').suggestedStatus('rejected').message(),
toggle('non-commercial-external-content', 'Non-commercial externals')
.shown(computed(() => project.value.monetization_status === 'monetized'))
.suggestedStatus('rejected')
- .severity('high')
.message(),
),
)
diff --git a/packages/moderation/src/data/stages/post-approval.tsx b/packages/moderation/src/data/stages/post-approval.tsx
index 7ed9d3ecc4..170adecf78 100644
--- a/packages/moderation/src/data/stages/post-approval.tsx
+++ b/packages/moderation/src/data/stages/post-approval.tsx
@@ -3,6 +3,7 @@ import { injectProjectPageContext } from '@modrinth/ui'
import { computed } from 'vue'
import { group, stage, text, toggle } from '../../types/node'
+import { Priorities } from '../priorities.ts'
//TODO chyz
//TODO coolbot needs discussion
@@ -20,15 +21,15 @@ export default function () {
group().children(
toggle('issue-warning', 'Issue warning')
.suggestedStatus('approved')
- .severity('low')
- .message(),
+ .message()
+ .priority(Priorities.tempLast),
toggle('missed-deadline', 'Missed due date')
.suggestedStatus('flagged')
- .severity('high')
- .message(undefined, (state) => ({
+ .message((state) => ({
STATUS: state.status,
}))
+ .priority(Priorities.tempLast)
.children(
//TODO: chyz this shouldn't need to be provided by moderator
text('status').title('What status is the project being set to?').required(),
@@ -36,35 +37,31 @@ export default function () {
toggle('metadata-issue', 'Incorrect metadata')
.suggestedStatus('approved')
- .severity('low')
.message()
.children(
toggle('dependencies', 'Missing Dependencies')
- .severity('low')
- .message(undefined, (state) => ({
- DEPENDENCY_NAME: state['dependency-name'],
- DEPENDENCY_LINK: state['dependency-link'],
+ .message((state) => ({
+ DEPENDENCY_NAME: state['name'],
+ DEPENDENCY_LINK: state['link'],
}))
.children(
- text('dependency-name').title('Dependency name').required(),
- text('dependency-link').title('Dependency link').required(),
+ text('name').title('Dependency name').required(),
+ text('link').title('Dependency link').required(),
),
toggle('mc-versions', 'Game versions')
- .severity('low')
- .message(undefined, (state) => ({
+ .message((state) => ({
SPECIFICS: state.specifics,
}))
.children(text('specifics').title('More details about the game versions issue?')),
toggle('loaders', 'Loaders')
- .severity('low')
- .message(undefined, (state) => ({
+ .message((state) => ({
SPECIFICS: state.specifics,
}))
.children(text('specifics').title('More details about the loaders issue?')),
- toggle('license', 'Inconsistent Licensing').severity('low').message(),
+ toggle('license', 'Inconsistent Licensing').message(),
)
.collect(),
),
diff --git a/packages/moderation/src/data/stages/re-review.tsx b/packages/moderation/src/data/stages/re-review.tsx
index 0d1fd7d00e..0a9d0a4479 100644
--- a/packages/moderation/src/data/stages/re-review.tsx
+++ b/packages/moderation/src/data/stages/re-review.tsx
@@ -32,13 +32,9 @@ export default function () {
group().children(
toggle('ignored', 'Yes')
.suggestedStatus('flagged')
- .severity('medium')
.message()
.children(
- toggle('warning', 'Multiple times in a row')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('warning', 'Multiple times in a row').suggestedStatus('rejected').message(),
)
.collect(),
),
diff --git a/packages/moderation/src/data/stages/reupload.tsx b/packages/moderation/src/data/stages/reupload.tsx
index aa7906e97e..002f284072 100644
--- a/packages/moderation/src/data/stages/reupload.tsx
+++ b/packages/moderation/src/data/stages/reupload.tsx
@@ -20,14 +20,13 @@ export default function () {
'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892#2e35ee711bf080d1a0a2cda3ff2ce997',
)
.icon(CopyrightIcon)
- .navigate('/')
+ .navigate()
.children(
group().children(
toggle('reupload', 'Re-upload')
.shown(computed(() => !project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('high')
- .message(undefined, (state) => ({
+ .message((state) => ({
ORIGINAL_PROJECT: state['original-project'],
ORIGINAL_AUTHOR: state['original-author'],
}))
@@ -39,25 +38,19 @@ export default function () {
toggle('unclear-fork', 'Unclear Fork')
.shown(computed(() => !project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('high')
.message(),
toggle('insufficient-fork', 'Insufficient Fork')
.shown(computed(() => !project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('high')
.message(),
- toggle('request-proof', 'Proof of permissions')
- .suggestedStatus('rejected')
- .severity('high')
- .message(),
+ toggle('request-proof', 'Proof of permissions').suggestedStatus('rejected').message(),
toggle('identity-verification', 'Verify Identity')
.shown(computed(() => !project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('high')
- .message(undefined, (state) => ({
+ .message((state) => ({
PLATFORM: state.platform,
}))
.children(text('platform').title('Where else can the project be found?').required()),
@@ -65,8 +58,7 @@ export default function () {
toggle('identity-verification-server', 'Verify Identity')
.shown(computed(() => !!project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('high')
- .message(undefined, (state) => ({
+ .message((state) => ({
CONTACT: state.contact,
}))
.children(text('contact').title('Known public contact method').required()),
@@ -74,17 +66,15 @@ export default function () {
toggle('request-proof-server', 'Reuploaded pack')
.shown(isServerModpack)
.suggestedStatus('rejected')
- .severity('high')
.message(),
toggle('custom-pack-verification', 'Override verification')
.shown(isServerModpack)
.suggestedStatus('rejected')
- .severity('high')
.message()
.children(
check('list', 'List overrides?')
- .message(undefined, (state) => ({
+ .message((state) => ({
OVERRIDES: state.overrides,
}))
.children(markdown('overrides').title('Add list of overrides.')),
@@ -94,8 +84,7 @@ export default function () {
toggle('custom-pack-prohibited', 'Forbidden Overrides')
.shown(isServerModpack)
.suggestedStatus('rejected')
- .severity('high')
- .message(undefined, (state) => ({
+ .message((state) => ({
OVERRIDES: state.overrides,
}))
.children(markdown('overrides').title('Forbidden overrides list').required()),
diff --git a/packages/moderation/src/data/stages/other-rules.tsx b/packages/moderation/src/data/stages/rules.tsx
similarity index 50%
rename from packages/moderation/src/data/stages/other-rules.tsx
rename to packages/moderation/src/data/stages/rules.tsx
index 484d158c86..75f2de6a7b 100644
--- a/packages/moderation/src/data/stages/other-rules.tsx
+++ b/packages/moderation/src/data/stages/rules.tsx
@@ -2,9 +2,8 @@ import { ListBulletedIcon } from '@modrinth/assets'
import { injectProjectPageContext } from '@modrinth/ui'
import { computed } from 'vue'
-import { group, markdown, option, stage, toggle } from '../../types/node'
+import { group, markdown, stage, toggle } from '../../types/node'
-//TODO: coolbot have fun :3
export default function () {
const { projectV3: project } = injectProjectPageContext()
@@ -20,61 +19,49 @@ export default function () {
toggle('paid-access-server', 'Paid access server')
.shown(computed(() => !!project.value.minecraft_server))
.suggestedStatus('rejected')
- .severity('critical')
.message(),
- // TODO: chyz, the lists built by these message have empty line gaps.
toggle('prohibited-content', 'Prohibited Content')
.suggestedStatus('rejected')
- .severity('critical')
.message('prohibited-content-header')
.collect()
.children(
group()
- .multiSelect('options')
.title('Which Prohibited Content rules does this project violate?')
.children(
- option('objectionable', 'Objectionable').message(),
- option('discriminatory', 'Discriminatory or Explicit').message(),
- option('ip-infringement', 'IP Infringement').message(),
- option('legal-rights', 'Rights Violation').message(),
- option('illegal-activity', 'Illegal Activity').message(),
- option('harmful', 'Harmful or Deceptive').message(),
- option('misleading', 'Misleading claims').message(),
- option('impersonation', 'Impersonation').message(),
- option('false-endorsement', 'False Endorsement').message(),
- option('profanity', 'Profanity').message(),
- option('undisclosed-upload', 'Undisclosed Data Upload').message(),
- option('mojang-bypass', 'Mojang Bypass').message(),
+ toggle('objectionable', 'Objectionable').message(),
+ toggle('discriminatory', 'Discriminatory or Explicit').message(),
+ toggle('ip-infringement', 'IP Infringement').message(),
+ toggle('legal-rights', 'Rights Violation').message(),
+ toggle('illegal-activity', 'Illegal Activity').message(),
+ toggle('harmful', 'Harmful or Deceptive').message(),
+ toggle('misleading', 'Misleading claims').message(),
+ toggle('impersonation', 'Impersonation').message(),
+ toggle('false-endorsement', 'False Endorsement').message(),
+ toggle('profanity', 'Profanity').message(),
+ toggle('undisclosed-upload', 'Undisclosed Data Upload').message(),
+ toggle('mojang-bypass', 'Mojang Bypass').message(),
),
),
- toggle('cheat-or-hack-advertising', 'Hacks')
- .suggestedStatus('rejected')
- .severity('critical')
- .message(),
+ toggle('cheat-or-hack-advertising', 'Hacks').suggestedStatus('rejected').message(),
- toggle('server-side-opt-out', 'Opt-out')
- .suggestedStatus('flagged')
- .severity('high')
- .message(),
+ toggle('server-side-opt-out', 'Opt-out').suggestedStatus('flagged').message(),
toggle('server-side-opt-in', 'Opt-in')
.suggestedStatus('flagged')
- .severity('high')
.message('server-side-opt-in-header')
.collect()
.children(
group()
- .multiSelect('options')
.title('Which features require a Server-side Opt-in?')
.children(
- option('x-ray', 'X-ray').message(),
- option('aim-bot', 'Aim Assist').message(),
- option('movement', 'Movement').message(),
- option('pvp', 'PvP').message(),
- option('hiding-mods', 'Anti 3.x').message(),
- option('item-duplication', 'Dupe').message(),
+ toggle('x-ray', 'X-ray').message(),
+ toggle('aim-bot', 'Aim Assist').message(),
+ toggle('movement', 'Movement').message(),
+ toggle('pvp', 'PvP').message(),
+ toggle('hiding-mods', 'Anti 3.x').message(),
+ toggle('item-duplication', 'Dupe').message(),
),
),
@@ -88,14 +75,11 @@ export default function () {
),
)
.suggestedStatus('flagged')
- .severity('low')
.message(),
toggle('rule-breaking-other', 'Other')
- // TODO: chyz, the required asterisk is on a separate line
.suggestedStatus('rejected')
- .severity('critical')
- .message(undefined, (state) => ({ MESSAGE: state.message }))
+ .message((state) => ({ MESSAGE: state.message }))
.children(
markdown('message').title('Explain how it infringes on content rules.').required(),
),
diff --git a/packages/moderation/src/data/stages/status-alerts.tsx b/packages/moderation/src/data/stages/status-alerts.tsx
index af957987c6..2c61a176cc 100644
--- a/packages/moderation/src/data/stages/status-alerts.tsx
+++ b/packages/moderation/src/data/stages/status-alerts.tsx
@@ -3,9 +3,9 @@ import { injectProjectPageContext } from '@modrinth/ui'
import type { Ref } from 'vue'
import { computed } from 'vue'
-import type { NodeState, StageNodeBuilder } from '../../types/node'
+import type { AnyNode, ChildNode, NodeState, StageNode } from '../../types/node'
import {
- NodeBuilder,
+ externalGroup,
getBooleanChildState,
group,
isNodeActive,
@@ -18,7 +18,7 @@ import {
import { Priorities } from '../priorities.ts'
export default function (
- mainStages: StageNodeBuilder[],
+ mainStages: StageNode[],
globalState: Ref>>,
) {
const { projectV3: project } = injectProjectPageContext()
@@ -47,23 +47,26 @@ export default function (
.priority(Priorities.alerts)
.applyFixes()
.children(
- computed(() => {
- const fixNodes: NodeBuilder[] = []
+ computed(() => {
+ const fixGroups: ChildNode[] = []
walkNodes(
[group().children(...mainStages)],
(globalState.value ?? {}) as unknown as Record,
- (node, nodeState) => {
- if (!node._fixes.length) return
+ (node, nodeState, _localState, path) => {
+ if (!('_fixes' in node) || !(node as { _fixes: unknown[] })._fixes.length) return
if (!isNodeActive(node, nodeState)) return
- const childState = getBooleanChildState(nodeState)
- fixNodes.push(
- ...resolveChildren(node, childState).filter(
- (c): c is NodeBuilder => c instanceof NodeBuilder,
- ),
+ const children = resolveChildren(
+ node as never,
+ getBooleanChildState(nodeState),
+ ).filter(
+ (c): c is Exclude unknown)> =>
+ typeof c === 'object' && c !== null,
)
+ if (children.length === 0) return
+ fixGroups.push(externalGroup(path).children(...children))
},
)
- return fixNodes.length > 0 ? group().children(...fixNodes) : null
+ return fixGroups.length > 0 ? group().children(...fixGroups) : null
}),
),
diff --git a/packages/moderation/src/data/stages/summary.tsx b/packages/moderation/src/data/stages/summary.tsx
index 050c7451c8..44b156b807 100644
--- a/packages/moderation/src/data/stages/summary.tsx
+++ b/packages/moderation/src/data/stages/summary.tsx
@@ -31,20 +31,17 @@ export default function () {
toggle('insufficient', 'Insufficient')
.enabled((state) => !state['repeat-title'])
.suggestedStatus('flagged')
- .severity('low')
.message(),
toggle('repeat-title', 'Repeat of Title')
.enabled((state) => !state.insufficient)
.suggestedStatus('flagged')
- .severity('low')
.message(),
- toggle('formatting', 'Formatting').suggestedStatus('flagged').severity('low').message(),
+ toggle('formatting', 'Formatting').suggestedStatus('flagged').message(),
toggle('non-english', 'Non-english')
.suggestedStatus('flagged')
- .severity('medium')
.message()
.shown(
computed(() => {
@@ -62,7 +59,6 @@ export default function () {
toggle('repeat-ip', 'Repeat of IP')
.shown(computed(() => !!project.value?.minecraft_server))
.suggestedStatus('flagged')
- .severity('medium')
.message(),
),
)
diff --git a/packages/moderation/src/data/stages/title-slug.tsx b/packages/moderation/src/data/stages/title-slug.tsx
index 8844416aa9..3a021fa7f5 100644
--- a/packages/moderation/src/data/stages/title-slug.tsx
+++ b/packages/moderation/src/data/stages/title-slug.tsx
@@ -5,18 +5,23 @@ import {
TagCategoryRefreshCcwIcon,
TagCategoryWandSparklesIcon,
UserPlusIcon,
+ WrenchIcon,
} from '@modrinth/assets'
-import { Alert, injectModrinthClient, injectProjectPageContext } from '@modrinth/ui'
+import {
+ Alert,
+ injectModrinthClient,
+ injectProjectPageContext,
+ ProjectStatusLink,
+} from '@modrinth/ui'
import { useQueryClient } from '@tanstack/vue-query'
import { computed, ref, watch } from 'vue'
-import { md, type NodeState } from '../../types/node'
-import { button, fix, group, option, stage, text, toggle } from '../../types/node'
+import { check, fix, group, md, stage, text, toggle } from '../../types/node'
const STALE_TIME = 1000 * 60 * 5
type AutoSlugStatus = 'loading' | 'available' | 'unavailable'
-type SlugValidation = 'checking' | 'available' | 'unchanged' | 'taken' | null
+type SlugValidation = 'checking' | 'available' | 'unchanged' | 'taken' | 'empty' | 'invalid' | null
//TODO: make this not a copy of frontend/src/utils/slugs.generateUrlSlug
// (as in move the other one so we can use it here)
@@ -46,12 +51,6 @@ export default function () {
const slugValidation = ref(null)
let slugDebounceTimer: ReturnType | undefined
- function currentSlug(state: Record) {
- return (
- (state['correct-slug'] as string | undefined) ?? resolvedAutoSlug.value ?? project.value.slug
- )
- }
-
async function checkSlugTaken(slug: string): Promise {
try {
return await queryClient.fetchQuery({
@@ -66,8 +65,13 @@ export default function () {
}
const SlugStatus = () => {
- const v = slugValidation.value
- if (v === null) return null
+ const v =
+ slugValidation.value ??
+ (autoSlugStatus.value === 'loading'
+ ? 'checking'
+ : autoSlugStatus.value === 'unavailable'
+ ? 'taken'
+ : 'available')
if (v === 'checking')
return (
@@ -86,19 +90,25 @@ export default function () {
Slug is available
)
+ if (v === 'empty')
+ return (
+
+ Slug cannot be empty
+
+ )
+ if (v === 'invalid')
+ return (
+
+ Invalid Slug
+
+ )
const by = correctSlugConflict.value
return (
- Slug taken
- {by ? (
- <>
- {' by '}
-
- {by.name}
-
- {` (${by.status})`}
-
- ) : null}
+
+ Slug taken
+ {by ?
: null}
+