From e31b06a5b795ad2792efd59be5da0b07a58bf985 Mon Sep 17 00:00:00 2001
From: Affan Zaman <47723802+afnzmn@users.noreply.github.com>
Date: Thu, 21 Apr 2022 02:40:10 -0400
Subject: [PATCH 1/5] Readjusted headers weights

Uh I messed it up last time and its been bothering me since
---
 readme.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/readme.md b/readme.md
index 3da8501..1847d0f 100644
--- a/readme.md
+++ b/readme.md
@@ -26,18 +26,18 @@ Pronounced View Tube (<code>/ˈvjuːˌtjuːb/</code>)
   <a href="https://t.me/VueTube" alt="Telegram"><img src="https://img.shields.io/endpoint?color=neon&style=flat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fvuetube"></img></a>
   <a href="https://discord.gg/7P8KJrdd5W" alt="Discord"><img src="https://img.shields.io/discord/946587366242533377?label=Discord&style=flat&logo=discord&logoColor=white"></img></a>
 
-# Features
+## Features
 
 - 🎨 Themes: Light, Dark, OLED, All the colors of the rainbow
 - 🖌️ Customizable UI: You can fully customize the accent color, and other parts of the UI to remove features that you don't use!
 - ⬆️ Auto Update: Be notified when an update is available & downgrade if you dislike it!
 - 👁️ Tracking Protection: No telemetry is sent from your device to YouTube
 
-# Install
+## Install
 
 To install please visit www.vuetube.app/install
 
-# Plans
+## Plans
 
 - 🔍 Advanced Search
 - 🗞️ Locally store watch history
@@ -47,25 +47,25 @@ To install please visit www.vuetube.app/install
 - 🖼️ Picture in picture mode
 - and more!
 
