From a0b6a3bed6d4fd0a09a5f9c161fa95725ebaf382 Mon Sep 17 00:00:00 2001
From: Geometrically <jai.a@tuta.io>
Date: Fri, 1 Jan 2021 09:09:53 -0700
Subject: [PATCH] Better error handling, fix some more broken OG links

---
 layouts/error.vue                  | 28 ++++++---
 pages/index.vue                    |  1 -
 pages/legal/privacy.vue            |  2 +-
 pages/legal/terms.vue              |  2 +-
 pages/mod/_id/edit.vue             | 99 ++++++++++++++++--------------
 pages/mod/_id/index.vue            | 81 +++++++++++++-----------
 pages/mod/_id/settings.vue         | 93 +++++++++++++++-------------
 pages/mod/_id/version/_version.vue | 97 +++++++++++++++--------------
 pages/mod/_id/versions.vue         | 89 ++++++++++++++-------------
 pages/user/_id.vue                 | 47 ++++++++------
 10 files changed, 298 insertions(+), 241 deletions(-)

diff --git a/layouts/error.vue b/layouts/error.vue
index 5b740a26..80ea2b9f 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,15 +1,25 @@
 <template>
   <div class="main">
-    <h1>{{ error.message }}</h1>
-    <NuxtLink to="/">
-      An error occurred! Click this text to go back home, and find your way
-      back!
-    </NuxtLink>
+    <div class="container">
+      <NuxtLink to="/">
+        <h2>{{ error.message }}</h2>
+        <p>
+          An error occurred! Click this text to go back home, and find your way
+          back!
+        </p>
+      </NuxtLink>
+    </div>
+    <m-footer class="footer" centered />
   </div>
 </template>
 
 <script>
+import MFooter from '@/components/MFooter'
+
 export default {
+  components: {
+    MFooter,
+  },
   props: {
     error: {
       type: Object,
@@ -29,8 +39,12 @@ export default {
 
 <style lang="scss" scoped>
 .main {
-  margin: 0 auto;
+  margin: var(--spacing-card-sm) auto;
   max-width: 800px;
-  text-align: center;
+}
+
+.container {
+  @extend %card;
+  padding: var(--spacing-card-md) var(--spacing-card-lg);
 }
 </style>
diff --git a/pages/index.vue b/pages/index.vue
index 90553aee..ef4d91a2 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -25,7 +25,6 @@
       <div class="right hero-image">
         <video
           src="~/assets/images/search.mp4"
-          alt="search"
           loading="lazy"
           loop
           muted
diff --git a/pages/legal/privacy.vue b/pages/legal/privacy.vue
index d3f50569..56bee816 100644
--- a/pages/legal/privacy.vue
+++ b/pages/legal/privacy.vue
@@ -171,7 +171,7 @@ export default {
       {
         hid: 'og:url',
         name: 'og:url',
-        content: `https://modrinth.com/privacy`,
+        content: `https://modrinth.com/legal/privacy`,
       },
     ],
   },
diff --git a/pages/legal/terms.vue b/pages/legal/terms.vue
index ee61e45a..1750823e 100644
--- a/pages/legal/terms.vue
+++ b/pages/legal/terms.vue
@@ -183,7 +183,7 @@ export default {
       {
         hid: 'og:url',
         name: 'og:url',
-        content: `https://modrinth.com/tos`,
+        content: `https://modrinth.com/legal/terms`,
       },
     ],
   },
diff --git a/pages/mod/_id/edit.vue b/pages/mod/_id/edit.vue
index 2da47d0e..a5e36331 100644
--- a/pages/mod/_id/edit.vue
+++ b/pages/mod/_id/edit.vue
@@ -282,55 +282,62 @@ export default {
       },
     }
 
-    const [
-      mod,
-      availableCategories,
-      availableLoaders,
-      availableGameVersions,
-      availableLicenses,
-      // availableDonationPlatforms,
-    ] = (
-      await Promise.all([
-        axios.get(
-          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-          config
-        ),
-        axios.get(`https://api.modrinth.com/api/v1/tag/category`),
-        axios.get(`https://api.modrinth.com/api/v1/tag/loader`),
-        axios.get(`https://api.modrinth.com/api/v1/tag/game_version`),
-        axios.get(`https://api.modrinth.com/api/v1/tag/license`),
-        // axios.get(`https://api.modrinth.com/api/v1/tag/donation_platform`),
-      ])
-    ).map((it) => it.data)
+    try {
+      const [
+        mod,
+        availableCategories,
+        availableLoaders,
+        availableGameVersions,
+        availableLicenses,
+        // availableDonationPlatforms,
+      ] = (
+        await Promise.all([
+          axios.get(
+            `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
+            config
+          ),
+          axios.get(`https://api.modrinth.com/api/v1/tag/category`),
+          axios.get(`https://api.modrinth.com/api/v1/tag/loader`),
+          axios.get(`https://api.modrinth.com/api/v1/tag/game_version`),
+          axios.get(`https://api.modrinth.com/api/v1/tag/license`),
+          // axios.get(`https://api.modrinth.com/api/v1/tag/donation_platform`),
+        ])
+      ).map((it) => it.data)
 
-    mod.license = {
-      short: mod.license.id,
-      name: mod.license.name,
-    }
-
-    const res = await axios.get(mod.body_url)
-
-    return {
-      mod,
-      body: res.data,
-      clientSideType: {
-        label: mod.client_side,
-        id: mod.client_side,
-      },
-      serverSideType: {
-        label: mod.server_side,
-        id: mod.server_side,
-      },
-      availableCategories,
-      availableLoaders,
-      availableGameVersions,
-      availableLicenses,
-      license: {
+      mod.license = {
         short: mod.license.id,
         name: mod.license.name,
-      },
-      license_url: mod.license.url,
-      // availableDonationPlatforms,
+      }
+
+      const res = await axios.get(mod.body_url)
+
+      return {
+        mod,
+        body: res.data,
+        clientSideType: {
+          label: mod.client_side,
+          id: mod.client_side,
+        },
+        serverSideType: {
+          label: mod.server_side,
+          id: mod.server_side,
+        },
+        availableCategories,
+        availableLoaders,
+        availableGameVersions,
+        availableLicenses,
+        license: {
+          short: mod.license.id,
+          name: mod.license.name,
+        },
+        license_url: mod.license.url,
+        // availableDonationPlatforms,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'Mod not found',
+      })
     }
   },
   data() {
diff --git a/pages/mod/_id/index.vue b/pages/mod/_id/index.vue
index ab8abaea..ddafefb8 100644
--- a/pages/mod/_id/index.vue
+++ b/pages/mod/_id/index.vue
@@ -28,49 +28,56 @@ export default {
       },
     }
 
-    const mod = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-        config
-      )
-    ).data
+    try {
+      const mod = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
+          config
+        )
+      ).data
 
