Merge pull request #728 from HolodexNet/dev

Release 2.37
HolodexNet · Sep 24, 2023 · f90c8a6 · f90c8a6
2 parents 785c63b + a1c3deb
commit f90c8a6
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 73 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,8 +2,29 @@
 
 ##### Unreleased
 
-- Development of Vue3-powered Holodex (release 3.0 ?!?!) is underway... If you like to influence how it looks, now is the best time to let us know.
-- If you are a UI engineer and would like to contribute to Holodex, drop by the discord!
+- **Development of Vue3-powered Holodex (release 3.0 ?!?!) is completely scrapped**. We're making it in **react** instead. If you like to influence how it looks, now is the best time to let us know.
+- If you are a **React UI engineer/designer** and would like to contribute to Holodex, drop by our discord!
+
+### 2.37 Holodex & Musicdex [*September 24th, 2023*]
+
+#### Holodex
+
+- Thanks LiviaMedeiros for showing favorites' collabs in the side drawer, it looks sick!
+- Thanks INCENDE for a navigation history fix, let us know on discord if you hate it, since this kind of changes might change back button behavior.
+- Thanks BonnetPonta for a small UI fix.
+- New TRANSLATIONS <3 As always thank so much to all of our UI translators.
+
+#### Musicdex
+
+Woot, haven't released musicdex in a while right? Xrave totally forgot how to write react code, but at least our maintainers do!
+
+- Thanks P-man for a change on the playback bar and settings. These are awesome. He also fixed a queue last song loop issue, and layout on blank channels + background color on the full screen player.
+
+- Translations for various languages <3
+
+
+
+
 
 ### 2.36 Holodex [*August 12th, 2023*]
 

diff --git a/src/components/nav/NavDrawer.vue b/src/components/nav/NavDrawer.vue
@@ -99,9 +99,12 @@
           </v-list-item-avatar>
           <ChannelInfo :channel="vid.channel" no-subscriber-count no-group />
           <v-list-item-action-text v-if="vid.id" :key="'liveclock' + vid.id + tick">
-            <span :class="isLive(vid) ? 'ch-live' : 'ch-upcoming'">
+            <div :class="isLive(vid) ? 'ch-live' : 'ch-upcoming'">
+              <v-avatar v-if="vid.host_channel" :size="20">
+                <ChannelImg :channel="vid.host_channel" :size="20" />
+              </v-avatar>
               {{ formatDurationUpcoming(vid.available_at) }}
-            </span>
+            </div>
           </v-list-item-action-text>
         </v-list-item>
       </template>
