From 544aba53dc78b67fb91f538776ca8478a1608bff Mon Sep 17 00:00:00 2001
From: triphora <emmaffle@modrinth.com>
Date: Sat, 21 Jan 2023 16:02:11 -0500
Subject: [PATCH] Miscellaneous fixes relating to statuses, et al (#920)

---
 .eslintrc.js                                 |   1 +
 components/ui/ModalReport.vue                |   6 +
 components/ui/ProjectPublishingChecklist.vue |  43 ++++-
 layouts/default.vue                          |  10 +-
 layouts/error.vue                            |   2 +-
 pages/_type/_id.vue                          | 157 +++++--------------
 pages/_type/_id/settings/members.vue         |   7 +-
 pages/legal/rules.vue                        |   3 +-
 pages/user/_id.vue                           |   6 +-
 store/tag.js                                 |   2 +
 10 files changed, 101 insertions(+), 136 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0c004c46..a2130cb1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -17,5 +17,6 @@ module.exports = {
   rules: {
     'no-console': 'off',
     'vue/no-v-html': 'off',
+    'import/no-named-as-default': 'off',
   },
 }
diff --git a/components/ui/ModalReport.vue b/components/ui/ModalReport.vue
index b78b48d4..ad5dcef7 100644
--- a/components/ui/ModalReport.vue
+++ b/components/ui/ModalReport.vue
@@ -10,6 +10,12 @@
           <nuxt-link to="/legal/rules">Rules</nuxt-link>. Rest assured, we’ll
           keep your identifying information private.
         </p>
+        <p v-if="itemType === 'project' || itemType === 'version'">
+          Please <strong>do not</strong> use this to report bugs with the
+          project itself. This form is only for submitting a report to Modrinth
+          staff. If the project has an Issues link or a Discord invite, consider
+          reporting it there.
+        </p>
       </div>
       <label class="report-label" for="report-type">
         <span>
diff --git a/components/ui/ProjectPublishingChecklist.vue b/components/ui/ProjectPublishingChecklist.vue
index 7817ffd4..b787ba46 100644
--- a/components/ui/ProjectPublishingChecklist.vue
+++ b/components/ui/ProjectPublishingChecklist.vue
@@ -4,7 +4,8 @@
       $auth.user &&
       currentMember &&
       nags.filter((x) => x.condition).length > 0 &&
-      project.status === 'draft'
+      (project.status === 'draft' ||
+        $tag.rejectedStatuses.includes(project.status))
     "
     class="author-actions universal-card"
   >
@@ -63,6 +64,16 @@
           />{{ nag.title }}</span
         >
         {{ nag.description }}
+        <Checkbox
+          v-if="
+            nag.status === 'review' &&
+            project.moderator_message &&
+            $tag.rejectedStatuses.includes(project.status)
+          "
+          v-model="acknowledgedMessage"
+        >
+          I acknowledge that I have addressed the staff's message on the sidebar
+        </Checkbox>
         <NuxtLink
           v-if="nag.link"
           :class="{ invisible: nag.link.hide }"
@@ -99,10 +110,12 @@ import RequiredIcon from '~/assets/images/utils/asterisk.svg?inline'
 import SuggestionIcon from '~/assets/images/utils/lightbulb.svg?inline'
 import ModerationIcon from '~/assets/images/sidebar/admin.svg?inline'
 import SendIcon from '~/assets/images/utils/send.svg?inline'
+import Checkbox from '~/components/ui/Checkbox'
 
 export default {
   name: 'ProjectPublishingChecklist',
   components: {
+    Checkbox,
     ChevronRightIcon,
     DropdownIcon,
     CheckIcon,
@@ -163,6 +176,11 @@ export default {
       },
     },
   },
+  data() {
+    return {
+      acknowledgedMessage: !this.project.moderator_message,
+    }
+  },
   computed: {
     featuredGalleryImage() {
       return this.project.gallery.find((img) => img.featured)
@@ -290,7 +308,8 @@ export default {
           },
         },
         {
-          condition: this.project.status === 'draft',
+          hide: this.project.status !== 'draft',
+          condition: true,
           title: 'Submit for review',
           id: 'submit-for-review',
           description:
@@ -305,6 +324,25 @@ export default {
                 .length > 0,
           },
         },
+        {
+          hide: !this.$tag.rejectedStatuses.includes(this.project.status),
+          condition: true,
+          title: 'Resubmit for review',
+          id: 'resubmit-for-review',
+          description: `Your project has been ${this.project.status} by
+            Modrinth's staff. In most cases, you can resubmit for review after
+            addressing the staff's message.`,
+          status: 'review',
+          link: null,
+          action: {
+            onClick: this.submitForReview,
+            title: 'Resubmit for review',
+            disabled: () =>
+              !this.acknowledgedMessage ||
+              this.nags.filter((x) => x.condition && x.status === 'required')
+                .length > 0,
+          },
+        },
       ]
         .filter((x) => !x.hide)
         .sort((a, b) =>
@@ -341,6 +379,7 @@ export default {
     },
     async submitForReview() {
       if (
+        !this.acknowledgedMessage ||
         this.nags.filter((x) => x.condition && x.status === 'required')
           .length === 0
       ) {
diff --git a/layouts/default.vue b/layouts/default.vue
index cea65314..9790a2c1 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -132,10 +132,7 @@
                     <span class="title">Settings</span>
                   </NuxtLink>
                   <NuxtLink
-                    v-if="
-                      $auth.user.role === 'moderator' ||
-                      $auth.user.role === 'admin'
-                    "
+                    v-if="$tag.staffRoles.includes($auth.user.role)"
                     class="item button-transparent"
                     to="/moderation"
                   >
@@ -297,10 +294,7 @@
               <span class="dropdown-item__text">Settings</span>
             </NuxtLink>
             <NuxtLink
-              v-if="
-                $auth.user &&
-                ($auth.user.role === 'moderator' || $auth.user.role === 'admin')
-              "
+              v-if="$auth.user && $tag.staffRoles.includes($auth.user.role)"
               class="iconified-button raised-button"
               to="/moderation"
             >
diff --git a/layouts/error.vue b/layouts/error.vue
index e7d748ac..7327a040 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -2,7 +2,7 @@
   <div class="main">
     <div class="error">
       <Logo404 v-if="error.statusCode === 404" />
-      <h1 v-else>An error occured!</h1>
+      <h1 v-else>An error occurred!</h1>
       <p>{{ error.message }}</p>
       <div class="button-group">
         <nuxt-link to="/" class="iconified-button raised-button brand-button">
diff --git a/pages/_type/_id.vue b/pages/_type/_id.vue
index e735000a..60991825 100644
--- a/pages/_type/_id.vue
+++ b/pages/_type/_id.vue
@@ -278,96 +278,44 @@
           </div>
         </div>
         <div
-          v-if="
-            currentMember &&
-            ((!$tag.approvedStatuses.includes(project.status) &&
-              project.status !== 'processing') ||
-              (project.moderator_message &&
-                (project.moderator_message.message ||
-                  project.moderator_message.body)))
-          "
+          v-if="currentMember && project.moderator_message"
           class="universal-card"
         >
-          <h3 class="card-header">Moderation status</h3>
-          <div class="current-status">
-            Project status:
-            <Badge :type="project.status" />
-          </div>
-          <div class="message">
-            <p v-if="project.status === 'rejected'">
-              Your project has been rejected by Modrinth's staff. In most cases,
-              you can resubmit for review after addressing the staff's message,
-              which is below. Do not resubmit until you've addressed the message
-              from the moderators!
+          <h3 class="card-header">Message from the moderators:</h3>
+          <div v-if="project.moderator_message.body">
+            <p
+              v-if="project.moderator_message.message"
+              class="mod-message__title"
+            >
+              {{ project.moderator_message.message }}
             </p>
-            <div v-if="project.moderator_message">
-              <hr class="card-divider" />
-              <div v-if="project.moderator_message.body">
-                <h3 class="card-header">Message from the moderators:</h3>
-                <p
-                  v-if="project.moderator_message.message"
-                  class="mod-message__title"
-                >
-                  {{ project.moderator_message.message }}
-                </p>
-                <div
-                  v-highlightjs
-                  class="markdown-body"
-                  v-html="$xss($md.render(project.moderator_message.body))"
-                />
-              </div>
-              <div v-else>
-                <h3 class="card-header">Message from the moderators:</h3>
-                <p>{{ project.moderator_message.message }}</p>
-              </div>
-            </div>
-          </div>
-          <div class="buttons status-buttons">
-            <button
-              v-if="
-                !$tag.approvedStatuses.includes(project.status) &&
-                project.status !== 'processing'
-              "
-              class="iconified-button brand-button"
-              @click="submitForReview"
-            >
-              <CheckIcon />
-              Resubmit for review
-            </button>
-            <button
-              v-if="$tag.approvedStatuses.includes(project.status)"
-              class="iconified-button"
-              @click="clearMessage"
-            >
-              <ClearIcon />
-              Clear message
-            </button>
-          </div>
-          <div v-if="showKnownErrors" class="known-errors">
-            <ul>
-              <li v-if="project.body === ''">
-                Your project must have a body to submit for review.
-              </li>
-              <li v-if="project.versions.length < 1">
-                Your project must have at least one version to submit for
-                review.
-              </li>
-              <li
-                v-if="
-                  project.client_side === 'unknown' ||
-                  project.server_side === 'unknown'
-                "
-              >
-                Your project must have the supported environments selected.
-              </li>
-            </ul>
           </div>
+          <div
+            v-highlightjs
+            class="markdown-body"
+            v-html="
+              $xss(
+                $md.render(
+                  project.moderator_message.body
+                    ? project.moderator_message.body
+                    : project.moderator_message.message
+                )
+              )
+            "
+          />
+        </div>
+        <div class="buttons status-buttons">
+          <button
+            v-if="$tag.approvedStatuses.includes(project.status)"
+            class="iconified-button"
+            @click="clearMessage"
+          >
+            <ClearIcon />
+            Clear message
+          </button>
         </div>
         <div
-          v-if="
-            $auth.user &&
-            ($auth.user.role === 'admin' || $auth.user.role === 'moderator')
-          "
+          v-if="$auth.user && $tag.staffRoles.includes($auth.user.role)"
           class="universal-card moderation-card"
         >
           <h3>Moderation actions</h3>
@@ -378,16 +326,11 @@
                 project.status === 'processing'
               "
               class="iconified-button brand-button"
-              @click="
-                openModerationModal(
-                  project.requested_status
-                    ? project.requested_status
-                    : 'approved'
-                )
-              "
+              @click="openModerationModal(requestedStatus)"
             >
               <CheckIcon />
               Approve
+              {{ requestedStatus !== 'approved' ? `(${requestedStatus})` : '' }}
             </button>
             <button
               v-if="
@@ -700,9 +643,8 @@
           class="card warning"
           aria-label="Warning"
         >
-          {{ project.title }} has been archived by the project author.
-          {{ project.title }} will not receive any further updates unless the
-          author decides to unarchive the project.
+          {{ project.title }} has been archived and will not receive any further
+          updates unless the author decides to unarchive the project.
         </div>
         <div
           v-if="project.project_type === 'modpack'"
@@ -976,8 +918,7 @@ export default {
       if (
         !currentMember &&
         data.$auth.user &&
-        (data.$auth.user.role === 'admin' ||
-          data.$auth.user.role === 'moderator')
+        data.$tag.staffRoles.includes(data.$auth.user.role)
       ) {
         currentMember = {
           team_id: project.team_id,
@@ -1024,7 +965,6 @@ export default {
   },
   data() {
     return {
-      showKnownErrors: false,
       licenseText: '',
       isSettings: false,
       routeName: '',
@@ -1122,6 +1062,9 @@ export default {
     featuredGalleryImage() {
       return this.project.gallery.find((img) => img.featured)
     },
+    requestedStatus() {
+      return this.project.requested_status ?? 'approved'
+    },
   },
   watch: {
     '$route.path': {
@@ -1204,19 +1147,6 @@ export default {
 
       this.$nuxt.$loading.finish()
     },
-    async submitForReview() {
-      if (
-        this.project.body === '' ||
-        this.project.body.startsWith('# Placeholder description') ||
-        this.versions.length < 1 ||
-        this.project.client_side === 'unknown' ||
-        this.project.server_side === 'unknown'
-      ) {
-        this.showKnownErrors = true
-      } else {
-        await this.setProcessing()
-      }
-    },
     toggleChecklistCollapse() {
       this.collapsedChecklist = !this.collapsedChecklist
     },
@@ -1646,13 +1576,6 @@ export default {
   }
 }
 
-.current-status {
-  display: flex;
-  flex-direction: row;
-  gap: var(--spacing-card-sm);
-  margin-top: var(--spacing-card-md);
-}
-
 .normal-page__sidebar .mod-button {
   margin-top: var(--spacing-card-sm);
 }
diff --git a/pages/_type/_id/settings/members.vue b/pages/_type/_id/settings/members.vue
index 863557d1..4db5139f 100644
--- a/pages/_type/_id/settings/members.vue
+++ b/pages/_type/_id/settings/members.vue
@@ -106,12 +106,13 @@
             "
           />
         </div>
-        <ul
+        <p
           v-if="member.role === 'Owner' && member.oldRole !== 'Owner'"
           class="known-errors"
         >
-          <li>A project can only have one 'Owner'.</li>
-        </ul>
+          A project can only have one 'Owner'. Use the 'Transfer ownership'
+          button below if you no longer wish to be owner.
+        </p>
         <template v-if="member.oldRole !== 'Owner'">
           <span class="label">
             <span class="label__title">Permissions</span>
diff --git a/pages/legal/rules.vue b/pages/legal/rules.vue
index 19b495dd..c94757d1 100644
--- a/pages/legal/rules.vue
+++ b/pages/legal/rules.vue
@@ -152,7 +152,8 @@
       <li>Content containing sexual or explicit material</li>
       <li>Content promoting or sharing harmful or hateful behavior</li>
       <li>
-        Content with a focus on items such as alcohol, tobacco, and other drugs
+        Content themed around or containing real-life drugs or illicit
+        substances
       </li>
       <li>Content with an excessive amount of profane language</li>
     </ul>
diff --git a/pages/user/_id.vue b/pages/user/_id.vue
index 521d2979..acab2b55 100644
--- a/pages/user/_id.vue
+++ b/pages/user/_id.vue
@@ -100,7 +100,7 @@
           <template v-else>
             <div class="sidebar__item">
               <Badge
-                v-if="user.role === 'admin' || user.role === 'moderator'"
+                v-if="$tag.staffRoles.includes(user.role)"
                 :type="user.role"
               />
               <Badge v-else-if="projects.length > 0" type="creator" />
@@ -233,12 +233,10 @@
             :status="
               $auth.user &&
               ($auth.user.id === user.id ||
-                $auth.user.role === 'admin' ||
-                $auth.user.role === 'moderator')
+                $tag.staffRoles.includes($auth.user.role))
                 ? project.status
                 : null
             "
-            :has-mod-message="project.moderator_message"
             :type="project.project_type"
             :color="project.color"
           />
diff --git a/store/tag.js b/store/tag.js
index 697206da..fb73af58 100644
--- a/store/tag.js
+++ b/store/tag.js
@@ -56,4 +56,6 @@ export const state = () => ({
   },
   projectViewModes: ['list', 'grid', 'gallery'],
   approvedStatuses: ['approved', 'archived', 'unlisted', 'private'],
+  rejectedStatuses: ['rejected', 'withheld'],
+  staffRoles: ['moderator', 'admin'],
 })