-    const [members, versions] = (
-      await Promise.all([
-        axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
-        axios.get(
-          `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
-            mod.versions
+      const [members, versions] = (
+        await Promise.all([
+          axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
+          axios.get(
+            `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
+              mod.versions
+            )}`,
+            config
+          ),
+        ])
+      ).map((it) => it.data)
+
+      const users = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
+            members.map((it) => it.user_id)
           )}`,
           config
-        ),
-      ])
-    ).map((it) => it.data)
+        )
+      ).data
 
-    const users = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
-          members.map((it) => it.user_id)
-        )}`,
-        config
-      )
-    ).data
+      users.forEach((it) => {
+        const index = members.findIndex((x) => x.user_id === it.id)
+        members[index].avatar_url = it.avatar_url
+        members[index].name = it.username
+      })
 
-    users.forEach((it) => {
-      const index = members.findIndex((x) => x.user_id === it.id)
-      members[index].avatar_url = it.avatar_url
-      members[index].name = it.username
-    })
+      const currentMember = data.$auth.loggedIn
+        ? members.find((x) => x.user_id === data.$auth.user.id)
+        : null
 
-    const currentMember = data.$auth.loggedIn
-      ? members.find((x) => x.user_id === data.$auth.user.id)
-      : null
-
-    return {
-      mod,
-      versions: versions.reverse(),
-      members,
-      currentMember,
+      return {
+        mod,
+        versions: versions.reverse(),
+        members,
+        currentMember,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'Mod not found',
+      })
     }
   },
   data() {
diff --git a/pages/mod/_id/settings.vue b/pages/mod/_id/settings.vue
index f8919ac8..0b2d2578 100644
--- a/pages/mod/_id/settings.vue
+++ b/pages/mod/_id/settings.vue
@@ -219,54 +219,61 @@ export default {
       },
     }
 
-    const mod = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-        config
-      )
-    ).data
-
-    const [members, versions] = (
-      await Promise.all([
-        axios.get(
-          `https://api.modrinth.com/api/v1/team/${mod.team}/members`,
+    try {
+      const mod = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
           config
-        ),
-        axios.get(
-          `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
-            mod.versions
-          )}`,
-          config
-        ),
-      ])
-    ).map((it) => it.data)
+        )
+      ).data
 