@@ -202,19 +205,31 @@ export default {
             const fav = this.$store.state.favorites.favorites || [];
             try {
                 const favoritesSet = this.$store.getters["favorites/favoriteChannelIDs"];
+                const blockedSet = this.$store.getters["settings/blockedChannelIDs"];
                 const lives: Array<any> = this.$store.state.favorites.live;
                 const updateNotice = this.$store.state.favorites.lastLiveUpdate;
                 console.debug(`Updating favs: ${updateNotice}`);
 
-                const existingChs = {};
-                lives.forEach((x) => {
-                    if (favoritesSet.has(x.channel.id) && !existingChs[x.channel.id]) {
-                        existingChs[x.channel.id] = x;
-                    }
-                });
+                const existingChs = new Map();
+                lives
+                    .filter((x) => favoritesSet.has(x.channel.id))
+                    .forEach((x) => {
+                        if (!existingChs.has(x.channel.id)) {
+                            existingChs.set(x.channel.id, x)
+                        }
+                    });
+
+                // streams featuring favorites who aren't streaming themselves
+                lives
+                    .filter((x) => x.mentions?.length && !blockedSet.has(x.channel.id))
+                    .forEach((x) => x.mentions
+                        .filter(({ id }) => favoritesSet.has(id) && !existingChs.has(id) && !blockedSet.has(id))
+                        .forEach((m) => existingChs.set(m.id, { ...x, channel: m, host_channel: x.channel }))
+                    );
+
                 // remainder:
                 const extras = fav
-                    .filter((x) => !existingChs[x.id])
+                    .filter(({ id }) => !existingChs.has(id))
                     .map((ch) => ({
                         channel: ch,
                     }));
@@ -225,7 +240,7 @@ export default {
                     const name2 = b.channel[prop] || b.channel.name || "";
                     return name1.localeCompare(name2);
                 });
-                return [...Object.values(existingChs), ...extras];
+                return [...existingChs.values(), ...extras];
             } catch (e) {
                 console.error(e);
                 try {

diff --git a/src/locales/de-DE/ui.yml b/src/locales/de-DE/ui.yml
@@ -605,6 +605,7 @@ about:
       contents:
         '0': >-
           Unser selbst-gehosteter Server ist eine 28-Kern Maschine mit 60GB RAM, für welche Instandhaltungskosten von circa $60 USD pro Monat anfallen. Da wir mehr und mehr Features hinzufügen, haben wir ein <a href="https://ko-fi.com/holodex">Ko-fi</a> angelegt, um die Serverkosten zu decken. (<a href="https://www.patreon.com/holodex">Patreon</a> haben wir auch, aber Ko-fi gefällt uns besser.)<br /><br />Du kannst uns außerdem mit Feedback und Tweets unterstützen, uns mit der Übersetzung der Webseite via <a href="https://crwd.in/holodex">Crowdin</a> helfen, oder zu unserem Lied-Datenspeicher beitragen. Selbst das Kommentieren von Zeitstempeln lustiger Momente in den Stream-Kommentaren ist schon sehr hilfreich!
+  privacyPolicy: Datenschutzrichtlinien
   gdpr: DSGVO und meine Daten
   gdprContent: >-
     Ein Google-Analytics-Cookie wird verwendet, um Seitenaufrufe für unsere analytischen Zwecke zu verfolgen. Nach dem Anmelden verknüpfen wir deinen Benutzernamen und die ID deines Social Media Accounts mit deinen Favoriten. Diese Daten können deine E-Mail (für Google), deine Discord-ID oder dein Twitter-Handle beinhalten.

diff --git a/src/locales/es-ES/ui.yml b/src/locales/es-ES/ui.yml
@@ -117,9 +117,9 @@ component:
       - Dangerously Low Quality/Misleading Content
       - Violates the org's derivative work guidelines or inappropriate
       - Otros
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     neverShowAgain: No volver a mostrar la alerta
   playlist:
@@ -295,9 +295,9 @@ views:
       - Iniciar sesión con Discord
       - Iniciar sesión con Twitter
     usernameBtn:
-      - Change
+      - 
       - Confirmar
-      - Save
+      - 
   multiview:
     confirmOverwrite: '¿Sobrescribir el diseño actual?'
     confirmOverwriteYes: Confirmar
@@ -394,10 +394,10 @@ about:
       title: Soy un traductor y no encuentro mi canal o clips en Holodex
       contents:
         - >-
-          Please check on the Channels page to see if you are listed as a subber, if not please fill out
+
         - ', and we will add you manually. If you are already on the list, please make sure your video descriptions have the correct youtube source/channel links.'
         - >-
-          , and we will add you manually. If you are already on the list, please make sure your video descriptions have the correct youtube source/channel links.
+
     feedback:
       title: Tengo una idea/quiero ayudar en el proyecto
   gdpr: GDPR y mis datos

diff --git a/src/locales/es-MX/ui.yml b/src/locales/es-MX/ui.yml
@@ -126,9 +126,9 @@ component:
       - Contenido peligrosamente de baja calidad/engañoso
       - Viola las pautas del trabajo derivado de las org o inapropiado
       - Otros
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     explanation: >-
       Debido a cómo funciona tu navegador de internet, algunos navegadores con <b>políticas estrictas de Cookies de terceros</b>, o aquellos bloqueando las cookies de <kbd>YouTube.com</kbd> pueden encontrar difícil iniciar sesion o usar el chat de Youtube. <br /><br /> Puedes arreglar esto al agregar a <kbd>Youtube.com</kbd> a la lista blanca en los bloqueadores de Cookies de terceros, o bajando tu nivel de seguridad / privacidad para <kbd>Holodex.net</kbd>. <br /><br />Incluimos algunas páginas web que proveen más información sobre como hacer esto.

diff --git a/src/locales/fr-FR/ui.yml b/src/locales/fr-FR/ui.yml
@@ -112,9 +112,9 @@ component:
       - Contenu dangereux de faible qualité/trompeur
       - Viole les directives de travail de l'organisation ou inapproprié
       - Autre
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     explanation: >-
       En raison du fonctionnement de votre navigateur Internet, certains navigateurs avec des politiques strictes de <b>Cookie tiers</b> ou ceux qui bloquent les cookies de <kbd>YouTube.com</kbd> peuvent avoir du mal à se connecter / utiliser le chat YouTube. <br /><br /> Vous pouvez corriger cela en mettant sur la liste blanche <kbd>YouTube.com</kbd> dans les bloqueurs de cookies tiers, ou diminuant votre niveau de sécurité / confidentialité des cookies pour <kbd>Holodex.net</kbd>. <br /><br /> Nous avons inclus certains sites Web qui fournissent plus d'informations sur la façon de procéder.
@@ -302,9 +302,9 @@ views:
       - Se connecter avec Discord
       - Se connecter avec Twitter
     usernameBtn:
-      - Change
+      - 
       - Confirmer
-      - Save
+      - 
   multiview:
     confirmOverwrite: Remplacer la disposition actuelle ?
     confirmOverwriteYes: Confirmer
@@ -403,7 +403,7 @@ about:
         - >-
           Les favoris sont un moyen de voir vos vtubeurs préférés en priorité, vous pouvez ajouter vos chaînes en favoris en cliquant sur l'icône cœur sur le
         - >-
-          page. Please note that favoriting subbers is currently not supported, but you should still consider subscribing and supporting them in other ways!
+
       disappear:
         title: Mes favoris ont disparu / Je ne peux pas ajouter de favori
     mobile:
@@ -417,10 +417,10 @@ about:
       title: Je fais des clips et je ne trouve pas ma chaine ou mes clips sur Holodex
       contents:
         - >-
-          Please check on the Channels page to see if you are listed as a subber, if not please fill out
+
         - ', and we will add you manually. If you are already on the list, please make sure your video descriptions have the correct youtube source/channel links.'
         - >-
-          , and we will add you manually. If you are already on the list, please make sure your video descriptions have the correct youtube source/channel links.
+
     feedback:
       title: J'ai des retours/idées à donner pour le projet ou je veux aider
   gdpr: RGPD et mes données

diff --git a/src/locales/hu-HU/ui.yml b/src/locales/hu-HU/ui.yml
@@ -59,8 +59,6 @@ component:
     uploadScript: Fordítás script feltöltése
   videoDescription:
     description: Leírás
-  video:
-    comment: { }
   description:
     showLess: Kevesebb megjelenítése
     showMore: Továbbiak megjelenítése

diff --git a/src/locales/id-ID/ui.yml b/src/locales/id-ID/ui.yml
@@ -59,8 +59,6 @@ component:
     uploadScript: Unggah Naskah TL
   videoDescription:
     description: Deskripsi
-  video:
-    comment: { }
   description:
     showLess: Tampilkan lebih sedikit
     showMore: Tampilkan lebih banyak

diff --git a/src/locales/it-IT/ui.yml b/src/locales/it-IT/ui.yml
@@ -117,9 +117,9 @@ component:
       - Contenuti di estrema Bassa Qualità/Fuorvianti
       - Viola le linee guida di opere derivate o è inappropriato
       - Altro
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     explanation: >-
       A causa del modo in cui funziona il tuo internet browser, alcuni browser con rigide <b>politiche sui cookie di terze parti</b>, o quelli che bloccano <kbd>YouTube.com</kbd> i cookie potrebbero avere difficoltà ad accedere / usare la chat di Youtube. <br /><br /> È possibile risolvere questo problema inserendo <kbd>Youtube. om</kbd> nella whitelist del "blocca Cookie di terze parti", o diminuendo il livello di sicurezza dei cookie / della privacy per <kbd>Holodex. et</kbd>. <br /><br /> Abbiamo incluso alcuni siti web che forniscono ulteriori informazioni su come poterlo fare.
@@ -310,9 +310,9 @@ views:
       - Accedi con Discord
       - Accedi con Twitter
     usernameBtn:
-      - Change
+      - 
       - Conferma
-      - Save
+      - 
   multiview:
     confirmOverwrite: Sovrascrivere il layout attuale?
     confirmOverwriteYes: Conferma

diff --git a/src/locales/ja-JP/ui.yml b/src/locales/ja-JP/ui.yml
@@ -130,9 +130,9 @@ component:
       - これはミスリードを引き起こす、または低クオリティなコンテンツです。
       - これは二次創作ガイドラインに違反している、もしくは不適切なコンテンツです
       - その他
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     explanation: >-
       ブラウザの<b>サードパーティー Cookie</b>ポリシーによる場合や<kbd>Youtube.com</kbd>でのCookieをブロックしている場合にはYoutubeライブチャットへのログインが難しい、もしくは不可能な場合があります。 <br /><br />これはサードパーティーCookieのホワイトリストに<kbd>Youtube.com</kbd>を追加するか、ブラウザの設定から<kbd>Holodex.net</kbd>でのプライバシー設定を低レベルのものに設定することにより解決可能な場合があります。<br /><br />それに関する詳しい情報を提供しているサイトをいくつか紹介しています。
@@ -265,6 +265,7 @@ views:
     hideCollabStreamsLabel: コラボ配信を表示しない
     hideCollabStreamsMsg: お気に入りページでコラボ配信を非表示にします
     hidePlaceholderStreams: プレースホルダーの配信を隠す
+    hideMissingStreams: 非公開の配信を隠す
     ignoredTopicsLabel: 除外するトピック
     ignoredTopicsMsg: これらのトピックの動画はホームとお気に入りに表示されなくなります
     theme: テーマ

diff --git a/src/locales/ko-KR/ui.yml b/src/locales/ko-KR/ui.yml
@@ -605,6 +605,7 @@ about:
       contents:
         '0': >-
           저희의 자체 호스팅 서버는 운영비가 월 60달러인 28코어 60GB 램 서버로, 기능들을 점점 더 확장하려고 하여 서버 비용을 충당하기 위해 <a href="https://ko-fi.com/holodex">Ko-fi</a>를 시작했습니다. (<a href="https://www.patreon.com/holodex">Patreon</a>도 있지만, 저희는 Ko-fi를 더 선호합니다.)<br /><br />또한 트위터에 피드백과 응원의 메시지를 보내주시고, <a href="https://crwd.in/holodex">Crowdin</a>을 통해 번역을 도우실 뿐만 아니라, 음악 데이터 저장소에도 기여함으로써 Holodex를 지원할 수 있습니다. 심지어 방송에서 재미있는 부분의 시간을 지정하여, 지정한 시간을 원래 방송 댓글에 다는 것만으로도 큰 도움이 됩니다!
+  privacyPolicy: 개인정보 취급방침
   gdpr: GDPR과 내 데이터
   gdprContent: >-
     Google Analytics 쿠키는 페이지뷰 추적을 위해 분석 목적으로 사용됩니다. 로그인 이후에 우리는 소셜 미디어 계정 사용자명과 아이디를 즐겨찾기와 연결시킵니다. 이 데이터에는 (Google) 이메일, Discord ID, 또는 Twitter 아이디가 포함될 수 있습니다.

diff --git a/src/locales/lol-PEKO/ui.yml b/src/locales/lol-PEKO/ui.yml
@@ -88,13 +88,13 @@ component:
     comments: What do next?
     success: Send repolt thanks you!!!
     reasons:
-      - Video tagged incorrectly
-      - Dangerously Low Quality/Misleading Content
-      - Violates the org's derivative work guidelines or inappropriate
+      - 
+      - 
+      - 
       - ader
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - 
+      - 
+      - 
   thirdpartycookie:
     dialogTitle: holodex in youtube chatto
   playlist:
@@ -216,9 +216,9 @@ views:
       - Disucodo de login peko
       - Twitter de login peko
     usernameBtn:
-      - Change
+      - 
       - "Yes"
-      - Save
+      - 
   multiview:
     confirmOverwriteYes: "Yes"
     permalink: paamarink

diff --git a/src/locales/lol-UWU/ui.yml b/src/locales/lol-UWU/ui.yml
@@ -605,6 +605,7 @@ about:
       contents:
         '0': >-
           Ouw sewf-hosted sewvew ish a 28-cowe 60gb ram machine that take about $60 usd / mo to wun, and we'we wooking to expanding mowe and mowe in ouw featuwe set, so we've stawted a <a href="https://ko-fi.com/holodex">ko-fi</a> to covew sewvew costs. (we awso have a <a href="https://www.patreon.com/holodex">patweon</a>, but we wike da ko-fi bettew.)<br /><br />you can awso suppowt howodex by giving us feedback and suppowtive messages on twittew, hewping us twanswate via <a href="https://crwd.in/holodex">cwowdin</a>, as weww as contwibuting to ouw data stowe of songs. Even timing a stweam fow funny pawts, and commenting that on da owiginaw stweam ish gweat hewp!
+  privacyPolicy: Pwyvacy powicy
   gdpr: Gdpr and my data
   gdprContent: >-
     A googwe anawytics cookie ish used to twack pageviews fow ouw anawyticaw puwposes. Aftew wogin, we associate youw sociaw media account usewname and id with youw favowites. Dis data may incwude youw emaiw (fow googwe), discowd id, ow twittew handwe wespectivewy.

diff --git a/src/locales/ms-MY/ui.yml b/src/locales/ms-MY/ui.yml
@@ -59,6 +59,8 @@ component:
     uploadScript: Muat Naik Skrip Terjemahan
   videoDescription:
     description: Perihalan
+  video:
+    comment: { }
   description:
     showLess: Tunjukkan Kurang
     showMore: Tunjukkan Lagi
@@ -125,14 +127,15 @@ component:
       Ada kemungkinan saluran ini bersiarsama dengan ahli {org} atau mana-mana penggiat YouTube kegemaranmu. Saluran ini boleh disembunyikan di laman tetapan
     comments: Apakah tindakan selanjutnya?
     success: Terima kasih! Laporan telah dikirim.
+    consider: Sebaiknya gunakan penapis dan batalkan laporan ini.
     reasons:
       - Video tidak ditandai dengan betul
       - Kandungan video tidak bermutu atau mengelirukan
       - Melanggar garis panduan pertubuhan terbabit atau memaparkan kandungan yang tidak bersesuaian
       - Lain-lain
-      - Incorrect video topic
-      - Incorrect channel mentions
-      - This {0} does not belong to {1}
+      - Kesalahan topik video
+      - Kesalahan penyebutan nama saluran
+      - '{0} ini tidak ada kaitannya dengan {1}'
   thirdpartycookie:
     explanation: >-
       Sesetengah penyemak imbas dengan dasar <b>cecikut pihak ketiga</b> yang ketat ataupun yang menyekat cecikut <kbd>YouTube.com</kbd> berkebarangkalian menghadapi kesukaran mengelog masuk mahupun menggunakan sembang langsung Youtube. <br /><br /> Masalah ini boleh diselesaikan dengan memasukkan <kbd>Youtube.com</kbd> ke dalam senarai putih penyekat cecikut pihak ketiga ataupun menggunakan tahap tetapan keselamatan cecikut yang rendah bagi <kbd>Holodex.net</kbd>. <br /><br /> Berikut disertakan sekali beberapa tapak sesawang yang boleh memberikan maklumat lanjut berkenaan langkah-langkah yang harus dilakukan.
@@ -602,6 +605,7 @@ about:
       contents:
         '0': >-
           Perkakas yang merumahkan laman kami secara sendiri ini mempunyai RAM sebanyak 60GB dengan 28 teras serta memakan belanja sebanyak 60 dolar AS (kira-kira RM250 / B$80 / S$80 / Rp 850.000) per bulan. Tambahan lagi, kami merancang mahu mengembangkan ciri-ciri yang disediakan. Oleh itu, kami sedang menerima sumbangan daripada para pengunjung melalui <a href="https://ko-fi.com/holodex">Ko-fi</a> demi menampung pembiayaan pelayan kami. (Sumbangan juga boleh diberikan melalui <a href="https://www.patreon.com/holodex">Patreon</a>, namun kami lebih menggemari Ko-fi.)<br /><br />Sumbangan lain yang diterima termasuklah maklum balas dan kata-kata semangat di Twitter, penerjemahan laman melalui <a href="https://crwd.in/holodex">Crowdin</a> dan juga sumbangan simpanan data lagu. Sekecil-kecil sumbangan pun amatlah dihargai! Contohnya, menghitung detik-detik yang menarik dan menghiburkan lalu meletakkan ulasan bercap masa di siaran asal.
+  privacyPolicy: Dasar Kebersendirian
   gdpr: Adakah data saya dikendalikan sejajar dengan Peraturan Perlindungan Data Umum?
   gdprContent: >-
     Sebuah cecikut Google Analitis digunakan bagi mengesan bilangan kunjungan laman untuk tujuan-tujuan pencerakinan. Akaun yang berdaftar dengan akaun media sosial dan pengecamnya dikaitkan dengan kandungan kegemaran anda. Data ini boleh merangkumi e-mel Google, pengecam Discord atau nama kendalian Twitter.