From 53836e4485f6a35a9bd617f37cd8c4b6beea4a69 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 06:34:40 +0000 Subject: [PATCH 01/80] chore(deps): update dependency @iconify/json to v2.1.125 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 36e7963c..0bae3010 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "xml-js": "1.6.11" }, "devDependencies": { - "@iconify/json": "2.1.124", + "@iconify/json": "2.1.125", "@intlify/vite-plugin-vue-i18n": "6.0.3", "@unocss/preset-icons": "0.45.30", "@unocss/preset-web-fonts": "0.45.30", diff --git a/yarn.lock b/yarn.lock index a7b8dd22..8746f3f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1005,10 +1005,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@iconify/json@2.1.124": - version "2.1.124" - resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.1.124.tgz#41b863ffd0c791217cbe29f43daadcef35a825aa" - integrity sha512-b8oQpGFiPOli65TB1deM5Pv4OGYIsN4T3+QBek85h9t+Ckae5lBg0aUVYm6lpC6FJ3iVlKU7DuPWXsqYVZdHyQ== +"@iconify/json@2.1.125": + version "2.1.125" + resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.1.125.tgz#cb7a4852339732ebc57eef3d35f388cead588931" + integrity sha512-szN6ws5FkP7oZnqkBXD+qfKbIEnNn8ubnYABtPMh9CyUVCnmCsD9s1iPlhqN1Do5Ykr9rlJYfwUd2uQFT7HlPw== dependencies: "@iconify/types" "*" pathe "^0.3.0" From d2b18ffbed362721ca2170a6981886db3d7930b3 Mon Sep 17 00:00:00 2001 From: talkor Date: Fri, 21 Oct 2022 22:51:32 +0300 Subject: [PATCH 02/80] fix: align like/dislike icons to center --- src/components/CommentItem.vue | 2 +- src/components/WatchVideo.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/CommentItem.vue b/src/components/CommentItem.vue index 3509ed17..f1caec1a 100644 --- a/src/components/CommentItem.vue +++ b/src/components/CommentItem.vue @@ -29,7 +29,7 @@
-
+
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue index d5312ef7..ca8a6f1a 100644 --- a/src/components/WatchVideo.vue +++ b/src/components/WatchVideo.vue @@ -47,11 +47,11 @@
diff --git a/src/locales/en.json b/src/locales/en.json index feb042c3..5370ac44 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -10,7 +10,9 @@ "playlists": "Playlists", "account": "Account", "instance": "Instance", - "player": "Player" + "player": "Player", + "livestreams": "Livestreams", + "channels": "Channels" }, "player": { "watch_on": "Watch on {0}" @@ -165,4 +167,4 @@ "copied": "Copied!", "cannot_copy": "Can't copy!" } -} +} \ No newline at end of file From 94def0723df37f4e66553789c9caf8694e755e03 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 1 Nov 2022 12:39:01 +0100 Subject: [PATCH 67/80] proper nextpage implementation --- src/components/ChannelPage.vue | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue index e5f07815..8b13ada4 100644 --- a/src/components/ChannelPage.vue +++ b/src/components/ChannelPage.vue @@ -139,16 +139,33 @@ export default { if (this.loading || !this.channel || !this.channel.nextpage) return; if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) { this.loading = true; - this.fetchJson(this.apiUrl() + "/nextpage/channel/" + this.channel.id, { - nextpage: this.channel.nextpage, - }).then(json => { - this.channel.nextpage = json.nextpage; - this.loading = false; - this.updateWatched(json.relatedStreams); - json.relatedStreams.map(stream => this.contentItems.push(stream)); - }); + if (this.selectedTab == 0) { + this.fetchChannelNextPage(); + } else { + this.fetchChannelTabNextPage(); + } } }, + fetchChannelNextPage() { + this.fetchJson(this.apiUrl() + "/nextpage/channel/" + this.channel.id, { + nextpage: this.channel.nextpage, + }).then(json => { + this.channel.nextpage = json.nextpage; + this.loading = false; + this.updateWatched(json.relatedStreams); + json.relatedStreams.map(stream => this.contentItems.push(stream)); + }); + }, + fetchChannelTabNextPage() { + this.fetchJson(this.apiUrl() + "/channels/tabs", { + data: this.tabs[this.selectedTab].data, + nextpage: this.tabNextPage, + }).then(json => { + this.tabNextPage = json.nextpage; + this.loading = false; + json.content.map(item => this.contentItems.push(item)); + }); + }, subscribeHandler() { if (this.authenticated) { this.fetchJson(this.authApiUrl() + (this.subscribed ? "/unsubscribe" : "/subscribe"), null, { @@ -185,6 +202,7 @@ export default { return translatedTabName; }, loadTab(index) { + this.selectedTab = index; if (index == 0) { this.contentItems = this.channel.relatedStreams; return; From 349b04834e52bb932c4bb21aa69cc6c6a6708730 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 1 Nov 2022 13:07:31 +0100 Subject: [PATCH 68/80] hightlight the current tab --- src/components/ChannelPage.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue index 8b13ada4..663a25b8 100644 --- a/src/components/ChannelPage.vue +++ b/src/components/ChannelPage.vue @@ -36,7 +36,13 @@
-
@@ -217,3 +223,9 @@ export default { }, }; + + From 16dcca8822f1178b7df2346534e52af1068b4bc4 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 1 Nov 2022 13:22:23 +0100 Subject: [PATCH 69/80] log untranslated tabs --- src/components/ChannelPage.vue | 3 +++ src/locales/en.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue index 663a25b8..b99e844a 100644 --- a/src/components/ChannelPage.vue +++ b/src/components/ChannelPage.vue @@ -204,6 +204,9 @@ export default { case "Shorts": translatedTabName = this.$t("video.shorts"); break; + default: + console.error(`Tab name "${tabName}" is not translated yet!`); + break; } return translatedTabName; }, diff --git a/src/locales/en.json b/src/locales/en.json index 5370ac44..9cef968d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -167,4 +167,4 @@ "copied": "Copied!", "cannot_copy": "Can't copy!" } -} \ No newline at end of file +} From 1ec8480351b2d0be60ad16cd2df80a9a4eff0121 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:12:54 +0000 Subject: [PATCH 70/80] Implement content item component. --- src/components/ChannelItem.vue | 34 ++++++++++++++ src/components/ChannelPage.vue | 2 +- src/components/ContentItem.vue | 77 ++++++++++++------------------- src/components/FeedPage.vue | 2 +- src/components/HistoryPage.vue | 2 +- src/components/PlaylistItem.vue | 34 ++++++++++++++ src/components/PlaylistPage.vue | 2 +- src/components/PlaylistVideos.vue | 2 +- src/components/SearchResults.vue | 2 +- src/components/TrendingPage.vue | 2 +- src/components/VideoItem.vue | 66 +++++++++++++------------- src/components/WatchVideo.vue | 8 ++-- 12 files changed, 142 insertions(+), 91 deletions(-) create mode 100644 src/components/ChannelItem.vue create mode 100644 src/components/PlaylistItem.vue diff --git a/src/components/ChannelItem.vue b/src/components/ChannelItem.vue new file mode 100644 index 00000000..84557629 --- /dev/null +++ b/src/components/ChannelItem.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue index b99e844a..8595483c 100644 --- a/src/components/ChannelPage.vue +++ b/src/components/ChannelPage.vue @@ -53,7 +53,7 @@ - -
- -
- -
-

- - -

- -

- -

- - -

- - - - - -
-
+ - diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue index 882196a6..8927a16c 100644 --- a/src/components/FeedPage.vue +++ b/src/components/FeedPage.vue @@ -18,7 +18,7 @@
- +
diff --git a/src/components/HistoryPage.vue b/src/components/HistoryPage.vue index f41c8a4a..a0b344d9 100644 --- a/src/components/HistoryPage.vue +++ b/src/components/HistoryPage.vue @@ -14,7 +14,7 @@
- +

diff --git a/src/components/PlaylistItem.vue b/src/components/PlaylistItem.vue new file mode 100644 index 00000000..84557629 --- /dev/null +++ b/src/components/PlaylistItem.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/components/PlaylistPage.vue b/src/components/PlaylistPage.vue index 37d505c9..bb42503a 100644 --- a/src/components/PlaylistPage.vue +++ b/src/components/PlaylistPage.vue @@ -32,7 +32,7 @@
diff --git a/src/components/TrendingPage.vue b/src/components/TrendingPage.vue index 589e856d..b51bf30b 100644 --- a/src/components/TrendingPage.vue +++ b/src/components/TrendingPage.vue @@ -4,7 +4,7 @@
- +
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue index b099d06b..66b0a44d 100644 --- a/src/components/VideoItem.vue +++ b/src/components/VideoItem.vue @@ -4,7 +4,7 @@ :to="{ path: '/watch', query: { - v: video.url.substr(-11), + v: item.url.substr(-11), ...(playlistId && { list: playlistId }), ...(index >= 0 && { index: index + 1 }), }, @@ -12,36 +12,36 @@ >
- + - +

@@ -51,14 +51,14 @@ :to="{ path: '/watch', query: { - v: video.url.substr(-11), + v: item.url.substr(-11), ...(playlistId && { list: playlistId }), ...(index >= 0 && { index: index + 1 }), listen: '1', }, }" - :aria-label="'Listen to ' + video.title" - :title="'Listen to ' + video.title" + :aria-label="'Listen to ' + item.title" + :title="'Listen to ' + item.title" > @@ -69,20 +69,20 @@ v-if="admin" :title="$t('actions.remove_from_playlist')" ref="removeButton" - @click="removeVideo(video.url.substr(-11))" + @click="removeVideo(item.url.substr(-11))" > - +
- + - - + + - - + + - + - - + +
@@ -124,7 +124,7 @@ import PlaylistAddModal from "./PlaylistAddModal.vue"; export default { props: { - video: { + item: { type: Object, default: () => { return {}; @@ -174,7 +174,7 @@ export default { if (!this.isFeed || !this.getPreferenceBoolean("hideWatched", false)) return; const objectStore = window.db.transaction("watch_history", "readonly").objectStore("watch_history"); - const request = objectStore.get(this.video.url.substr(-11)); + const request = objectStore.get(this.item.url.substr(-11)); request.onsuccess = event => { const video = event.target.result; if (video && (video.currentTime ?? 0) > video.duration * 0.9) { diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue index 2c820e0a..bf024eaa 100644 --- a/src/components/WatchVideo.vue +++ b/src/components/WatchVideo.vue @@ -200,10 +200,10 @@ />
- @@ -216,7 +216,7 @@