Merge pull request #260 from Frontesque/dev

Merge pr #259 from dev to main

.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:

NUXT/components/Comments/commentThreadRenderer.vue

@@ -54,10 +54,47 @@
           {{ 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 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>
 </template>
@@ -76,7 +113,6 @@
 
   .avatar-thumbnail {
     margin-right: 0.5rem;
-    margin-top: 0.5rem;
     border-radius: 50%;
     width: 48px;
     height: 48px;
@@ -100,6 +136,12 @@
   }
 }
 
+.toolbar {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
 .author-badge-name {
   display: flex;
   flex-direction: row;
@@ -123,6 +165,10 @@
     color: #fff;
   }
 }
+
+.toolbar--button::v-deep.v-btn--active .v-btn__content {
+  color: var(--v-primary-base);
+}
 </style>
 
 <script>
@@ -143,6 +189,7 @@ export default {
   data() {
     return {
       commentRenderer: null,
+      voteStatus: null,
     };
   },
 

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>

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>

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>

NUXT/pages/watch.vue

@@ -286,7 +286,7 @@ export default {
         this.cpn = getCpn();
         this.initWatchTime().then(() => {
           this.sendWatchTime();
-          this.interval = setInterval(this.sendWatchTime, 30000);
+          this.interval = setInterval(this.sendWatchTime, 60000);
         });
       });