From 56f4c3773509d79a807d0e897ff087a5fa7cb910 Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Thu, 20 May 2021 17:21:26 +0100 Subject: [PATCH 1/6] Search: Fix up a few duration and upload time related options --- src/renderer/store/modules/ytdl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js index 5d6bceb99..b4227d1b3 100644 --- a/src/renderer/store/modules/ytdl.js +++ b/src/renderer/store/modules/ytdl.js @@ -200,9 +200,9 @@ const actions = { if (searchSettings.duration !== '') { let filterValue = null if (searchSettings.duration === 'short') { - filterValue = 'Short (< 4 minutes)' + filterValue = 'Under 4 minutes' } else if (searchSettings.duration === 'long') { - filterValue = 'Long (> 20 minutes)' + filterValue = 'Over 20 minutes' } filterUrl = filter.get('Duration').get(filterValue).url @@ -216,7 +216,7 @@ const actions = { switch (searchSettings.time) { case 'hour': - filterValue = 'Last Hour' + filterValue = 'Last hour' break case 'today': filterValue = 'Today' From 1900578d2d3ce0c54ab08302226996e91e5b97c9 Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Sun, 23 May 2021 03:52:50 +0100 Subject: [PATCH 2/6] Build: Suppress generation of `.build-id` links in rpm packages This commit addresses a certain issue with `rpmbuild` in which certain packages will conflict with each other because they have identical `.build-id` links in the package. I can speculate from some comments I've seen that this might be do to electron versions the packages rely on, but I can't know for sure. Most relevant issues I've seen: https://github.com/jordansissel/fpm/issues/1503 https://github.com/jgraph/drawio-desktop/issues/259 --- _scripts/build.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_scripts/build.js b/_scripts/build.js index 21e167cf2..9303aa740 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -69,6 +69,12 @@ const config = { icon: '_icons/icon.svg', target: ['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'], }, + // See the following issues for more information + // https://github.com/jordansissel/fpm/issues/1503 + // https://github.com/jgraph/drawio-desktop/issues/259 + rpm: { + fpm: [`--rpm-rpmbuild-define=_build_id_links none`] + }, deb: { depends: [ "libgtk-3-0", From e6611d28492ffb9dcbc0585ab814cde3b907aaf5 Mon Sep 17 00:00:00 2001 From: Luca Date: Sun, 23 May 2021 18:21:41 +0200 Subject: [PATCH 3/6] Bumped packages for comment like fix --- package-lock.json | 24 ++++++++++++------------ package.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27942a647..713e84d2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19444,9 +19444,9 @@ } }, "yt-channel-info": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yt-channel-info/-/yt-channel-info-2.1.1.tgz", - "integrity": "sha512-oiTSuEGCMFMpgZYYDZhxskPoUnhkFY2DukkTy90wsQdHNfAIjPsqitHYBm75rXDkL2ubLX+nogzf3ZHa9U1e6A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/yt-channel-info/-/yt-channel-info-2.2.0.tgz", + "integrity": "sha512-P8WWBKQxIEZ23UmKzfHpCI4zgIBGpmthsT+oDPDfNYH0VweWHgHMsLphopMJe2y+FElz/b/N1yo5v4vwrteGRQ==", "requires": { "axios": "^0.21.1", "querystring": "^0.2.0" @@ -19461,16 +19461,16 @@ } }, "follow-redirects": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz", - "integrity": "sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" } } }, "yt-comment-scraper": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-4.0.1.tgz", - "integrity": "sha512-5uReiiLnaBhTBBsTfxIYcoV62EATe8dXAkkUCkCG3pgLU+qty9iCjNQvSgY8tZhnCPNAPO+lJaxzbGJ3hJRm4g==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-4.0.3.tgz", + "integrity": "sha512-dmZ2ZhRAaX+WVI2gLloRLWkp9vjPcnXJDPxlgHT5N/s/dhRDUuRikvWXdGhalJ7LOeECC+dFbYyFyQyv8kIiig==", "requires": { "axios": "^0.21.1", "node-html-parser": "^2.0.2" @@ -19485,9 +19485,9 @@ } }, "follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" } } }, diff --git a/package.json b/package.json index 75242ca1d..82b0009ff 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "xml2json": "^0.12.0", "youtube-chat": "git+https://github.com/IcedCoffeee/youtube-chat.git", "youtube-suggest": "^1.1.2", - "yt-channel-info": "^2.1.1", - "yt-comment-scraper": "^4.0.1", + "yt-channel-info": "^2.2.0", + "yt-comment-scraper": "^4.0.3", "yt-dash-manifest-generator": "1.1.0", "yt-trending-scraper": "^2.0.0", "ytdl-core": "^4.8.0", From bf55e41c632b8acf925222bb0a6d287d3b4babab Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Thu, 27 May 2021 16:30:41 +0000 Subject: [PATCH 4/6] Chore: Bump `ytdl-core` dependency from 4.8.0 to 4.8.1 This should fix the fetching of age-restricted videos --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82b0009ff..149eb42b6 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "yt-comment-scraper": "^4.0.3", "yt-dash-manifest-generator": "1.1.0", "yt-trending-scraper": "^2.0.0", - "ytdl-core": "^4.8.0", + "ytdl-core": "^4.8.1", "ytpl": "^2.2.1", "ytsr": "^3.5.0" }, From de3ff14954bf306d041c31751acc595d3cc18111 Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 29 May 2021 16:48:12 -0400 Subject: [PATCH 5/6] Update package-lock.json --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 713e84d2c..93e42fa40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7553,9 +7553,9 @@ "dev": true }, "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz", + "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==", "dev": true, "requires": { "ip": "^1.1.0", @@ -19542,9 +19542,9 @@ } }, "ytdl-core": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.8.0.tgz", - "integrity": "sha512-LFhhwqFojReoaME17VpsFeiamygM0W/YNG8O02mrmS2O6Em5LjCPiJYdq7Af3CmJtBEOCdptSZ3Ql+3LGWDGvg==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.8.2.tgz", + "integrity": "sha512-O3n++YcgZawaXJwbPmnRDgfN6b4kU0DpNdkI9Na5yM3JAdfJmoq5UHc8v9Xjgjr1RilQUUh7mhDnRRPDtKr0Kg==", "requires": { "m3u8stream": "^0.8.3", "miniget": "^4.0.0", @@ -19552,18 +19552,18 @@ }, "dependencies": { "m3u8stream": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.8.3.tgz", - "integrity": "sha512-0nAcdrF8YJKUkb6PzWdvGftTPyCVWgoiot1AkNVbPKTeIGsWs6DrOjifrJ0Zi8WQfQmD2SuVCjkYIOip12igng==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.8.4.tgz", + "integrity": "sha512-sco80Db+30RvcaIOndenX6E6oQNgTiBKeJbFPc+yDXwPQIkryfboEbCvXPlBRq3mQTCVPQO93TDVlfRwqpD35w==", "requires": { "miniget": "^4.0.0", "sax": "^1.2.4" } }, "miniget": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/miniget/-/miniget-4.2.0.tgz", - "integrity": "sha512-IzTOaNgBw/qEpzkPTE7X2cUVXQfSKbG8w52Emi93zb+Zya2ZFrbmavpixzebuDJD9Ku4ecbaFlC7Y1cEESzQtQ==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/miniget/-/miniget-4.2.1.tgz", + "integrity": "sha512-O/DduzDR6f+oDtVype9S/Qu5hhnx73EDYGyZKwU/qN82lehFZdfhoa4DT51SpsO+8epYrB3gcRmws56ROfTIoQ==" }, "sax": { "version": "1.2.4", From 3a9c85cf9d85c9773b393f1cdd6ce0717cfba53e Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 29 May 2021 16:55:43 -0400 Subject: [PATCH 6/6] Update package-lock.json and package.json --- package-lock.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 93e42fa40..b7711c9da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "freetube", - "version": "0.13.0", + "version": "0.13.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 149eb42b6..a44f6c7a9 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "yt-comment-scraper": "^4.0.3", "yt-dash-manifest-generator": "1.1.0", "yt-trending-scraper": "^2.0.0", - "ytdl-core": "^4.8.1", + "ytdl-core": "^4.8.2", "ytpl": "^2.2.1", "ytsr": "^3.5.0" }, @@ -148,5 +148,5 @@ "test": "run-s rebuild:node pack:workers jest", "test:watch": "run-s rebuild:node pack:workers jest:watch" }, - "version": "0.13.0" + "version": "0.13.1" }