From b7464e84aafd38f1637c96ee69556389c9ecb1eb Mon Sep 17 00:00:00 2001
From: dragongoose <dragonmail14@protonmail.com>
Date: Mon, 19 Jun 2023 23:18:10 -0400
Subject: [PATCH] Clean this mess

---
 src/assets/types/index.ts     |  2 +-
 src/components/TwitchChat.vue | 20 +++++-----
 src/main.ts                   |  4 +-
 src/mixins.ts                 | 15 +++----
 src/types/Category.ts         |  2 +-
 src/types/Search.ts           |  8 ++--
 src/types/Streamer.ts         |  1 +
 src/types/index.ts            |  3 +-
 src/views/CategoryView.vue    | 73 +++++++++++++++--------------------
 src/views/HomepageView.vue    | 38 +++++++++---------
 src/views/SearchPageView.vue  |  1 -
 src/views/UserView.vue        |  2 +-
 12 files changed, 80 insertions(+), 89 deletions(-)

diff --git a/src/assets/types/index.ts b/src/assets/types/index.ts
index f85d431..b199bcb 100644
--- a/src/assets/types/index.ts
+++ b/src/assets/types/index.ts
@@ -1,2 +1,2 @@
 export * from './Badge'
-export * from './ParsedMessage'
+export * from './ParsedMessage'
\ No newline at end of file
diff --git a/src/components/TwitchChat.vue b/src/components/TwitchChat.vue
index 2e3c4cb..1b15141 100644
--- a/src/components/TwitchChat.vue
+++ b/src/components/TwitchChat.vue
@@ -1,10 +1,13 @@
 <script lang="ts">
-import { ref, type Ref, inject } from 'vue'
+import { ref, inject } from 'vue'
+
 import BadgeVue from './ChatBadge.vue'
 import { getBadges } from '@/assets/badges'
 import { parseMessage } from '@/assets/messageParser'
+
 import type { Badge, ParsedMessage } from '@/assets/types'
 
