From dcb6258a4555430cb7334fd341ec1baa19df6d43 Mon Sep 17 00:00:00 2001
From: dragongoose <dragonmail14@protonmail.com>
Date: Fri, 12 May 2023 10:21:31 -0400
Subject: [PATCH] Fix protocol issues

---
 src/App.vue                      |  2 +-
 src/components/StreamPreview.vue |  3 ++-
 src/components/TwitchChat.vue    |  8 ++++----
 src/main.ts                      | 11 ++++++++++-
 src/views/CategoryView.vue       |  5 +----
 src/views/HomepageView.vue       | 10 +++++-----
 src/views/SearchPageView.vue     |  4 ++--
 src/views/UserView.vue           |  7 +++----
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1a26f46..4b84f04 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@ import { RouterView } from 'vue-router'
 import NavbarItem from './components/NavbarView.vue'
 </script>
 
-<template>
+<template class="bg-ctp-base">
   <navbar-item></navbar-item>
 
   <Suspense>
diff --git a/src/components/StreamPreview.vue b/src/components/StreamPreview.vue
index d621be0..68484c5 100644
--- a/src/components/StreamPreview.vue
+++ b/src/components/StreamPreview.vue
@@ -1,4 +1,5 @@
 <script lang="ts">
+import { inject } from 'vue'
 export interface Stream {
   tags: string[]
   title: string
@@ -20,7 +21,7 @@ export default {
     }
   },
   async setup(props) {
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
+    const protocol = inject('protocol')
 
     let streamData: Stream | null = null
     if (!props.stream && props.name) {
diff --git a/src/components/TwitchChat.vue b/src/components/TwitchChat.vue
index 750167d..feec7b9 100644
--- a/src/components/TwitchChat.vue
+++ b/src/components/TwitchChat.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { ref, type Ref } from 'vue'
+import { ref, type Ref, inject } from 'vue'
 import BadgeVue from './ChatBadge.vue'
 import { getBadges } from '@/assets/badges'
 import { parseMessage } from '@/assets/messageParser'
@@ -19,13 +19,13 @@ export default {
   },
   async setup(props) {
     let messages: Ref<ParsedMessage[]> = ref([])
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
-    
+    const protocol = inject('protocol')  
+    const wsProtocol = protocol === 'https://' ? 'wss://' : 'ws://'
     const badgesFetch = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/badges?channelName=${props.channelName}`)
     let badges: Badge[] =  (await badgesFetch.json()).data
 
     return {
-      ws: new WebSocket(`ws://${import.meta.env.VITE_BACKEND_DOMAIN}`),
+      ws: new WebSocket(`${wsProtocol}://${import.meta.env.VITE_BACKEND_DOMAIN}`),
       messages,
       badges,
       props,
diff --git a/src/main.ts b/src/main.ts
index 049e88e..7e76d93 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,6 +5,15 @@ import './assets/index.css'
 
 const app = createApp(App)
 
+// Add protocol variable
+// For some reason, import.meta.env.VITE_HTTPS === "true"
+// returns false, even if it is true.
+// Making a copy of the variable seems to work
+const https = (import.meta.env.VITE_HTTPS.slice() === "true")
+app.provide('protocol', https ? 'https://' : 'http://')
+
+
+
 import { OhVueIcon, addIcons } from 'oh-vue-icons'
 import {
   IoSearchOutline,
@@ -34,4 +43,4 @@ addIcons(
 
 app.component('v-icon', OhVueIcon)
 app.use(router)
-app.mount('#app')
+app.mount('#app')
\ No newline at end of file
diff --git a/src/views/CategoryView.vue b/src/views/CategoryView.vue
index b4a32db..612a8bb 100644
--- a/src/views/CategoryView.vue
+++ b/src/views/CategoryView.vue
@@ -6,17 +6,14 @@ import ErrorMessage from '@/components/ErrorMessage.vue'
 import LoadingScreen from '@/components/LoadingScreen.vue'
 
 export default {
+  inject: ['protocol'],
   async setup() {
     const route = useRoute()
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
     const data: Ref<any | undefined> = ref()
-    const frontend_url = protocol + import.meta.env.VITE_INSTANCE_DOMAIN
     const game: string = route.params.game.toString()
 
     return {
       data,
-      frontend_url,
-      protocol,
       game
     }
   },
diff --git a/src/views/HomepageView.vue b/src/views/HomepageView.vue
index bbf8f3c..a351d99 100644
--- a/src/views/HomepageView.vue
+++ b/src/views/HomepageView.vue
@@ -6,16 +6,12 @@ import LoadingScreen from '@/components/LoadingScreen.vue'
 import CategoryPreview from '@/components/CategoryPreview.vue'
 
 export default {
+  inject: ['protocol'],
   async setup() {
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
-
     let data: Ref<any | undefined> = ref()
-    let frontend_url = protocol + import.meta.env.VITE_INSTANCE_DOMAIN
 
     return {
       data,
-      protocol,
-      frontend_url,
       filterTags: '',
       following: ref([])
     }
@@ -82,6 +78,10 @@ export default {
 
     try {
       const res = await fetch(`${this.protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover`)
+      
+      console.log(this.protocol, this)
+      console.log(import.meta.env)
+
       const rawData = await res.json()
       if (rawData.status === 'ok') {
         this.data = rawData.data
diff --git a/src/views/SearchPageView.vue b/src/views/SearchPageView.vue
index 1c13c1e..9dbce71 100644
--- a/src/views/SearchPageView.vue
+++ b/src/views/SearchPageView.vue
@@ -7,6 +7,7 @@ import StreamPreviewVue from '@/components/StreamPreview.vue'
 import ChannelPreview from '@/components/ChannelPreview.vue'
 
 export default {
+    inject: ['protocol'],
     setup() {
         let data: Ref<any> = ref(null)
         return {
@@ -15,8 +16,7 @@ export default {
     },
     async mounted() {
         try {
-            const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
-            const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/search?query=${this.$route.query.query}`)
+            const res = await fetch(`${this.protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/search?query=${this.$route.query.query}`)
             const rawData = await res.json()
 
             this.data = rawData.data
diff --git a/src/views/UserView.vue b/src/views/UserView.vue
index 876ee47..ce7048a 100644
--- a/src/views/UserView.vue
+++ b/src/views/UserView.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { ref } from 'vue'
+import { ref, inject } from 'vue'
 import { useRoute } from 'vue-router'
 import VideoPlayer from '@/components/VideoPlayer.vue'
 import TwitchChat from '@/components/TwitchChat.vue'
@@ -11,8 +11,8 @@ export default {
   async setup() {
     const route = useRoute()
     const username = route.params.username
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
     const data = ref()
+    const protocol = inject('protocol')
     const videoOptions = {
       autoplay: true,
       controls: true,
@@ -42,11 +42,10 @@ export default {
   },
   async mounted() {
     const username = this.$route.params.username
-    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
 
     try {
       const res = await fetch(
-        `${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/users/${username}`
+        `${this.protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/users/${username}`
       )
       const rawData = await res.json()
       if (rawData.status === 'ok') {