From 17f00e6feac694fc2353a650c7f25c8ce226a2be Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:21:39 -0800
Subject: [PATCH] Fix moderation queue, moderation status card when approved,
 and invalid datapack packages (#907)

* Fool behavior

* Add leading underscore to packaged datapack package if it starts with a number

* Hide mod status card for all approved statuses without mod messages

* Fix project id sanitization
---
 components/ui/ModalModeration.vue | 10 +++++++---
 pages/_type/_id.vue               |  4 +---
 pages/moderation.vue              |  4 ++--
 plugins/fileUtils.js              | 12 ++++++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/components/ui/ModalModeration.vue b/components/ui/ModalModeration.vue
index 48c1764dd..0f980079c 100644
--- a/components/ui/ModalModeration.vue
+++ b/components/ui/ModalModeration.vue
@@ -133,10 +133,10 @@ export default {
           this.$defaultHeaders()
         )
 
+        this.$refs.modal.hide()
         if (this.onClose !== null) {
           this.onClose()
         }
-        this.$refs.modal.hide()
       } catch (err) {
         this.$notify({
           group: 'main',
@@ -151,11 +151,15 @@ export default {
     show() {
       this.$refs.modal.show()
       this.moderationMessage =
-        this.project && this.project.moderator_message.message
+        this.project &&
+        this.project.moderator_message &&
+        this.project.moderator_message.message
           ? this.project.moderator_message.message
           : ''
       this.moderationMessageBody =
-        this.project && this.project.moderator_message.body
+        this.project &&
+        this.project.moderator_message &&
+        this.project.moderator_message.body
           ? this.project.moderator_message.body
           : ''
     },
diff --git a/pages/_type/_id.vue b/pages/_type/_id.vue
index 625ede9b4..e735000a3 100644
--- a/pages/_type/_id.vue
+++ b/pages/_type/_id.vue
@@ -280,9 +280,7 @@
         <div
           v-if="
             currentMember &&
-            ((project.status !== 'approved' &&
-              project.status !== 'unlisted' &&
-              project.status !== 'draft' &&
+            ((!$tag.approvedStatuses.includes(project.status) &&
               project.status !== 'processing') ||
               (project.moderator_message &&
                 (project.moderator_message.message ||
diff --git a/pages/moderation.vue b/pages/moderation.vue
index 7b96e26d1..b84fb52db 100644
--- a/pages/moderation.vue
+++ b/pages/moderation.vue
@@ -269,10 +269,10 @@ export default {
     },
     onModalClose() {
       this.projects.splice(
-        this.projects.findIndex((x) => this.project.id === x.id),
+        this.projects.findIndex((x) => this.currentProject.id === x.id),
         1
       )
-      this.project = null
+      this.currentProject = null
     },
     async deleteReport(index) {
       this.$nuxt.$loading.start()
diff --git a/plugins/fileUtils.js b/plugins/fileUtils.js
index 8b930ae9a..16373f074 100644
--- a/plugins/fileUtils.js
+++ b/plugins/fileUtils.js
@@ -514,12 +514,20 @@ export const createDataPackVersion = async function (
       binary += String.fromCharCode(classFile[i])
     }
 
+    let sanitizedId = project.id
+
+    if (project.id.match(/^(\d+)/g)) {
+      sanitizedId = '_' + sanitizedId
+    }
+
+    sanitizedId = sanitizedId.substring(0, 8)
+
     binary = binary
       .replace(
         String.fromCharCode(32) + 'needs1to1be1changed1modrinth1mod',
         String.fromCharCode(newSlug.length) + newSlug
       )
-      .replace('/wrappera/', `/${project.id.substring(0, 8)}/`)
+      .replace('/wrappera/', `/${sanitizedId}/`)
 
     const newArr = []
     for (let i = 0; i < binary.length; i++) {
@@ -527,7 +535,7 @@ export const createDataPackVersion = async function (
     }
 
     primaryZipReader.file(
-      `com/modrinth/${project.id.substring(0, 8)}/ModrinthWrapper.class`,
+      `com/modrinth/${sanitizedId}/ModrinthWrapper.class`,
       new Uint8Array(newArr)
     )
   }