From 4006d5232b15836191320d72890272707292b7f0 Mon Sep 17 00:00:00 2001 From: IceDBorn <51162078+IceDBorn@users.noreply.github.com> Date: Thu, 2 Sep 2021 13:28:32 +0300 Subject: [PATCH 01/14] Restyle video item (#401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove 'views' text - add '•' between views and time ago - make views and time ago a one liner - add uploader avatar beside channel name * Remove uploader image beside channel name * change video channel layout * Fix title margin when there is no img source - shrink avatar size - add router-link for avatar - remove padding from title * Finalize video item styling Co-authored-by: jim3692 --- src/components/VideoItem.vue | 50 +++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue index 9c8bc883..e25c8816 100644 --- a/src/components/VideoItem.vue +++ b/src/components/VideoItem.vue @@ -23,38 +23,46 @@ >Watched -

{{ video.title }}

+ +
+

{{ video.title }}

+
-
-
+
+ + + +
+ +
+ + + + +
{{ video.uploaderName }}  -
-
-
- -
- - {{ numberFormat(video.views) }} views
+ + + + + {{ numberFormat(video.views) }} • + + + {{ video.uploadedDate }} + + + {{ timeAgo(video.uploaded) }} + +
-
- {{ video.uploadedDate }} -
-
- {{ timeAgo(video.uploaded) }} -
- -
- - -
From 35f9ac0a9988be032678674f0f2d5ee16e3332d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 04:11:06 +0000 Subject: [PATCH 02/14] Bump @vue/compiler-sfc from 3.2.6 to 3.2.7 Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.6 to 3.2.7. - [Release notes](https://github.com/vuejs/vue-next/releases) - [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-next/commits/v3.2.7/packages/compiler-sfc) --- updated-dependencies: - dependency-name: "@vue/compiler-sfc" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 66 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index e80a2073..b16d04fd 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@vue/cli-plugin-eslint": "^4.5.13", "@vue/cli-plugin-pwa": "^4.5.13", "@vue/cli-service": "^4.5.13", - "@vue/compiler-sfc": "3.2.6", + "@vue/compiler-sfc": "3.2.7", "babel-eslint": "^10.1.0", "eslint": "^7.32.0", "eslint-plugin-vue": "^7.17.0" diff --git a/yarn.lock b/yarn.lock index 8ba8ccb2..a63eaf5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1524,6 +1524,17 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.7.tgz#a7f1f87d4fae8c78d95a3d3df81bde663427deb8" + integrity sha512-OcWy72QNTkcNYtZIb927pRx2cRujrlDWsAx7ejWDnRzwo83gIyF8NeTrMv/7wbnHoeA+Gga9AK4Wo9PlCzhuLg== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@vue/shared" "3.2.7" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.6": version "3.2.6" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.6.tgz#3764d7fe1a696e39fb2a3c9d638da0749e369b2d" @@ -1532,19 +1543,27 @@ "@vue/compiler-core" "3.2.6" "@vue/shared" "3.2.6" -"@vue/compiler-sfc@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.6.tgz#d6ab7410cff57081ab627b15a1ea51a1072c7cf1" - integrity sha512-Ariz1eDsf+2fw6oWXVwnBNtfKHav72RjlWXpEgozYBLnfRPzP+7jhJRw4Nq0OjSsLx2HqjF3QX7HutTjYB0/eA== +"@vue/compiler-dom@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.7.tgz#33abaeef89ec653e1a733143d4f7b6392def3de8" + integrity sha512-YZyZNoZlTbTMqyY8QMC8IhwmcDVOiE1DdVwjnXbyihg+XVqpGQkDjNcG5nyMTbtZDKXREsYkcjaZntEfKyWK5g== + dependencies: + "@vue/compiler-core" "3.2.7" + "@vue/shared" "3.2.7" + +"@vue/compiler-sfc@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.7.tgz#6ee803b7d5d375138fe86124b9c161eebbbc0f0d" + integrity sha512-qjfvRw7/9Q2Qm4cDmrJwTNqnFTXSSI3z/mmS9BSJTYZqh4FC4w+IIYYLWUpS3ef6UTTYY9STC5IUZqfpIod9Uw== dependencies: "@babel/parser" "^7.15.0" "@babel/types" "^7.15.0" "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.6" - "@vue/compiler-dom" "3.2.6" - "@vue/compiler-ssr" "3.2.6" - "@vue/ref-transform" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-core" "3.2.7" + "@vue/compiler-dom" "3.2.7" + "@vue/compiler-ssr" "3.2.7" + "@vue/ref-transform" "3.2.7" + "@vue/shared" "3.2.7" consolidate "^0.16.0" estree-walker "^2.0.2" hash-sum "^2.0.0" @@ -1556,13 +1575,13 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.6.tgz#cadcf199859fa00739f4275b4c85970e4b0abe7d" - integrity sha512-A7IKRKHSyPnTC4w1FxHkjzoyjXInsXkcs/oX22nBQ+6AWlXj2Tt1le96CWPOXy5vYlsTYkF1IgfBaKIdeN/39g== +"@vue/compiler-ssr@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.7.tgz#30a4cb128eb7b67be551b22889c58f1288586673" + integrity sha512-4moQTeMujIk+fG8NaMxU5aPhMCnWE+O3xNEK6+kd9GjNoN+n3y3YZ6CkVy+aOP2HpqWenZbS/20TBzOSdon5Cw== dependencies: - "@vue/compiler-dom" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-dom" "3.2.7" + "@vue/shared" "3.2.7" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": version "3.2.2" @@ -1597,14 +1616,14 @@ dependencies: "@vue/shared" "3.2.6" -"@vue/ref-transform@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.6.tgz#30b5f1fa77daf9894bc23e6a5a0e3586a4a796b8" - integrity sha512-ie39+Y4nbirDLvH+WEq6Eo/l3n3mFATayqR+kEMSphrtMW6Uh/eEMx1Gk2Jnf82zmj3VLRq7dnmPx72JLcBYkQ== +"@vue/ref-transform@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.7.tgz#1028708a44e1926f05e2967719a3481911c03c2f" + integrity sha512-5I7IeUqoDEhPmkPHBhw7YlsFCFO/ZXHWwgdrokQATyVRkEkqeAd8erthuZ9a4sZAo5JBYmxjYw8WD9Kx9mabmg== dependencies: "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-core" "3.2.7" + "@vue/shared" "3.2.7" estree-walker "^2.0.2" magic-string "^0.25.7" @@ -1630,6 +1649,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.6.tgz#2c22bae88fe2b7b59fa68a9c9c4cd60bae2c1794" integrity sha512-uwX0Qs2e6kdF+WmxwuxJxOnKs/wEkMArtYpHSm7W+VY/23Tl8syMRyjnzEeXrNCAP0/8HZxEGkHJsjPEDNRuHw== +"@vue/shared@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.7.tgz#c792bf92d19025e7940358536d468218a11eeedb" + integrity sha512-YwGOcNZjOY/MmadpzFBXWyHEwZSf0lVU4XF5zpD7tXC9dmqjdo38Jkk06wATu4LYHDPW4emXKMB5YLFPWPkwFA== + "@vue/web-component-wrapper@^1.2.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" From cf5a953714d47123a63644dcaaf0d7b5dcb2874b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 04:10:08 +0000 Subject: [PATCH 03/14] Bump core-js from 3.16.4 to 3.17.1 Bumps [core-js](https://github.com/zloirock/core-js) from 3.16.4 to 3.17.1. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.16.4...v3.17.1) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b16d04fd..5d1cabf2 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/vue-fontawesome": "^3.0.0-4", - "core-js": "3.16.4", + "core-js": "3.17.1", "css-loader": "^6.2.0", "dompurify": "^2.3.1", "hotkeys-js": "^3.8.7", diff --git a/yarn.lock b/yarn.lock index a63eaf5e..ff912219 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3007,10 +3007,10 @@ core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5: browserslist "^4.16.8" semver "7.0.0" -core-js@3.16.4, core-js@^3.6.5: - version "3.16.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0" - integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg== +core-js@3.17.1, core-js@^3.6.5: + version "3.17.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277" + integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA== core-js@^2.4.0: version "2.6.12" From a159ac30dd58f8591c46efc9520f127c02d5c30c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 10:53:12 +0000 Subject: [PATCH 04/14] Bump vue from 3.2.6 to 3.2.7 Bumps [vue](https://github.com/vuejs/vue) from 3.2.6 to 3.2.7. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/commits) --- updated-dependencies: - dependency-name: vue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 72 ++++++++++++++++++---------------------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 5d1cabf2..fba5b4b9 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "register-service-worker": "^1.7.1", "shaka-player": "3.2.0", "uikit": "3.7.2", - "vue": "^3.1.5", + "vue": "^3.2.7", "vue-i18n": "^9.1.7", "vue-router": "^4.0.11", "xml-js": "^1.6.11" diff --git a/yarn.lock b/yarn.lock index ff912219..412c03b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1513,17 +1513,6 @@ semver "^6.1.0" strip-ansi "^6.0.0" -"@vue/compiler-core@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.6.tgz#7162bb0670273f04566af0d353009187ab577915" - integrity sha512-vbwnz7+OhtLO5p5i630fTuQCL+MlUpEMTKHuX+RfetQ+3pFCkItt2JUH+9yMaBG2Hkz6av+T9mwN/acvtIwpbw== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@vue/shared" "3.2.6" - estree-walker "^2.0.2" - source-map "^0.6.1" - "@vue/compiler-core@3.2.7": version "3.2.7" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.7.tgz#a7f1f87d4fae8c78d95a3d3df81bde663427deb8" @@ -1535,14 +1524,6 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.6.tgz#3764d7fe1a696e39fb2a3c9d638da0749e369b2d" - integrity sha512-+a/3oBAzFIXhHt8L5IHJOTP4a5egzvpXYyi13jR7CUYOR1S+Zzv7vBWKYBnKyJLwnrxTZnTQVjeHCgJq743XKg== - dependencies: - "@vue/compiler-core" "3.2.6" - "@vue/shared" "3.2.6" - "@vue/compiler-dom@3.2.7": version "3.2.7" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.7.tgz#33abaeef89ec653e1a733143d4f7b6392def3de8" @@ -1609,12 +1590,12 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== -"@vue/reactivity@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.6.tgz#b8993fa6f48545178e588e25a9c9431a1c1b7d50" - integrity sha512-8vIDD2wpCnYisNNZjmcIj+Rixn0uhZNY3G1vzlgdVdLygeRSuFjkmnZk6WwvGzUWpKfnG0e/NUySM3mVi59hAA== +"@vue/reactivity@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.7.tgz#dfdf49a3984e3b503c8d751a392b8afbab21fd32" + integrity sha512-VDeQiZs6s5m1W7hIX+vzmokDCHPEKNYrSxoHWXj4MiGamcT5XZxACj/VXOCK9c6qz36qK5EQOfDWtmVhxfI2hQ== dependencies: - "@vue/shared" "3.2.6" + "@vue/shared" "3.2.7" "@vue/ref-transform@3.2.7": version "3.2.7" @@ -1627,28 +1608,23 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/runtime-core@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.6.tgz#376baeef7fe02a62377d46d0d0a8ab9510db1d8e" - integrity sha512-3mqtgpj/YSGFxtvTufSERRApo92B16JNNxz9p+5eG6PPuqTmuRJz214MqhKBEgLEAIQ6R6YCbd83ZDtjQnyw2g== +"@vue/runtime-core@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.7.tgz#bc6934e6b2b980bf20cf1bfd854fcf3be29e727a" + integrity sha512-vY3XwE671KDFf4onRrQZdRmkT+0Jr6wrifTO+JwrB6Q9hNiB064TgmiBXqoovjuQW5BmJw5Lkz3u+pG8FE8Egw== dependencies: - "@vue/reactivity" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/reactivity" "3.2.7" + "@vue/shared" "3.2.7" -"@vue/runtime-dom@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.6.tgz#0f74dbca84d56c222fbfbd53415b260386859a3b" - integrity sha512-fq33urnP0BNCGm2O3KCzkJlKIHI80C94HJ4qDZbjsTtxyOn5IHqwKSqXVN3RQvO6epcQH+sWS+JNwcNDPzoasg== +"@vue/runtime-dom@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.7.tgz#f663c524b4c2cedcb6c0f8314db46066ba180cce" + integrity sha512-yuUmc8haFHrDqoU10JV3Fjd3G5Wz/ID+a/XMs0U68vhDLFsTBejhLX4il8Ga8nv+wrdwuGFwEE8t6APS67PxyA== dependencies: - "@vue/runtime-core" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/runtime-core" "3.2.7" + "@vue/shared" "3.2.7" csstype "^2.6.8" -"@vue/shared@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.6.tgz#2c22bae88fe2b7b59fa68a9c9c4cd60bae2c1794" - integrity sha512-uwX0Qs2e6kdF+WmxwuxJxOnKs/wEkMArtYpHSm7W+VY/23Tl8syMRyjnzEeXrNCAP0/8HZxEGkHJsjPEDNRuHw== - "@vue/shared@3.2.7": version "3.2.7" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.7.tgz#c792bf92d19025e7940358536d468218a11eeedb" @@ -8819,14 +8795,14 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^3.1.5: - version "3.2.6" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.6.tgz#c71445078751f458648fd8fb3a2da975507d03d2" - integrity sha512-Zlb3LMemQS3Xxa6xPsecu45bNjr1hxO8Bh5FUmE0Dr6Ot0znZBKiM47rK6O7FTcakxOnvVN+NTXWJF6u8ajpCQ== +vue@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.7.tgz#0850f2740f0cb58741f2c53bcbd9c6c705e4cc74" + integrity sha512-kqPYCbvw6rthEA41K45dqxV+C0yrQX24zs1ZmGZTi4Sk6WkzNK8tH4jGd0yAW+lu72E+HQmz0ZhNo6zAT/WKUA== dependencies: - "@vue/compiler-dom" "3.2.6" - "@vue/runtime-dom" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-dom" "3.2.7" + "@vue/runtime-dom" "3.2.7" + "@vue/shared" "3.2.7" watchpack-chokidar2@^2.0.1: version "2.0.1" From 546dc6825a53d06044b4047583dacb50731fb6da Mon Sep 17 00:00:00 2001 From: FireMasterK <20838718+FireMasterK@users.noreply.github.com> Date: Thu, 2 Sep 2021 19:16:27 +0530 Subject: [PATCH 05/14] Add support to Proxy LBRY and Disable LBRY. Closes #403 Closes #402 --- src/components/Player.vue | 10 +++++++++- src/components/Preferences.vue | 14 ++++++++++++++ src/locales/en.json | 4 +++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/components/Player.vue b/src/components/Player.vue index 8b5aad47..2185e631 100644 --- a/src/components/Player.vue +++ b/src/components/Player.vue @@ -95,7 +95,9 @@ export default { const MseSupport = window.MediaSource !== undefined; - const lbry = this.video.videoStreams.filter(stream => stream.quality === "LBRY")[0]; + const lbry = this.getPreferenceBoolean("disableLBRY", false) + ? null + : this.video.videoStreams.filter(stream => stream.quality === "LBRY")[0]; var uri; @@ -112,6 +114,12 @@ export default { } else uri = this.video.dash; } else if (lbry) { uri = lbry.url; + if (this.getPreferenceBoolean("proxyLBRY", false)) { + const url = new URL(uri); + url.searchParams.set("host", url.host); + url.host = new URL(this.video.proxyUrl).host; + uri = url.toString(); + } } else { uri = this.video.videoStreams.filter(stream => stream.codec == null).slice(-1)[0].url; } diff --git a/src/components/Preferences.vue b/src/components/Preferences.vue index 7da2e88f..12920582 100644 --- a/src/components/Preferences.vue +++ b/src/components/Preferences.vue @@ -106,6 +106,14 @@ +
+ +
+ +
+ +
+

@@ -181,6 +189,8 @@ export default { { code: "tr", name: "Turkish" }, ], enabledCodecs: ["av1", "vp9", "avc"], + disableLBRY: false, + proxyLBRY: false, }; }, activated() { @@ -267,6 +277,8 @@ export default { this.watchHistory = this.getPreferenceBoolean("watchHistory", false); this.selectedLanguage = this.getPreferenceString("hl", "en"); this.enabledCodecs = this.getPreferenceString("enabledCodecs", "av1,vp9,avc").split(","); + this.disableLBRY = this.getPreferenceBoolean("disableLBRY", false); + this.proxyLBRY = this.getPreferenceBoolean("proxyLBRY", false); } }, methods: { @@ -307,6 +319,8 @@ export default { localStorage.setItem("watchHistory", this.watchHistory); localStorage.setItem("hl", this.selectedLanguage); localStorage.setItem("enabledCodecs", this.enabledCodecs.join(",")); + localStorage.setItem("disableLBRY", this.disableLBRY); + localStorage.setItem("proxyLBRY", this.proxyLBRY); if (shouldReload) window.location.reload(); } diff --git a/src/locales/en.json b/src/locales/en.json index 79c9c85f..09ea4428 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -44,6 +44,8 @@ "store_watch_history": "Store Watch History", "language_selection": "Language Selection", "instances_list": "Instances List", - "enabled_codecs": "Enabled Codecs (Multiple)" + "enabled_codecs": "Enabled Codecs (Multiple)", + "disable_lbry": "Disable LBRY for Streaming", + "enable_lbry_proxy": "Enable Proxy for LBRY" } } From 8c8658ccee2b07859841ed8bfaadeebf02f3ccf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 04:09:14 +0000 Subject: [PATCH 06/14] Bump @vue/compiler-sfc from 3.2.7 to 3.2.8 Bumps [@vue/compiler-sfc](https://github.com/vuejs/vue-next/tree/HEAD/packages/compiler-sfc) from 3.2.7 to 3.2.8. - [Release notes](https://github.com/vuejs/vue-next/releases) - [Changelog](https://github.com/vuejs/vue-next/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-next/commits/v3.2.8/packages/compiler-sfc) --- updated-dependencies: - dependency-name: "@vue/compiler-sfc" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 66 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index fba5b4b9..4be6db02 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@vue/cli-plugin-eslint": "^4.5.13", "@vue/cli-plugin-pwa": "^4.5.13", "@vue/cli-service": "^4.5.13", - "@vue/compiler-sfc": "3.2.7", + "@vue/compiler-sfc": "3.2.8", "babel-eslint": "^10.1.0", "eslint": "^7.32.0", "eslint-plugin-vue": "^7.17.0" diff --git a/yarn.lock b/yarn.lock index 412c03b6..2ca53a05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1524,6 +1524,17 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.8.tgz#13b2386bdb03455c9f6c6af2f3468561a5ae5b1d" + integrity sha512-Sx8qJ030+QM/NakUrkQuUGCeDEb+0d0AgFOl5W4qRvR6e+YgLnW2ew0jREf4T1hak9Fdk8Edl67StECHrhEuew== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@vue/shared" "3.2.8" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.7": version "3.2.7" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.7.tgz#33abaeef89ec653e1a733143d4f7b6392def3de8" @@ -1532,19 +1543,27 @@ "@vue/compiler-core" "3.2.7" "@vue/shared" "3.2.7" -"@vue/compiler-sfc@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.7.tgz#6ee803b7d5d375138fe86124b9c161eebbbc0f0d" - integrity sha512-qjfvRw7/9Q2Qm4cDmrJwTNqnFTXSSI3z/mmS9BSJTYZqh4FC4w+IIYYLWUpS3ef6UTTYY9STC5IUZqfpIod9Uw== +"@vue/compiler-dom@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.8.tgz#69bc9e08928a12295c31299067f18d87301981a9" + integrity sha512-nxBW6k8FMWQ74294CRbqR+iEJRO5vIjx85I3YCOyZFD6FsDHyFL60g76TcJzucp+F2XXIDaYz+A+F4gQlDatjw== + dependencies: + "@vue/compiler-core" "3.2.8" + "@vue/shared" "3.2.8" + +"@vue/compiler-sfc@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.8.tgz#23699f69d38b1c32ec54f8b470f3e6375ffc6b6e" + integrity sha512-XClueQAXoWtN2EToKgfYH9FCL70Ac4bxx6OZFZzxYSg1bei8IB9srJP1UOfnJb2IpnM1heikAz1dp1HI1wHcyQ== dependencies: "@babel/parser" "^7.15.0" "@babel/types" "^7.15.0" "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.7" - "@vue/compiler-dom" "3.2.7" - "@vue/compiler-ssr" "3.2.7" - "@vue/ref-transform" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/compiler-core" "3.2.8" + "@vue/compiler-dom" "3.2.8" + "@vue/compiler-ssr" "3.2.8" + "@vue/ref-transform" "3.2.8" + "@vue/shared" "3.2.8" consolidate "^0.16.0" estree-walker "^2.0.2" hash-sum "^2.0.0" @@ -1556,13 +1575,13 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.7.tgz#30a4cb128eb7b67be551b22889c58f1288586673" - integrity sha512-4moQTeMujIk+fG8NaMxU5aPhMCnWE+O3xNEK6+kd9GjNoN+n3y3YZ6CkVy+aOP2HpqWenZbS/20TBzOSdon5Cw== +"@vue/compiler-ssr@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.8.tgz#99733532f44d77144ce1e3b853f2fa08ba394e7a" + integrity sha512-QqyiFRiIl55W0abDNQ6cNG/7iIfBHmbXVtssUAjX3IlI87ELeT0xackmrCyTSnfIX12ixljg9AN0COIZwlvt5A== dependencies: - "@vue/compiler-dom" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/compiler-dom" "3.2.8" + "@vue/shared" "3.2.8" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": version "3.2.2" @@ -1597,14 +1616,14 @@ dependencies: "@vue/shared" "3.2.7" -"@vue/ref-transform@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.7.tgz#1028708a44e1926f05e2967719a3481911c03c2f" - integrity sha512-5I7IeUqoDEhPmkPHBhw7YlsFCFO/ZXHWwgdrokQATyVRkEkqeAd8erthuZ9a4sZAo5JBYmxjYw8WD9Kx9mabmg== +"@vue/ref-transform@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.8.tgz#a527047bab43ce50ef3d400ce71312ab30f825dc" + integrity sha512-9LdADd4JM3klt+b2qNT8a7b7JvBETNBy2Btv5rDzyPrAVS4Vrw+1WWay6gZBgnxfJ9TPSvG8f/9zu6gNGHmJLA== dependencies: "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/compiler-core" "3.2.8" + "@vue/shared" "3.2.8" estree-walker "^2.0.2" magic-string "^0.25.7" @@ -1630,6 +1649,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.7.tgz#c792bf92d19025e7940358536d468218a11eeedb" integrity sha512-YwGOcNZjOY/MmadpzFBXWyHEwZSf0lVU4XF5zpD7tXC9dmqjdo38Jkk06wATu4LYHDPW4emXKMB5YLFPWPkwFA== +"@vue/shared@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.8.tgz#2f918e330aeb3f56ab1031ca60a5b30672512457" + integrity sha512-E2DQQnG7Qr4GwTs3GlfPPlHliGVADoufTnhpwfoViw7JlyLMmYtjfnTwM6nXAwvSJWiF7D+7AxpnWBBT3VWo6Q== + "@vue/web-component-wrapper@^1.2.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" From 9bab9a69966cc46e880b03f0370391d3c4813be7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 04:08:46 +0000 Subject: [PATCH 07/14] Bump core-js from 3.17.1 to 3.17.2 Bumps [core-js](https://github.com/zloirock/core-js) from 3.17.1 to 3.17.2. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.17.1...v3.17.2) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4be6db02..3d28a8a3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/vue-fontawesome": "^3.0.0-4", - "core-js": "3.17.1", + "core-js": "3.17.2", "css-loader": "^6.2.0", "dompurify": "^2.3.1", "hotkeys-js": "^3.8.7", diff --git a/yarn.lock b/yarn.lock index 2ca53a05..f5f25971 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3007,10 +3007,10 @@ core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5: browserslist "^4.16.8" semver "7.0.0" -core-js@3.17.1, core-js@^3.6.5: - version "3.17.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277" - integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA== +core-js@3.17.2, core-js@^3.6.5: + version "3.17.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.2.tgz#f960eae710dc62c29cca93d5332e3660e289db10" + integrity sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA== core-js@^2.4.0: version "2.6.12" From 85e2296dc410fd20375d623465900c55b5483da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 06:45:07 +0000 Subject: [PATCH 08/14] Bump vue from 3.2.7 to 3.2.8 Bumps [vue](https://github.com/vuejs/vue) from 3.2.7 to 3.2.8. - [Release notes](https://github.com/vuejs/vue/releases) - [Commits](https://github.com/vuejs/vue/commits) --- updated-dependencies: - dependency-name: vue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 72 ++++++++++++++++++---------------------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 3d28a8a3..ca5ca385 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "register-service-worker": "^1.7.1", "shaka-player": "3.2.0", "uikit": "3.7.2", - "vue": "^3.2.7", + "vue": "^3.2.8", "vue-i18n": "^9.1.7", "vue-router": "^4.0.11", "xml-js": "^1.6.11" diff --git a/yarn.lock b/yarn.lock index f5f25971..cd9d7434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1513,17 +1513,6 @@ semver "^6.1.0" strip-ansi "^6.0.0" -"@vue/compiler-core@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.7.tgz#a7f1f87d4fae8c78d95a3d3df81bde663427deb8" - integrity sha512-OcWy72QNTkcNYtZIb927pRx2cRujrlDWsAx7ejWDnRzwo83gIyF8NeTrMv/7wbnHoeA+Gga9AK4Wo9PlCzhuLg== - dependencies: - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - "@vue/shared" "3.2.7" - estree-walker "^2.0.2" - source-map "^0.6.1" - "@vue/compiler-core@3.2.8": version "3.2.8" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.8.tgz#13b2386bdb03455c9f6c6af2f3468561a5ae5b1d" @@ -1535,14 +1524,6 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.7.tgz#33abaeef89ec653e1a733143d4f7b6392def3de8" - integrity sha512-YZyZNoZlTbTMqyY8QMC8IhwmcDVOiE1DdVwjnXbyihg+XVqpGQkDjNcG5nyMTbtZDKXREsYkcjaZntEfKyWK5g== - dependencies: - "@vue/compiler-core" "3.2.7" - "@vue/shared" "3.2.7" - "@vue/compiler-dom@3.2.8": version "3.2.8" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.8.tgz#69bc9e08928a12295c31299067f18d87301981a9" @@ -1609,12 +1590,12 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== -"@vue/reactivity@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.7.tgz#dfdf49a3984e3b503c8d751a392b8afbab21fd32" - integrity sha512-VDeQiZs6s5m1W7hIX+vzmokDCHPEKNYrSxoHWXj4MiGamcT5XZxACj/VXOCK9c6qz36qK5EQOfDWtmVhxfI2hQ== +"@vue/reactivity@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.8.tgz#b27200ccfaa06f312ac467b12a38161377c557ed" + integrity sha512-/Hj3Uz28SG+xB5SDWPOXUs0emvHkq82EmTgk44/plTVFeswCZ3i3Hd7WmsrPT4rGajlDKd5uqMmW0ith1ED0FA== dependencies: - "@vue/shared" "3.2.7" + "@vue/shared" "3.2.8" "@vue/ref-transform@3.2.8": version "3.2.8" @@ -1627,28 +1608,23 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/runtime-core@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.7.tgz#bc6934e6b2b980bf20cf1bfd854fcf3be29e727a" - integrity sha512-vY3XwE671KDFf4onRrQZdRmkT+0Jr6wrifTO+JwrB6Q9hNiB064TgmiBXqoovjuQW5BmJw5Lkz3u+pG8FE8Egw== +"@vue/runtime-core@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.8.tgz#8a2342c0baa0fee192f819a3bdc19547d7430b88" + integrity sha512-hwzXLGw1njBEY5JSyRXIIdCtzMFFF6F38WcKMmoIE3p7da30jEbWt8EwwrBomjT8ZbqzElOGlewBcnXNOiiIUg== dependencies: - "@vue/reactivity" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/reactivity" "3.2.8" + "@vue/shared" "3.2.8" -"@vue/runtime-dom@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.7.tgz#f663c524b4c2cedcb6c0f8314db46066ba180cce" - integrity sha512-yuUmc8haFHrDqoU10JV3Fjd3G5Wz/ID+a/XMs0U68vhDLFsTBejhLX4il8Ga8nv+wrdwuGFwEE8t6APS67PxyA== +"@vue/runtime-dom@3.2.8": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.8.tgz#c6631b507049d39844b0434e81df1aa79efcc6cb" + integrity sha512-A/aRrlGLJ5y4Z7eNbnO/xHwx2RiPijQo7D3OIwESroG3HNP+dpuoqamajo5TXS9ZGjbMOih82COoe7xb9P4BZw== dependencies: - "@vue/runtime-core" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/runtime-core" "3.2.8" + "@vue/shared" "3.2.8" csstype "^2.6.8" -"@vue/shared@3.2.7": - version "3.2.7" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.7.tgz#c792bf92d19025e7940358536d468218a11eeedb" - integrity sha512-YwGOcNZjOY/MmadpzFBXWyHEwZSf0lVU4XF5zpD7tXC9dmqjdo38Jkk06wATu4LYHDPW4emXKMB5YLFPWPkwFA== - "@vue/shared@3.2.8": version "3.2.8" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.8.tgz#2f918e330aeb3f56ab1031ca60a5b30672512457" @@ -8819,14 +8795,14 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.7.tgz#0850f2740f0cb58741f2c53bcbd9c6c705e4cc74" - integrity sha512-kqPYCbvw6rthEA41K45dqxV+C0yrQX24zs1ZmGZTi4Sk6WkzNK8tH4jGd0yAW+lu72E+HQmz0ZhNo6zAT/WKUA== +vue@^3.2.8: + version "3.2.8" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.8.tgz#9124e4c31ebc9c592b2b9f293df5c9a88a78e944" + integrity sha512-x7lwdnOSkceHQUXRVVHBaZzcp6v7M2CYtSZH75zZaT1mTjB4plC4KZHKP/5jAvdqOLBHZGwDSMkWXm3YbAufrA== dependencies: - "@vue/compiler-dom" "3.2.7" - "@vue/runtime-dom" "3.2.7" - "@vue/shared" "3.2.7" + "@vue/compiler-dom" "3.2.8" + "@vue/runtime-dom" "3.2.8" + "@vue/shared" "3.2.8" watchpack-chokidar2@^2.0.1: version "2.0.1" From c97a0ef6c68a3927d6cca583a64d29279dc91194 Mon Sep 17 00:00:00 2001 From: FireMasterK <20838718+FireMasterK@users.noreply.github.com> Date: Sat, 4 Sep 2021 00:57:22 +0530 Subject: [PATCH 09/14] Use VideoItem in Search Results. --- src/components/SearchResults.vue | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue index 38721d06..e42fc30d 100644 --- a/src/components/SearchResults.vue +++ b/src/components/SearchResults.vue @@ -25,15 +25,11 @@ v-bind:key="result.url" v-for="result in results.items" > -
+ +
- {{ timeFormat(result.duration) }}

{{ result.name }}  - - {{ result.uploadDate }} - - {{ result.uploaderName }}
{{ result.videos }} Videos
- - - - {{ numberFormat(result.views) }} views -

From 7211cad36921bddad6efa9101ed66d9035da92ac Mon Sep 17 00:00:00 2001 From: IceDBorn <51162078+IceDBorn@users.noreply.github.com> Date: Sat, 4 Sep 2021 18:02:59 +0300 Subject: [PATCH 10/14] Restyle feed page (#410) --- src/components/FeedPage.vue | 38 +++++++++++++++++----------- src/components/SubscriptionsPage.vue | 14 ++++++++++ 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue index d70e9561..3ffbaa7c 100644 --- a/src/components/FeedPage.vue +++ b/src/components/FeedPage.vue @@ -1,23 +1,31 @@