-    const [users] = (
-      await Promise.all([
-        axios.get(
-          `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
-            members.map((it) => it.user_id)
-          )}`,
-          config
-        ),
-      ])
-    ).map((it) => it.data)
+      const [members, versions] = (
+        await Promise.all([
+          axios.get(
+            `https://api.modrinth.com/api/v1/team/${mod.team}/members`,
+            config
+          ),
+          axios.get(
+            `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
+              mod.versions
+            )}`,
+            config
+          ),
+        ])
+      ).map((it) => it.data)
 
-    users.forEach((it) => {
-      const index = members.findIndex((x) => x.user_id === it.id)
-      members[index].avatar_url = it.avatar_url
-      members[index].name = it.username
-    })
+      const [users] = (
+        await Promise.all([
+          axios.get(
+            `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
+              members.map((it) => it.user_id)
+            )}`,
+            config
+          ),
+        ])
+      ).map((it) => it.data)
 
-    const currentMember = data.$auth.loggedIn
-      ? members.find((x) => x.user_id === data.$auth.user.id)
-      : null
+      users.forEach((it) => {
+        const index = members.findIndex((x) => x.user_id === it.id)
+        members[index].avatar_url = it.avatar_url
+        members[index].name = it.username
+      })
 
-    return {
-      mod,
-      versions: versions.reverse(),
-      members,
-      currentMember,
+      const currentMember = data.$auth.loggedIn
+        ? members.find((x) => x.user_id === data.$auth.user.id)
+        : null
+
+      return {
+        mod,
+        versions: versions.reverse(),
+        members,
+        currentMember,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'Mod not found',
+      })
     }
   },
   data() {
diff --git a/pages/mod/_id/version/_version.vue b/pages/mod/_id/version/_version.vue
index a68a4ed8..9ef2a033 100644
--- a/pages/mod/_id/version/_version.vue
+++ b/pages/mod/_id/version/_version.vue
@@ -126,61 +126,68 @@ export default {
       },
     }
 
-    const mod = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-        config
-      )
-    ).data
+    try {
+      const mod = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
+          config
+        )
+      ).data
 
-    const [members, versions] = (
-      await Promise.all([
-        axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
-        axios.get(
-          `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
-            mod.versions
+      const [members, versions] = (
+        await Promise.all([
+          axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
+          axios.get(
+            `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
+              mod.versions
+            )}`,
+            config
+          ),
+        ])
+      ).map((it) => it.data)
+
+      const users = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
+            members.map((it) => it.user_id)
           )}`,
           config
-        ),
-      ])
-    ).map((it) => it.data)
+        )
+      ).data
 
-    const users = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
-          members.map((it) => it.user_id)
-        )}`,
-        config
-      )
-    ).data
+      users.forEach((it) => {
+        const index = members.findIndex((x) => x.user_id === it.id)
+        members[index].avatar_url = it.avatar_url
+        members[index].name = it.username
+      })
 
-    users.forEach((it) => {
-      const index = members.findIndex((x) => x.user_id === it.id)
-      members[index].avatar_url = it.avatar_url
-      members[index].name = it.username
-    })
+      const version = versions.find((x) => x.id === data.params.version)
 
-    const version = versions.find((x) => x.id === data.params.version)
+      version.author = members.find((x) => x.user_id === version.author_id)
 
-    version.author = members.find((x) => x.user_id === version.author_id)
+      let primaryFile = version.files.find((file) => file.primary)
 
-    let primaryFile = version.files.find((file) => file.primary)
+      if (!primaryFile) {
+        primaryFile = version.files[0]
+      }
 
-    if (!primaryFile) {
-      primaryFile = version.files[0]
-    }
+      const currentMember = data.$auth.loggedIn
+        ? members.find((x) => x.user_id === data.$auth.user.id)
+        : null
 
-    const currentMember = data.$auth.loggedIn
-      ? members.find((x) => x.user_id === data.$auth.user.id)
-      : null
-
-    return {
-      mod,
-      versions,
-      members,
-      version,
-      primaryFile,
-      currentMember,
+      return {
+        mod,
+        versions,
+        members,
+        version,
+        primaryFile,
+        currentMember,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'Version not found',
+      })
     }
   },
   data() {
diff --git a/pages/mod/_id/versions.vue b/pages/mod/_id/versions.vue
index fcedfb44..b7064c8d 100644
--- a/pages/mod/_id/versions.vue
+++ b/pages/mod/_id/versions.vue
@@ -232,53 +232,60 @@ export default {
       },
     }
 
-    const mod = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
-        config
-      )
-    ).data
+    try {
+      const mod = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/mod/${data.params.id}`,
+          config
+        )
+      ).data
 