-# Screenshots
+## Screenshots
 
 View on our website: [https://vuetube.app/info/screenshots](https://vuetube.app/info/screenshots)
 
-## Technologies used
+### Technologies used
 
 <a href="https://capacitorjs.com/solution/vue"><img src="https://cdn.discordapp.com/attachments/953538236716814356/955694368742834176/Capacitator-Dark.svg" height=40/></a> <a href="https://vuetifyjs.com/"><img src="https://cdn.discordapp.com/attachments/953538236716814356/955694368956760074/Vuetify-Dark.svg" height=40/></a> <a href="https://nuxtjs.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/NuxtJS-Dark.svg" height=40/></a> <a href="https://vuejs.org/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/VueJS-Dark.svg" height=40/></a> <a href="https://javascript.com/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/JavaScript.svg" height=40/></a> <a href="https://java.com/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Java-Dark.svg" height=40/></a> <a href="https://gradle.com/"><img src="https://cdn.discordapp.com/attachments/810799100940255260/955691550560636958/Gradle.svg" height=40/></a> <a href="https://developer.apple.com/swift/"><img src="https://github.com/tandpfun/skill-icons/raw/main/icons/Swift.svg" height=40/></a>
 
-## Why am I doing this?
+### Why am I doing this?
 
 Well this has been thrown around on the Return Youtube Dislike discord server for quite some time, so I figured that I should probably take a crack at it!
 
 Also, YouTube Vanced just shut down
 
-## Want to contribute?
+### Want to contribute?
 
 Please read our website on how to do so: https://vuetube.app/contributing
 
-# Contributors
+## Contributors
 
 <a href="https://github.com/Frontesque/VueTube/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=Frontesque/VueTube" />
@@ -73,7 +73,7 @@ Please read our website on how to do so: https://vuetube.app/contributing
 
 <sub>Made with [contrib.rocks](https://contrib.rocks). </sub>
 
-# Acknowledgements
+## Acknowledgements
 
 - Emojis by the [Twemoji team](https://twemoji.twitter.com/), Licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
 - VueTube Logo by [@afnzmn](https://github.com/afnzmn)

From 52d8ffde6c7ced97291611830427308e0030b70f Mon Sep 17 00:00:00 2001
From: Alex <56329333+404-Program-not-found@users.noreply.github.com>
Date: Thu, 21 Apr 2022 22:56:27 +1200
Subject: [PATCH 2/5] added the dev branch to auto builds

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ab7744..14b2b3b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
 
 env:
   NODE_VERSION: 16

From 6610f5048a05c51c9acdb0025b31850a10750ef6 Mon Sep 17 00:00:00 2001
From: Alex <56329333+404-Program-not-found@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:07:14 +1200
Subject: [PATCH 3/5] Update nightly-release.yml

---
 .github/workflows/nightly-release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index fadf9fa..ae28077 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -1,12 +1,10 @@
-# This is a basic workflow to help you get started with Actions
-
 name: nightly-release
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
+  # Triggers the workflow on on a schedule
   schedule:
-    # Runs "at minute 55 past every hour" (see https://crontab.guru)
+    # Runs "at 0:00 UTC every day" (see https://crontab.guru)
     - cron: '0 0 * * *'
 
   # Allows you to run this workflow manually from the Actions tab
@@ -26,6 +24,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          ref: main
       - name: Set up Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v2
         with:

From a075c4167aaa610100a432789f9d13377ec3fb9a Mon Sep 17 00:00:00 2001
From: Alex <alex.tyshang@gmail.com>
Date: Fri, 22 Apr 2022 16:38:21 +1200
Subject: [PATCH 4/5] fix: URL loading broke

---
 .../Comments/commentThreadRenderer.vue        | 30 ++++++++++++++++++-
 .../UtilRenderers/YtTextFormatter.vue         | 15 ++++++++--
 .../slimVideoDescriptionRenderer.vue          | 10 -------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/NUXT/components/Comments/commentThreadRenderer.vue b/NUXT/components/Comments/commentThreadRenderer.vue
index 7b8c37c..08ca44e 100644
--- a/NUXT/components/Comments/commentThreadRenderer.vue
+++ b/NUXT/components/Comments/commentThreadRenderer.vue
@@ -58,6 +58,29 @@
         <yt-text-formatter :textRuns="commentRenderer.contentText.runs">
         </yt-text-formatter>
       </collapsable-text>
+      <div class="toolbar">
+        <div class="toolbar--item">
+          <v-btn class="toolbar--button like" disabled icon x-small>
+            <v-icon small left>mdi-thumb-up</v-icon>
+          </v-btn>
+        </div>
+        <div class="toolbar--item">
+          <span
+            v-text="commentRenderer.voteCount.simpleText"
+            class="like-count mr-1 subtitle-2"
+          ></span>
+        </div>
+        <div class="toolbar--item">
+          <v-btn class="toolbar--button dislike" disabled icon x-small>
+            <v-icon small>mdi-thumb-down</v-icon>
+          </v-btn>
+        </div>
+        <div class="toolbar--item">
+          <v-btn class="toolbar--button reply" disabled icon x-small>
+            <v-icon small>mdi-comment</v-icon>
+          </v-btn>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -76,7 +99,6 @@
 
   .avatar-thumbnail {
     margin-right: 0.5rem;
-    margin-top: 0.5rem;
     border-radius: 50%;
     width: 48px;
     height: 48px;
@@ -100,6 +122,12 @@
   }
 }
 
+.toolbar {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
 .author-badge-name {
   display: flex;
   flex-direction: row;
diff --git a/NUXT/components/UtilRenderers/YtTextFormatter.vue b/NUXT/components/UtilRenderers/YtTextFormatter.vue
index 3b2b988..29c81d5 100644
--- a/NUXT/components/UtilRenderers/YtTextFormatter.vue
+++ b/NUXT/components/UtilRenderers/YtTextFormatter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="yt-text-formatter" v-emoji>
+  <div class="yt-text-formatter">
     <template v-for="(text, index) in textRuns">
       <template v-if="$rendererUtils.checkInternal(text)">
         <a
@@ -31,12 +31,15 @@
           draggable="false"
         />
       </template>
-      <template v-else> {{ text.text }} </template>
+      <template v-else>
+        <span :key="index" v-emoji>{{ text.text }}</span>
+      </template>
     </template>
   </div>
 </template>
 
 <script>
+import { Browser } from "@capacitor/browser";
 export default {
   props: {
     textRuns: {
@@ -44,5 +47,13 @@ export default {
       default: () => [],
     },
   },
+  methods: {
+    async openExternal(url) {
+      await Browser.open({ url: url });
+    },
+    async openInternal(url) {
+      await this.$router.push(url);
+    },
+  },
 };
 </script>
diff --git a/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue b/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue
index 29fa64f..32c7bc9 100644
--- a/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue
+++ b/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue
@@ -12,7 +12,6 @@
 </style>
 
 <script>
-import { Browser } from "@capacitor/browser";
 import YtTextFormatter from "~/components/UtilRenderers/YtTextFormatter.vue";
 
 export default {
@@ -21,14 +20,5 @@ export default {
   components: {
     YtTextFormatter,
   },
-
-  methods: {
-    async openExternal(url) {
-      await Browser.open({ url: url });
-    },
-    async openInternal(url) {
-      await this.$router.push(url);
-    },
-  },
 };
 </script>

From 6d47e9712138afe7091e9a8887fc6596e51d399a Mon Sep 17 00:00:00 2001
From: Alex <alex.tyshang@gmail.com>
Date: Fri, 22 Apr 2022 21:06:31 +1200
Subject: [PATCH 5/5] fix: small stylistic changes on the comments

---
 .../Comments/commentThreadRenderer.vue        | 55 +++++++++++++------
 .../UtilRenderers/collapsableText.vue         |  3 +-
 NUXT/pages/watch.vue                          |  2 +-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/NUXT/components/Comments/commentThreadRenderer.vue b/NUXT/components/Comments/commentThreadRenderer.vue
index 08ca44e..f82c9f8 100644
--- a/NUXT/components/Comments/commentThreadRenderer.vue
+++ b/NUXT/components/Comments/commentThreadRenderer.vue
@@ -54,32 +54,46 @@
           {{ commentRenderer.publishedTimeText.runs[0].text }}
         </span>
       </div>
-      <collapsable-text :lines="4">
+      <collapsable-text
+        :lines="4"
+        :expandText="
+          commentRenderer.expandButton.buttonRenderer.text.runs[0].text
+        "
+        :collapseText="
+          commentRenderer.collapseButton.buttonRenderer.text.runs[0].text
+        "
+      >
         <yt-text-formatter :textRuns="commentRenderer.contentText.runs">
         </yt-text-formatter>
       </collapsable-text>
       <div class="toolbar">
+        <v-btn-toggle v-model="voteStatus" group>
+          <div class="toolbar--item">
+            <v-btn class="toolbar--button like" disabled icon x-small plain>
+              <v-icon small>mdi-thumb-up</v-icon>
+            </v-btn>
+            <span
+              v-text="commentRenderer.voteCount.simpleText"
+              class="like-count mr-1 subtitle-2"
+            ></span>
+          </div>
+          <div class="toolbar--item">
+            <v-btn class="toolbar--button dislike" disabled icon x-small plain>
+              <v-icon small>mdi-thumb-down</v-icon>
+            </v-btn>
+          </div>
+        </v-btn-toggle>
         <div class="toolbar--item">
-          <v-btn class="toolbar--button like" disabled icon x-small>
-            <v-icon small left>mdi-thumb-up</v-icon>
-          </v-btn>
-        </div>
-        <div class="toolbar--item">
-          <span
-            v-text="commentRenderer.voteCount.simpleText"
-            class="like-count mr-1 subtitle-2"
-          ></span>
-        </div>
-        <div class="toolbar--item">
-          <v-btn class="toolbar--button dislike" disabled icon x-small>
-            <v-icon small>mdi-thumb-down</v-icon>
-          </v-btn>
-        </div>
-        <div class="toolbar--item">
-          <v-btn class="toolbar--button reply" disabled icon x-small>
+          <v-btn class="toolbar--button reply ml-2" disabled icon x-small plain>
             <v-icon small>mdi-comment</v-icon>
           </v-btn>
         </div>
+        <div class="toolbar--item" v-if="commentRenderer.replyCount">
+          <span
+            v-text="commentRenderer.replyCount"
+            class="like-count mr-1 subtitle-2"
+          ></span>
+        </div>
       </div>
     </div>
   </div>
@@ -151,6 +165,10 @@
     color: #fff;
   }
 }
+
+.toolbar--button::v-deep.v-btn--active .v-btn__content {
+  color: var(--v-primary-base);
+}
 </style>
 
 <script>
@@ -171,6 +189,7 @@ export default {
   data() {
     return {
       commentRenderer: null,
+      voteStatus: null,
     };
   },
 
diff --git a/NUXT/components/UtilRenderers/collapsableText.vue b/NUXT/components/UtilRenderers/collapsableText.vue
index 7b2be6c..be7f80d 100644
--- a/NUXT/components/UtilRenderers/collapsableText.vue
+++ b/NUXT/components/UtilRenderers/collapsableText.vue
@@ -8,8 +8,9 @@
       <slot></slot>
     </div>
     <a
-      class="toggle-collapse"
+      class="toggle-collapse background--text font-weight-bold"
       @click="expanded = !expanded"
+      :class="$vuetify.theme.dark ? 'text--lighten-4' : 'text--darken-4'"
       v-if="expandable"
       v-text="expanded ? collapseText : expandText"
     ></a>
diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue
index 050fe89..99e4434 100644
--- a/NUXT/pages/watch.vue
+++ b/NUXT/pages/watch.vue
@@ -284,7 +284,7 @@ export default {
         this.cpn = getCpn();
         this.initWatchTime().then(() => {
           this.sendWatchTime();
-          this.interval = setInterval(this.sendWatchTime, 30000);
+          this.interval = setInterval(this.sendWatchTime, 60000);
         });
       });