Merge branch 'master' into markdown-links

.github/workflows/deploy.yml

@@ -4,6 +4,7 @@ on: push
 
 jobs:
   deploy:
+    if: github.repository_owner == 'modrinth'
     runs-on: ubuntu-latest
     permissions:
       contents: read

components/ui/NotificationItem.vue

@@ -118,7 +118,7 @@
         >
           <VersionIcon />
           <nuxt-link
-            :to="getVersionLink(notif.extra_data.project, notif.extra_data.version.name)"
+            :to="getVersionLink(notif.extra_data.project, notif.extra_data.version)"
             class="text-link"
           >
             {{ notif.extra_data.version.name }}

composables/tag.js

@@ -54,7 +54,7 @@ export const useTags = () =>
         'folia',
       ],
       dataPackLoaders: ['datapack'],
-      modLoaders: ['forge', 'fabric', 'quilt', 'liteloader', 'modloader', 'rift'],
+      modLoaders: ['forge', 'fabric', 'quilt', 'liteloader', 'modloader', 'rift', 'neoforge'],
     },
     projectViewModes: ['list', 'grid', 'gallery'],
     approvedStatuses: ['approved', 'archived', 'unlisted', 'private'],

helpers/notifications.js

@@ -126,6 +126,11 @@ export async function fetchNotifications() {
 
 export function groupNotifications(notifications, includeRead = false) {
   const grouped = []
+
+  for (const notification of notifications) {
+    notification.grouped_notifs = []
+  }
+
   for (const notification of notifications.filter((notif) => includeRead || !notif.read)) {
     // Group notifications of the same thread or project id
     if (notification.body) {

helpers/parse.js

@@ -68,6 +68,10 @@ export const configuredXss = new xss.FilterXSS({
       try {
         const url = new URL(value)
 
+        if (url.hostname.includes('wsrv.nl')) {
+          url.searchParams.delete('errorredirect')
+        }
+
         const allowedHostnames = [
           'imgur.com',
           'i.imgur.com',
@@ -88,9 +92,11 @@ export const configuredXss = new xss.FilterXSS({
           return xss.safeAttrValue(
             tag,
             name,
-            `https://wsrv.nl/?url=${encodeURIComponent(value)}&n=-1`,
+            `https://wsrv.nl/?url=${encodeURIComponent(url.toString())}&n=-1`,
             cssFilter
           )
+        } else {
+          return xss.safeAttrValue(tag, name, url.toString(), cssFilter)
         }
       } catch (err) {}
     }

pages/auth.vue

@@ -142,6 +142,9 @@ const route = useRoute()
   }
 
   @media screen and (max-width: 25.5rem) {
+    width: auto;
+    margin: 1rem;
+
     .third-party .btn {
       grid-column: 1 / 3;
     }

pages/auth/sign-up.vue

@@ -33,7 +33,11 @@
       type="password"
       placeholder="Confirm password"
     />
-    <Checkbox v-model="subscribe" class="subscribe-btn" label="Subscribe updates about Modrinth" />
+    <Checkbox
+      v-model="subscribe"
+      class="subscribe-btn"
+      label="Subscribe to updates about Modrinth"
+    />
     <p>
       By creating an account, you agree to Modrinth's
       <nuxt-link to="/legal/terms" class="text-link">terms</nuxt-link> and
@@ -43,7 +47,7 @@
       Create account <RightArrowIcon />
     </button>
     <p>
-      Already have an account yet?
+      Already have an account?
       <nuxt-link
         class="text-link"
         :to="`/auth/sign-in${route.query.redirect ? `?redirect=${route.query.redirect}` : ''}`"

pages/auth/welcome.vue

@@ -5,7 +5,11 @@
       Thank you for creating an account. You can now follow and create projects, receive updates
       about your favorite projects, and more!
     </p>
-    <Checkbox v-model="subscribe" class="subscribe-btn" label="Subscribe updates about Modrinth" />
+    <Checkbox
+      v-model="subscribe"
+      class="subscribe-btn"
+      label="Subscribe to updates about Modrinth"
+    />
     <button class="btn btn-primary continue-btn" @click="continueSignUp">Continue</button>
     <p>
       By creating an account, you agree to Modrinth's

pages/index.vue

@@ -25,7 +25,7 @@
         <nuxt-link to="/mods" class="iconified-button brand-button"> Discover mods </nuxt-link>
         <nuxt-link
           v-if="!auth.user"
-          to="sign-up"
+          to="/auth/sign-up"
           class="iconified-button outline-button"
           rel="noopener nofollow"
         >

pages/search/[searchProjectType].vue

@@ -79,7 +79,8 @@
                   !showAllLoaders &&
                   x.name !== 'forge' &&
                   x.name !== 'fabric' &&
-                  x.name !== 'quilt'
+                  x.name !== 'quilt' &&
+                  x.name !== 'neoforge'
                 ) {
                   return false
                 } else if (projectType.id === 'mod' && showAllLoaders) {

pages/settings/account.vue

@@ -255,9 +255,9 @@
         </div>
         <p></p>
         <div class="input-group push-right">
-          <button class="iconified-button brand-button" @click="$refs.manageProvidersModal.hide()">
-            <CheckIcon />
-            Finish editing
+          <button class="iconified-button" @click="$refs.manageProvidersModal.hide()">
+            <XIcon />
+            Close
           </button>
         </div>
       </div>

plugins/shorthands.js

@@ -201,6 +201,8 @@ export const formatCategory = (name) => {
     return 'BungeeCord'
   } else if (name === 'liteloader') {
     return 'LiteLoader'
+  } else if (name === 'neoforge') {
+    return 'NeoForge'
   } else if (name === 'game-mechanics') {
     return 'Game Mechanics'
   } else if (name === 'worldgen') {
@@ -312,7 +314,7 @@ export const formatVersions = (versionArray) => {
 
   for (const interval of newIntervals) {
     if (interval.length === 2) {
-      output.push(`${interval[0][0]}—${interval[1][0]}`)
+      output.push(`${interval[0][0]}–${interval[1][0]}`)
     } else {
       output.push(interval[0][0])
     }