-    const [members, versions, selectableLoaders, selectableVersions] = (
-      await Promise.all([
-        axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
-        axios.get(
-          `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
-            mod.versions
+      const [members, versions, selectableLoaders, selectableVersions] = (
+        await Promise.all([
+          axios.get(`https://api.modrinth.com/api/v1/team/${mod.team}/members`),
+          axios.get(
+            `https://api.modrinth.com/api/v1/versions?ids=${JSON.stringify(
+              mod.versions
+            )}`,
+            config
+          ),
+          axios.get(`https://api.modrinth.com/api/v1/tag/loader`),
+          axios.get(`https://api.modrinth.com/api/v1/tag/game_version`),
+        ])
+      ).map((it) => it.data)
+
+      const users = (
+        await axios.get(
+          `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
+            members.map((it) => it.user_id)
           )}`,
           config
-        ),
-        axios.get(`https://api.modrinth.com/api/v1/tag/loader`),
-        axios.get(`https://api.modrinth.com/api/v1/tag/game_version`),
-      ])
-    ).map((it) => it.data)
+        )
+      ).data
 
-    const users = (
-      await axios.get(
-        `https://api.modrinth.com/api/v1/users?ids=${JSON.stringify(
-          members.map((it) => it.user_id)
-        )}`,
-        config
-      )
-    ).data
+      users.forEach((it) => {
+        const index = members.findIndex((x) => x.user_id === it.id)
+        members[index].avatar_url = it.avatar_url
+        members[index].name = it.username
+      })
 
-    users.forEach((it) => {
-      const index = members.findIndex((x) => x.user_id === it.id)
-      members[index].avatar_url = it.avatar_url
-      members[index].name = it.username
-    })
+      const currentMember = data.$auth.loggedIn
+        ? members.find((x) => x.user_id === data.$auth.user.id)
+        : null
 
-    const currentMember = data.$auth.loggedIn
-      ? members.find((x) => x.user_id === data.$auth.user.id)
-      : null
-
-    return {
-      mod,
-      versions: versions.reverse(),
-      members,
-      selectableLoaders,
-      selectableVersions,
-      currentMember,
+      return {
+        mod,
+        versions: versions.reverse(),
+        members,
+        selectableLoaders,
+        selectableVersions,
+        currentMember,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'Mod not found',
+      })
     }
   },
   data() {
diff --git a/pages/user/_id.vue b/pages/user/_id.vue
index 6e2df74a..8794a743 100644
--- a/pages/user/_id.vue
+++ b/pages/user/_id.vue
@@ -99,28 +99,37 @@ export default {
       },
     }
 
-    let res = await axios.get(
-      `https://api.modrinth.com/api/v1/user/${data.params.id}`,
-      config
-    )
-    const user = res.data
-
-    let mods = []
-    res = await axios.get(
-      `https://api.modrinth.com/api/v1/user/${data.params.id}/mods`,
-      config
-    )
-    if (res.data) {
-      res = await axios.get(
-        `https://api.modrinth.com/api/v1/mods?ids=${JSON.stringify(res.data)}`,
+    try {
+      let res = await axios.get(
+        `https://api.modrinth.com/api/v1/user/${data.params.id}`,
         config
       )
-      mods = res.data
-    }
+      const user = res.data
 
-    return {
-      mods,
-      user,
+      let mods = []
+      res = await axios.get(
+        `https://api.modrinth.com/api/v1/user/${data.params.id}/mods`,
+        config
+      )
+      if (res.data) {
+        res = await axios.get(
+          `https://api.modrinth.com/api/v1/mods?ids=${JSON.stringify(
+            res.data
+          )}`,
+          config
+        )
+        mods = res.data
+      }
+
+      return {
+        mods,
+        user,
+      }
+    } catch {
+      data.error({
+        statusCode: 404,
+        message: 'User not found',
+      })
     }
   },
   methods: {