+
 export default {
   props: {
     isLive: {
@@ -18,23 +21,20 @@ export default {
     }
   },
   async setup(props) {
-    let messages: Ref<ParsedMessage[]> = ref([])
-    const protocol = inject('protocol')  
-    const wsProtocol = protocol === 'https://' ? 'wss://' : 'ws://'
-    const badgesFetch = await fetch(`${protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}/api/badges?channelName=${props.channelName}`)
-    let badges: Badge[] =  (await badgesFetch.json()).data
+    let messages = ref<ParsedMessage[]>([])
+    let badges = ref<Badge[]>([])
+    let wsLink = inject('wsLink') as string
+
 
     return {
-      ws: new WebSocket(`${wsProtocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}`),
+      ws: new WebSocket(wsLink),
       messages,
       badges,
-      props,
     }
   },
   mounted() {
     const chatList = this.$refs.chatList as Element
     const chatStatusMessage = this.$refs.initConnectingStatus as Element
-
     this.ws.onmessage = (message) => {
       if (message.data == 'OK') {
         chatStatusMessage.textContent = this.$t("chat.connected", {username: this.channelName})
@@ -46,7 +46,7 @@ export default {
     }
 
     this.ws.onopen = () => {
-      this.ws.send('JOIN ' + this.props.channelName?.toLowerCase())
+      this.ws.send('JOIN ' + this.$props.channelName?.toLowerCase())
     }
   },
   methods: {
diff --git a/src/main.ts b/src/main.ts
index 46951d6..49b20f9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,11 +13,11 @@ const app = createApp(App).use(i18n)
 const https = (import.meta.env.SAFETWITCH_HTTPS.slice() === "true")
 
 const protocol = https ? 'https://' : 'http://'
+const wsProtocol = https ? 'wss://' : 'ws://'
 app.provide('protocol', protocol)
 app.provide('rootUrl', `${protocol}${import.meta.env.SAFETWITCH_INSTANCE_DOMAIN}`)
 app.provide('rootBackendUrl', `${protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}`)
-
-
+app.provide('wsLink', `${wsProtocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}`)
 
 import { OhVueIcon, addIcons } from 'oh-vue-icons'
 import {
diff --git a/src/mixins.ts b/src/mixins.ts
index d9d57cb..a14c49d 100644
--- a/src/mixins.ts
+++ b/src/mixins.ts
@@ -16,7 +16,7 @@ export function abbreviate(text: number) {
 
 const https = (import.meta.env.SAFETWITCH_HTTPS.slice() === "true")
 const protocol = https ? 'https://' : 'http://'
-const rootBackendUrl = `${protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}`
+const rootBackendUrl = `${protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}/`
 
 export async function getEndpoint(endpoint: string) {
     let data
@@ -25,15 +25,16 @@ export async function getEndpoint(endpoint: string) {
         const res = await fetch(rootBackendUrl + endpoint)
         const rawData = await res.json()
 
-        if (rawData.status === 'ok') {
-            data = rawData.data
-        } else {
-            data = { status: 'error' }
+        if (!res.ok) {
+            throw res
+        }
+        if (rawData.status !== 'ok') {
+            throw rawData
         }
 
+        data = rawData.data
     } catch (error) {
-        console.error(error)
-        data = { status: 'error' }
+        throw error
     }
 
     return data
diff --git a/src/types/Category.ts b/src/types/Category.ts
index dd3a36a..aa7696d 100644
--- a/src/types/Category.ts
+++ b/src/types/Category.ts
@@ -1,6 +1,6 @@
 export type Tag = string
 
-export interface Category {
+export interface CategoryPreview {
     name: string
     displayName: string
     viewers: number
diff --git a/src/types/Search.ts b/src/types/Search.ts
index 8b5947d..1c949d8 100644
--- a/src/types/Search.ts
+++ b/src/types/Search.ts
@@ -1,9 +1,9 @@
 import type { StreamData, StreamerData } from "./"
-import type { Category } from "./"
+import type { CategoryPreview } from "./"
 
 export interface SearchResult {
     channels: StreamerData[]
-    categories: Category[]
-    relatedChannels: StreamData[]
-    channelsWithTag: StreamData[]
+    categories: CategoryPreview[]
+    relatedChannels: StreamerData[]
+    channelsWithTag: StreamerData[]
 }
\ No newline at end of file
diff --git a/src/types/Streamer.ts b/src/types/Streamer.ts
index b67f6a8..d3569fa 100644
--- a/src/types/Streamer.ts
+++ b/src/types/Streamer.ts
@@ -16,6 +16,7 @@ export interface StreamData {
 
 export interface StreamerData {
     username: string
+    login: string
     followers: number
     isLive: boolean
     about: string
diff --git a/src/types/index.ts b/src/types/index.ts
index 19e5b33..b0bc521 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -4,5 +4,4 @@ export * from './Chat'
 export * from './Chat'
 export * from './Category'
 export * from './CategoryData'
-export * from './ApiResponse'
-
+export * from './ApiResponse'
\ No newline at end of file
diff --git a/src/views/CategoryView.vue b/src/views/CategoryView.vue
index 3425a10..2960448 100644
--- a/src/views/CategoryView.vue
+++ b/src/views/CategoryView.vue
@@ -1,37 +1,33 @@
 <script lang="ts">
-import { ref, type Ref } from 'vue'
-import { useRoute } from 'vue-router'
+import { ref } from 'vue'
+
 import StreamPreviewVue from '@/components/StreamPreview.vue'
 import ErrorMessage from '@/components/ErrorMessage.vue'
 import LoadingScreen from '@/components/LoadingScreen.vue'
 
+import type { CategoryData } from '@/types'
+import { getEndpoint, abbreviate } from '@/mixins'
+
+
 export default {
   inject: ['protocol'],
   async setup() {
-    const route = useRoute()
-    const data: Ref<any | undefined> = ref()
-    const game: string = route.params.game.toString()
+    let data = ref<CategoryData>()
+    let status = ref<"ok" | "error">()
 
     return {
       data,
-      game
+      status
     }
   },
   async mounted() {
-    try {
-      const res = await fetch(
-        `${this.protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}/api/discover/${this.game}`
-      )
-      const rawData = await res.json()
-      if (rawData.status === "ok") {
-        this.data = rawData.data
-      } else {
-        this.data = { status: 'error' }
-      }
-    } catch (err) {
-      this.data = { status: 'error' }
-      console.error(err)
-    }
+    await getEndpoint("api/discover/" + this.$route.params.game)
+        .catch(() => {
+            this.status = "error"
+        })
+        .then((data: CategoryData) => {
+            this.data = data
+        })
 
     this.getMoreStreams()
   },
@@ -41,31 +37,26 @@ export default {
         let bottomOfWindow =
           document.documentElement.scrollTop + window.innerHeight ===
           document.documentElement.offsetHeight
-        const streams = this.data.streams
+        const streams = this.data!.streams
+
         if (bottomOfWindow && streams) {
+          // get cursor of the last stream rendered
           const cursor = streams[streams.length - 1].cursor
           if (!cursor) return
-          const res = await fetch(
-            `${this.protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}/api/discover/${this.game}/?cursor=${cursor}`
-          )
-          if (!res.ok) {
-            throw new Error('Failed to fetch data')
-          }
-          const resData = await res.json()
 
-          for (let stream of resData.data.streams) {
-            this.data.streams.push(stream)
+          // get rest of streams from api
+          const resData = await getEndpoint(`api/discover/${this.$route.params.game}/?cursor=${cursor}`)
+            .catch((err) => {
+              throw err
+            })
+
+          for (let stream of resData.streams) {
+            this.data!.streams.push(stream)
           }
         }
       }
     },
-    abbreviate(text: number) {
-      return Intl.NumberFormat('en-US', {
-        //@ts-ignore
-        notation: 'compact',
-        maximumFractionDigits: 1
-      }).format(text)
-    }
+    abbreviate,
   },
   components: {
     StreamPreviewVue,
@@ -76,10 +67,10 @@ export default {
 </script>
 
 <template>
-  <loading-screen v-if="!data"></loading-screen>
-  <error-message v-else-if="data.status === 'error' || !data"></error-message>
+  <loading-screen v-if="!data && status != 'error'"></loading-screen>
+  <error-message v-else-if="status == 'error'"></error-message>
 
-  <div v-else class="flex flex-col max-w-5xl mx-auto">
+  <div v-else-if="data" class="flex flex-col max-w-5xl mx-auto">
     <div class="flex p-3 flex-col">
       <div class="inline-flex space-x-4">
         <img :src="data.cover" class="self-start rounded-md" />
@@ -127,7 +118,7 @@ export default {
 
     <div class="max-w-[58rem] mx-auto">
       <ul>
-        <li v-for="stream in data.streams" :key="stream" class="inline-flex m-2 hover:scale-105 transition-transform">
+        <li v-for="stream in data.streams" class="inline-flex m-2 hover:scale-105 transition-transform">
           <StreamPreviewVue :stream="stream"></StreamPreviewVue>
         </li>
       </ul>
diff --git a/src/views/HomepageView.vue b/src/views/HomepageView.vue
index ad6fda5..cfe8e50 100644
--- a/src/views/HomepageView.vue
+++ b/src/views/HomepageView.vue
@@ -1,17 +1,23 @@
 <script lang="ts">
-import { ref, type Ref } from 'vue'
+import { ref } from 'vue'
+
 import StreamPreviewVue from '@/components/StreamPreview.vue'
 import ErrorMessage from '@/components/ErrorMessage.vue'
 import LoadingScreen from '@/components/LoadingScreen.vue'
 import CategoryPreview from '@/components/CategoryPreview.vue'
 
+import { getEndpoint } from '@/mixins'
+import type { CategoryPreview as CategoryPreviewInterface } from '@/types'
+
 export default {
   inject: ['protocol'],
   async setup() {
-    let data: Ref<any | undefined> = ref()
+    let data = ref<CategoryPreviewInterface[]>()
+    let status = ref<"ok" | "error">()
 
     return {
       data,
+      status,
       filterTags: '',
       following: ref([])
     }
@@ -75,19 +81,14 @@ export default {
       this.following = []
     }
 
-    try {
-      const res = await fetch(`${this.protocol}${import.meta.env.SAFETWITCH_BACKEND_DOMAIN}/api/discover`)
-      
-      const rawData = await res.json()
-      if (rawData.status === 'ok') {
-        this.data = rawData.data
-      } else {
-        this.data = { status: 'error' }
-      }
-    } catch (error) {
-      console.error(error)
-      this.data = { status: 'error' }
-    }
+    await getEndpoint("api/discover")
+        .catch(() => {
+            this.status = "error"
+        })
+        .then((data: CategoryPreviewInterface[]) => {
+            this.data = data
+        })
+
   },
   components: {
     StreamPreviewVue,
@@ -99,10 +100,10 @@ export default {
 </script>
 
 <template>
-  <loading-screen v-if="!data"></loading-screen>
-  <error-message v-else-if="data.status === 'error'"></error-message>
+  <loading-screen v-if="!data && status != 'error'"></loading-screen>
+  <error-message v-else-if="status == 'error'"></error-message>
 
-  <div v-else class="max-w-5xl mx-auto">
+  <div v-else-if="data" class="max-w-5xl mx-auto">
     <div v-if="following.length > 0" class="p-2 text-white">
       <h1 class="font-bold text-5xl">Following</h1>
       <p class="text-xl">Streamers you follow</p>
@@ -142,7 +143,6 @@ export default {
     <ul ref="categoryList">
       <li
         v-for="category in data"
-        :key="category"
         ref="categoryItem"
         class="inline-flex m-2 hover:scale-105 transition-transform"
       >
diff --git a/src/views/SearchPageView.vue b/src/views/SearchPageView.vue
index 4ecb065..c2d60dc 100644
--- a/src/views/SearchPageView.vue
+++ b/src/views/SearchPageView.vue
@@ -21,7 +21,6 @@ export default {
         }
     },
     async mounted() {
-
         await getEndpoint("api/search/?query=" + this.$route.query.query)
         .catch(() => {
             this.status = "error"
diff --git a/src/views/UserView.vue b/src/views/UserView.vue
index a50940d..1fd483f 100644
--- a/src/views/UserView.vue
+++ b/src/views/UserView.vue
@@ -151,6 +151,6 @@ export default {
       </div>
     </div>
 
-    <twitch-chat :isLive="data.isLive" :channelName="data.username"></twitch-chat>
+    <twitch-chat :isLive="data.isLive" :channelName="data.login"></twitch-chat>
   </div>
 </template>