|
@@ -39,7 +39,7 @@
|
|
// @license AGPL-3.0-only
|
|
// @license AGPL-3.0-only
|
|
// @author Sv443
|
|
// @author Sv443
|
|
// @copyright Sv443 (https://github.com/Sv443)
|
|
// @copyright Sv443 (https://github.com/Sv443)
|
|
-// @icon https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/logo/logo_dev_48.png
|
|
|
|
|
|
+// @icon https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/logo/logo_dev_48.png
|
|
// @match https://music.youtube.com/*
|
|
// @match https://music.youtube.com/*
|
|
// @match https://www.youtube.com/*
|
|
// @match https://www.youtube.com/*
|
|
// @run-at document-start
|
|
// @run-at document-start
|
|
@@ -57,59 +57,60 @@
|
|
// @grant GM.openInTab
|
|
// @grant GM.openInTab
|
|
// @grant unsafeWindow
|
|
// @grant unsafeWindow
|
|
// @noframes
|
|
// @noframes
|
|
-// @resource css-above_queue_btns https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/aboveQueueBtns.css
|
|
|
|
-// @resource css-anchor_improvements https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/anchorImprovements.css
|
|
|
|
-// @resource css-auto_like https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/autoLike.css
|
|
|
|
-// @resource css-bundle https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/dist/BetterYTM.css
|
|
|
|
-// @resource css-fix_hdr https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/fixHDR.css
|
|
|
|
-// @resource css-fix_playerpage_theming https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/fixPlayerPageTheming.css
|
|
|
|
-// @resource css-fix_spacing https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/fixSpacing.css
|
|
|
|
-// @resource css-fix_sponsorblock https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/fixSponsorBlock.css
|
|
|
|
-// @resource css-show_votes https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/showVotes.css
|
|
|
|
-// @resource css-vol_slider_size https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/style/volSliderSize.css
|
|
|
|
-// @resource doc-changelog https://raw.githubusercontent.com/Sv443/BetterYTM/develop/changelog.md?u=6dd79b10-e7ba-47a8-b95f-dd441d669f4b
|
|
|
|
-// @resource font-cascadia_code_ttf https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/fonts/CascadiaCode.ttf
|
|
|
|
-// @resource font-cascadia_code_woff https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/fonts/CascadiaCode.woff
|
|
|
|
-// @resource font-cascadia_code_woff2 https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/fonts/CascadiaCode.woff2
|
|
|
|
-// @resource icon-advanced_mode https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/plus_circle_small.svg
|
|
|
|
-// @resource icon-alert https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/alert.svg
|
|
|
|
-// @resource icon-arrow_down https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/arrow_down.svg
|
|
|
|
-// @resource icon-auto_like https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/auto_like.svg
|
|
|
|
-// @resource icon-auto_like_enabled https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/auto_like_enabled.svg
|
|
|
|
-// @resource icon-clear_list https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/clear_list.svg
|
|
|
|
-// @resource icon-copy https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/copy.svg
|
|
|
|
-// @resource icon-delete https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/delete.svg
|
|
|
|
-// @resource icon-edit https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/edit.svg
|
|
|
|
-// @resource icon-error https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/error.svg
|
|
|
|
-// @resource icon-experimental https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/beaker_small.svg
|
|
|
|
-// @resource icon-globe https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/globe.svg
|
|
|
|
-// @resource icon-globe_small https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/globe_small.svg
|
|
|
|
-// @resource icon-help https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/help.svg
|
|
|
|
-// @resource icon-image https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/image.svg
|
|
|
|
-// @resource icon-image_filled https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/image_filled.svg
|
|
|
|
-// @resource icon-link https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/link.svg
|
|
|
|
-// @resource icon-lyrics https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/lyrics.svg
|
|
|
|
-// @resource icon-prompt https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/help.svg
|
|
|
|
-// @resource icon-reload https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/refresh.svg
|
|
|
|
-// @resource icon-skip_to https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/skip_to.svg
|
|
|
|
-// @resource icon-spinner https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/spinner.svg
|
|
|
|
-// @resource icon-upload https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/icons/upload.svg
|
|
|
|
-// @resource img-close https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/close.png
|
|
|
|
-// @resource img-discord https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/external/discord.png
|
|
|
|
-// @resource img-github https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/external/github.png
|
|
|
|
-// @resource img-greasyfork https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/external/greasyfork.png
|
|
|
|
-// @resource img-logo https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/logo/logo_48.png
|
|
|
|
-// @resource img-logo_dev https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/logo/logo_dev_48.png
|
|
|
|
-// @resource img-openuserjs https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/images/external/openuserjs.png
|
|
|
|
-// @resource trans-de-DE https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/de-DE.json
|
|
|
|
-// @resource trans-en-GB https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/en-GB.json
|
|
|
|
-// @resource trans-en-US https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/en-US.json
|
|
|
|
-// @resource trans-es-ES https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/es-ES.json
|
|
|
|
-// @resource trans-fr-FR https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/fr-FR.json
|
|
|
|
-// @resource trans-hi-IN https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/hi-IN.json
|
|
|
|
-// @resource trans-ja-JP https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/ja-JP.json
|
|
|
|
-// @resource trans-pt-BR https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/pt-BR.json
|
|
|
|
-// @resource trans-zh-CN https://raw.githubusercontent.com/Sv443/BetterYTM/ce2c1b91/assets/translations/zh-CN.json
|
|
|
|
|
|
+// @resource css-above_queue_btns https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/aboveQueueBtns.css
|
|
|
|
+// @resource css-anchor_improvements https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/anchorImprovements.css
|
|
|
|
+// @resource css-auto_like https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/autoLike.css
|
|
|
|
+// @resource css-bundle https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/dist/BetterYTM.css
|
|
|
|
+// @resource css-fix_hdr https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/fixHDR.css
|
|
|
|
+// @resource css-fix_playerpage_theming https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/fixPlayerPageTheming.css
|
|
|
|
+// @resource css-fix_spacing https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/fixSpacing.css
|
|
|
|
+// @resource css-fix_sponsorblock https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/fixSponsorBlock.css
|
|
|
|
+// @resource css-show_votes https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/showVotes.css
|
|
|
|
+// @resource css-vol_slider_size https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/style/volSliderSize.css
|
|
|
|
+// @resource doc-changelog https://raw.githubusercontent.com/Sv443/BetterYTM/develop/changelog.md?u=d7fcae3d-cb47-4133-8fdc-138f99facba8
|
|
|
|
+// @resource font-cascadia_code_ttf https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/fonts/CascadiaCode.ttf
|
|
|
|
+// @resource font-cascadia_code_woff https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/fonts/CascadiaCode.woff
|
|
|
|
+// @resource font-cascadia_code_woff2 https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/fonts/CascadiaCode.woff2
|
|
|
|
+// @resource icon-advanced_mode https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/plus_circle_small.svg
|
|
|
|
+// @resource icon-alert https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/alert.svg
|
|
|
|
+// @resource icon-arrow_down https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/arrow_down.svg
|
|
|
|
+// @resource icon-auto_like https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/auto_like.svg
|
|
|
|
+// @resource icon-auto_like_enabled https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/auto_like_enabled.svg
|
|
|
|
+// @resource icon-clear_list https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/clear_list.svg
|
|
|
|
+// @resource icon-copy https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/copy.svg
|
|
|
|
+// @resource icon-delete https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/delete.svg
|
|
|
|
+// @resource icon-edit https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/edit.svg
|
|
|
|
+// @resource icon-error https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/error.svg
|
|
|
|
+// @resource icon-experimental https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/beaker_small.svg
|
|
|
|
+// @resource icon-globe https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/globe.svg
|
|
|
|
+// @resource icon-globe_small https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/globe_small.svg
|
|
|
|
+// @resource icon-help https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/help.svg
|
|
|
|
+// @resource icon-image https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/image.svg
|
|
|
|
+// @resource icon-image_filled https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/image_filled.svg
|
|
|
|
+// @resource icon-link https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/link.svg
|
|
|
|
+// @resource icon-lyrics https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/lyrics.svg
|
|
|
|
+// @resource icon-prompt https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/help.svg
|
|
|
|
+// @resource icon-reload https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/refresh.svg
|
|
|
|
+// @resource icon-restore_time https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/restore_time.svg
|
|
|
|
+// @resource icon-skip_to https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/skip_to.svg
|
|
|
|
+// @resource icon-spinner https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/spinner.svg
|
|
|
|
+// @resource icon-upload https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/icons/upload.svg
|
|
|
|
+// @resource img-close https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/close.png
|
|
|
|
+// @resource img-discord https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/external/discord.png
|
|
|
|
+// @resource img-github https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/external/github.png
|
|
|
|
+// @resource img-greasyfork https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/external/greasyfork.png
|
|
|
|
+// @resource img-logo https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/logo/logo_48.png
|
|
|
|
+// @resource img-logo_dev https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/logo/logo_dev_48.png
|
|
|
|
+// @resource img-openuserjs https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/images/external/openuserjs.png
|
|
|
|
+// @resource trans-de-DE https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/de-DE.json
|
|
|
|
+// @resource trans-en-GB https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/en-GB.json
|
|
|
|
+// @resource trans-en-US https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/en-US.json
|
|
|
|
+// @resource trans-es-ES https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/es-ES.json
|
|
|
|
+// @resource trans-fr-FR https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/fr-FR.json
|
|
|
|
+// @resource trans-hi-IN https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/hi-IN.json
|
|
|
|
+// @resource trans-ja-JP https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/ja-JP.json
|
|
|
|
+// @resource trans-pt-BR https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/pt-BR.json
|
|
|
|
+// @resource trans-zh-CN https://raw.githubusercontent.com/Sv443/BetterYTM/3e665ddc/assets/translations/zh-CN.json
|
|
// @require https://cdn.jsdelivr.net/npm/@sv443-network/[email protected]/dist/index.global.js
|
|
// @require https://cdn.jsdelivr.net/npm/@sv443-network/[email protected]/dist/index.global.js
|
|
// @require https://cdn.jsdelivr.net/npm/[email protected]/lib/marked.umd.js
|
|
// @require https://cdn.jsdelivr.net/npm/[email protected]/lib/marked.umd.js
|
|
// @require https://cdn.jsdelivr.net/npm/[email protected]/lib/umd/index.js
|
|
// @require https://cdn.jsdelivr.net/npm/[email protected]/lib/umd/index.js
|
|
@@ -165,7 +166,7 @@ var PluginIntent;
|
|
const modeRaw = "development";
|
|
const modeRaw = "development";
|
|
const branchRaw = "develop";
|
|
const branchRaw = "develop";
|
|
const hostRaw = "github";
|
|
const hostRaw = "github";
|
|
-const buildNumberRaw = "ce2c1b91";
|
|
|
|
|
|
+const buildNumberRaw = "3e665ddc";
|
|
/** The mode in which the script was built (production or development) */
|
|
/** The mode in which the script was built (production or development) */
|
|
const mode = (modeRaw.match(/^#{{.+}}$/) ? "production" : modeRaw);
|
|
const mode = (modeRaw.match(/^#{{.+}}$/) ? "production" : modeRaw);
|
|
/** The branch to use in various URLs that point to the GitHub repo */
|
|
/** The branch to use in various URLs that point to the GitHub repo */
|
|
@@ -3841,7 +3842,7 @@ async function remTimeRestoreTime() {
|
|
const vidRestoreTime = entry.songTime - ((_a = getFeature("rememberSongTimeReduction")) !== null && _a !== void 0 ? _a : 0);
|
|
const vidRestoreTime = entry.songTime - ((_a = getFeature("rememberSongTimeReduction")) !== null && _a !== void 0 ? _a : 0);
|
|
vidElem.currentTime = UserUtils.clamp(Math.max(vidRestoreTime, 0), 0, vidElem.duration);
|
|
vidElem.currentTime = UserUtils.clamp(Math.max(vidRestoreTime, 0), 0, vidElem.duration);
|
|
await remTimeDeleteEntry(entry.watchID);
|
|
await remTimeDeleteEntry(entry.watchID);
|
|
- info(`Restored ${getCurrentMediaType()} time to ${Math.floor(vidRestoreTime / 60)}m, ${(vidRestoreTime % 60).toFixed(1)}s`, LogLevel.Info);
|
|
|
|
|
|
+ info(`Restored ${getDomain() === "ytm" ? getCurrentMediaType() : "video"} time to ${Math.floor(vidRestoreTime / 60)}m, ${(vidRestoreTime % 60).toFixed(1)}s`, LogLevel.Info);
|
|
};
|
|
};
|
|
if (!domLoaded)
|
|
if (!domLoaded)
|
|
document.addEventListener("DOMContentLoaded", doRestoreTime);
|
|
document.addEventListener("DOMContentLoaded", doRestoreTime);
|