From 474e4824744fbeaa1d887e5e1b449216e5715a9a Mon Sep 17 00:00:00 2001
From: coolbot100s <76798835+coolbot100s@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:34:02 -0700
Subject: [PATCH] fix tags warning, and link shorteners and misused discord
 warnings to link settings page, reword some warnings.

---
 .../src/pages/[type]/[id]/settings/links.vue  | 72 +++++++++++++++++--
 .../src/pages/[type]/[id]/settings/tags.vue   |  6 +-
 2 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/apps/frontend/src/pages/[type]/[id]/settings/links.vue b/apps/frontend/src/pages/[type]/[id]/settings/links.vue
index 20eafc0c9..748899e1b 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/links.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/links.vue
@@ -13,8 +13,18 @@
           </span>
         </label>
         <TriangleAlertIcon
-          v-if="!isIssuesUrlCommon"
-          v-tooltip="`You're using a link which isn't common for this link type.`"
+          v-if="isIssuesLinkShortener"
+          v-tooltip="`Use of link shorteners is prohibited.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="isIssuesDiscordUrl"
+          v-tooltip="`Discord invites are not appropriate for this link type.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="!isIssuesUrlCommon"
+          v-tooltip="`Link includes a domain which isn't common for this link type.`"
           class="size-6 animate-pulse text-orange"
         />
         <input
@@ -37,8 +47,18 @@
           </span>
         </label>
         <TriangleAlertIcon
-          v-if="!isSourceUrlCommon"
-          v-tooltip="`You're using a link which isn't common for this link type.`"
+          v-if="isSourceLinkShortener"
+          v-tooltip="`Use of link shorteners is prohibited.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="isSourceDiscordUrl"
+          v-tooltip="`Discord invites are not appropriate for this link type.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="!isSourceUrlCommon"
+          v-tooltip="`Link includes a domain which isn't common for this link type.`"
           class="size-6 animate-pulse text-orange"
         />
         <input
@@ -60,6 +80,16 @@
             A page containing information, documentation, and help for the project.
           </span>
         </label>
+        <TriangleAlertIcon
+          v-if="isWikiLinkShortener"
+          v-tooltip="`Use of link shorteners is prohibited.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="isWikiDiscordUrl"
+          v-tooltip="`Discord invites are not appropriate for this link type.`"
+          class="size-6 animate-pulse text-orange"
+        />
         <input
           id="project-wiki-page"
           v-model="wikiUrl"
@@ -75,7 +105,12 @@
           <span class="label__description"> An invitation link to your Discord server. </span>
         </label>
         <TriangleAlertIcon
-          v-if="!isDiscordUrlCommon"
+          v-if="isDiscordLinkShortener"
+          v-tooltip="`Use of link shorteners is prohibited.`"
+          class="size-6 animate-pulse text-orange"
+        />
+        <TriangleAlertIcon
+          v-else-if="!isDiscordUrlCommon"
           v-tooltip="`You're using a link which isn't common for this link type.`"
           class="size-6 animate-pulse text-orange"
         />
@@ -139,7 +174,7 @@
 <script setup>
 import { DropdownSelect } from "@modrinth/ui";
 import { SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import { isCommonUrl, commonLinkDomains } from "@modrinth/moderation";
+import { isCommonUrl, isDiscordUrl, isLinkShortener, commonLinkDomains } from "@modrinth/moderation";
 
 const tags = useTags();
 
@@ -184,6 +219,31 @@ const isDiscordUrlCommon = computed(() => {
   return isCommonUrl(discordUrl.value, commonLinkDomains.discord);
 });
 
+const isIssuesDiscordUrl = computed(() => {
+  return isDiscordUrl(issuesUrl.value)
+})
+
+const isSourceDiscordUrl = computed(() => {
+  return isDiscordUrl(sourceUrl.value)
+})
+
+const isWikiDiscordUrl = computed(() => {
+  return isDiscordUrl(wikiUrl.value)
+})
+
+const isIssuesLinkShortner = computed(() => {
+  return isLinkShortener(issuesUrl.value)
+}) 
+const isSourceLinkShortener = computed(() => {
+  return isLinkShortener(sourceUrl.value)
+}) 
+const isWikiLinkShortener = computed(() => {
+  return isLinkShortener(wikiUrl.value)
+}) 
+const isDiscordLinkShortener = computed(() => {
+  return isLinkShortener(discordUrl.value)
+}) 
+
 const rawDonationLinks = JSON.parse(JSON.stringify(props.project.donation_urls));
 rawDonationLinks.push({
   id: null,
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
index 138f2c775..1b8e7c018 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
@@ -207,8 +207,8 @@ const categoryLists = computed(() => {
 
 const tooManyTagsWarning = computed(() => {
   const tagCount = selectedTags.value.length;
-  if (tagCount > 5) {
-    return `You've selected ${tagCount} tags. Consider reducing to 5 or fewer to keep your project focused and easier to discover.`;
+  if (tagCount > 8) {
+    return `You've selected ${tagCount} tags. Consider reducing to 8 or fewer to keep your project focused and easier to discover.`;
   }
   return null;
 });
@@ -217,7 +217,7 @@ const multipleResolutionTagsWarning = computed(() => {
   if (props.project.project_type !== "resourcepack") return null;
 
   const resolutionTags = selectedTags.value.filter((tag) =>
-    ["16x", "32x", "48x", "64x", "128x", "256x", "512x", "1024x"].includes(tag.name),
+    ['8x-', '16x', '32x', '48x', '64x', '128x', '256x', '512x+'].includes(tag.name),
   );
 
   if (resolutionTags.length > 1) {