diff options
52 files changed, 1662 insertions, 298 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index 64b64a12..b6264a34 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,6 +3,8 @@ module.exports = { browser: true, es2021: true, node: true, + jest: true, + jasmine: true, }, extends: [ "eslint:recommended", diff --git a/jest.config.js b/jest.config.js index 641bafac..a1ba3f09 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,6 +1,6 @@ module.exports = { "roots": [ - "src" + "test" ], "transform": { "^.+\\.ts$": "ts-jest" diff --git a/manifest/manifest.json b/manifest/manifest.json index d53522cc..54b2dd27 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "3.0.3", + "version": "3.0.5", "default_locale": "en", "description": "__MSG_Description__", "homepage_url": "https://sponsor.ajay.app", diff --git a/package-lock.json b/package-lock.json index e578aedf..a508d3e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@types/react": "^16.9.22", "@types/react-dom": "^16.9.5", + "@types/selenium-webdriver": "^4.0.15", "babel": "^6.23.0", "babel-core": "^6.26.3", "babel-loader": "^8.0.6", @@ -31,6 +32,7 @@ "@types/jquery": "^3.3.31", "@typescript-eslint/eslint-plugin": "^4.9.1", "@typescript-eslint/parser": "^4.9.1", + "chromedriver": "^92.0.0", "copy-webpack-plugin": "^6.0.3", "eslint": "^7.15.0", "eslint-plugin-react": "^7.21.5", @@ -44,6 +46,7 @@ ======= "jest": "^27.0.6", "rimraf": "^3.0.0", + "selenium-webdriver": "^4.0.0-beta.4", "ts-jest": "^27.0.3", "ts-loader": "^6.2.1", "typescript": "~4.3", @@ -22025,6 +22028,12 @@ "node": ">=6" } }, + "node_modules/@testim/chrome-version": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.0.7.tgz", + "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==", + "dev": true + }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -22235,6 +22244,11 @@ "@types/react": "*" } }, + "node_modules/@types/selenium-webdriver": { + "version": "4.0.15", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.0.15.tgz", + "integrity": "sha512-5760PIZkzhPejy3hsKAdCKe5LJygGdxLKOLxmZL9GEUcFlO5OgzM6G2EbdbvOnaw4xvUSa9Uip6Ipwkih12BPA==" + }, "node_modules/@types/sizzle": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", @@ -23564,6 +23578,15 @@ "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", "dev": true }, + "node_modules/axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.10.0" + } + }, "node_modules/babel": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz", @@ -25415,6 +25438,28 @@ "node": ">=6.0" } }, + "node_modules/chromedriver": { + "version": "92.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-92.0.0.tgz", + "integrity": "sha512-IdJ5n5jLL6tCsGQF/fQHF2gDEhVzoYIqktUn6hE/BSsXlCcyDTi45fQbhTEhZlmshM8+BpnRtPuIT5DRbxNqKg==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@testim/chrome-version": "^1.0.7", + "axios": "^0.21.1", + "del": "^6.0.0", + "extract-zip": "^2.0.1", + "https-proxy-agent": "^5.0.0", + "proxy-from-env": "^1.1.0", + "tcp-port-used": "^1.0.1" + }, + "bin": { + "chromedriver": "bin/chromedriver" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -26176,21 +26221,6 @@ "node": ">=8" } }, - "node_modules/copy-webpack-plugin/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/copy-webpack-plugin/node_modules/schema-utils": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", @@ -26425,12 +26455,19 @@ "dev": true }, "node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dependencies": { - "ms": "^2.1.1" + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/decamelize": { @@ -26777,6 +26814,37 @@ "node": ">=0.10.0" } }, + "node_modules/del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "dev": true, + "dependencies": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/del/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -28330,6 +28398,41 @@ "node": ">=0.10.0" } }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" + }, + "engines": { + "node": ">= 10.17.0" + }, + "optionalDependencies": { + "@types/yauzl": "^2.9.1" + } + }, + "node_modules/extract-zip/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -28719,21 +28822,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/flatstr": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz", @@ -28764,6 +28852,26 @@ "readable-stream": "^2.3.6" } }, + "node_modules/follow-redirects": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -29768,6 +29876,15 @@ "url": "https://github.com/sindresorhus/invert-kv?sponsor=1" } }, + "node_modules/ip-regex": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", + "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -30106,6 +30223,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -30218,6 +30344,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "node_modules/is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", + "dev": true + }, "node_modules/is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -30250,6 +30382,20 @@ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", "dev": true }, + "node_modules/is2": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz", + "integrity": "sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "ip-regex": "^4.1.0", + "is-url": "^1.2.4" + }, + "engines": { + "node": ">=v0.10.0" + } + }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -36718,6 +36864,12 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -37332,9 +37484,9 @@ } }, "node_modules/rimraf": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz", - "integrity": "sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -37470,6 +37622,21 @@ "seek-table": "bin/seek-bzip-table" } }, + "node_modules/selenium-webdriver": { + "version": "4.0.0-beta.4", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.4.tgz", + "integrity": "sha512-+s/CIYkWzmnC9WASBxxVj7Lm0dcyl6OaFxwIJaFCT5WCuACiimEEr4lUnOOFP/QlKfkDQ56m+aRczaq2EvJEJg==", + "dev": true, + "dependencies": { + "jszip": "^3.6.0", + "rimraf": "^3.0.2", + "tmp": "^0.2.1", + "ws": ">=7.4.6" + }, + "engines": { + "node": ">= 10.15.0" + } + }, "node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -38735,6 +38902,16 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/tcp-port-used": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", + "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==", + "dev": true, + "dependencies": { + "debug": "4.3.1", + "is2": "^2.0.6" + } + }, "node_modules/terminal-link": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", @@ -42228,6 +42405,12 @@ "defer-to-connect": "^1.0.1" } }, + "@testim/chrome-version": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.0.7.tgz", + "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==", + "dev": true + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -42435,6 +42618,11 @@ "@types/react": "*" } }, + "@types/selenium-webdriver": { + "version": "4.0.15", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-4.0.15.tgz", + "integrity": "sha512-5760PIZkzhPejy3hsKAdCKe5LJygGdxLKOLxmZL9GEUcFlO5OgzM6G2EbdbvOnaw4xvUSa9Uip6Ipwkih12BPA==" + }, "@types/sizzle": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", @@ -43475,6 +43663,15 @@ "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", "dev": true }, + "axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "dev": true, + "requires": { + "follow-redirects": "^1.10.0" + } + }, "babel": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz", @@ -45084,6 +45281,21 @@ "tslib": "^1.9.0" } }, + "chromedriver": { + "version": "92.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-92.0.0.tgz", + "integrity": "sha512-IdJ5n5jLL6tCsGQF/fQHF2gDEhVzoYIqktUn6hE/BSsXlCcyDTi45fQbhTEhZlmshM8+BpnRtPuIT5DRbxNqKg==", + "dev": true, + "requires": { + "@testim/chrome-version": "^1.0.7", + "axios": "^0.21.1", + "del": "^6.0.0", + "extract-zip": "^2.0.1", + "https-proxy-agent": "^5.0.0", + "proxy-from-env": "^1.1.0", + "tcp-port-used": "^1.0.1" + } + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -45693,15 +45905,6 @@ "find-up": "^4.0.0" } }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, "schema-utils": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", @@ -45903,11 +46106,11 @@ "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "decamelize": { @@ -46193,6 +46396,30 @@ } } }, + "del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "dev": true, + "requires": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "dependencies": { + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + } + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -47399,6 +47626,29 @@ } } }, + "extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "dev": true, + "requires": { + "@types/yauzl": "^2.9.1", + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "dependencies": { + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -47721,17 +47971,6 @@ "requires": { "flatted": "^3.1.0", "rimraf": "^3.0.2" - }, - "dependencies": { - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } } }, "flatstr": { @@ -47761,6 +48000,12 @@ "readable-stream": "^2.3.6" } }, + "follow-redirects": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "dev": true + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -48546,6 +48791,12 @@ "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==", "dev": true }, + "ip-regex": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", + "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==", + "dev": true + }, "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -48781,6 +49032,12 @@ "dev": true, "peer": true }, + "is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true + }, "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", @@ -48857,6 +49114,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", + "dev": true + }, "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", @@ -48883,6 +49146,17 @@ "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", "dev": true }, + "is2": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz", + "integrity": "sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "ip-regex": "^4.1.0", + "is-url": "^1.2.4" + } + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -53936,6 +54210,12 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -54438,9 +54718,9 @@ "dev": true }, "rimraf": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz", - "integrity": "sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { "glob": "^7.1.3" @@ -54557,6 +54837,18 @@ "commander": "^2.8.1" } }, + "selenium-webdriver": { + "version": "4.0.0-beta.4", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.4.tgz", + "integrity": "sha512-+s/CIYkWzmnC9WASBxxVj7Lm0dcyl6OaFxwIJaFCT5WCuACiimEEr4lUnOOFP/QlKfkDQ56m+aRczaq2EvJEJg==", + "dev": true, + "requires": { + "jszip": "^3.6.0", + "rimraf": "^3.0.2", + "tmp": "^0.2.1", + "ws": ">=7.4.6" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -55597,6 +55889,16 @@ "xtend": "^4.0.0" } }, + "tcp-port-used": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", + "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==", + "dev": true, + "requires": { + "debug": "4.3.1", + "is2": "^2.0.6" + } + }, "terminal-link": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", diff --git a/package.json b/package.json index 26776c9f..2f59a888 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "@types/react": "^16.9.22", "@types/react-dom": "^16.9.5", + "@types/selenium-webdriver": "^4.0.15", "babel": "^6.23.0", "babel-core": "^6.26.3", "babel-loader": "^8.0.6", @@ -21,11 +22,13 @@ "@types/jquery": "^3.3.31", "@typescript-eslint/eslint-plugin": "^4.9.1", "@typescript-eslint/parser": "^4.9.1", + "chromedriver": "^92.0.0", "copy-webpack-plugin": "^6.0.3", "eslint": "^7.15.0", "eslint-plugin-react": "^7.21.5", "jest": "^27.0.6", "rimraf": "^3.0.0", + "selenium-webdriver": "^4.0.0-beta.4", "ts-jest": "^27.0.3", "ts-loader": "^6.2.1", "typescript": "~4.3", @@ -53,7 +56,8 @@ "dev:firefox": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"", "dev:firefox-android": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox-android\" \"npm run build:watch:firefox\"", "clean": "rimraf dist", - "test": "npx jest", + "test": "npm run build:chrome && npx jest", + "test-without-building": "npx jest", "lint": "eslint src", "lint:fix": "eslint src --fix" }, diff --git a/public/_locales/ar/messages.json b/public/_locales/ar/messages.json index 99e44ae6..d96bedf3 100644 --- a/public/_locales/ar/messages.json +++ b/public/_locales/ar/messages.json @@ -57,5 +57,35 @@ }, "manualPaused": { "message": "تم إيقاف الموقت" + }, + "confirmMSG": { + "message": "لتحرير أو حذف قيّم فردياً، انقر فوق زر المعلومات أو فتح الإضافة عن طريق النقر على أيقونة الإضافة في الزاوية اليمنى العليا." + }, + "clearThis": { + "message": "هل أنت متأكد أنك تريد حذف هذا؟\n\n" + }, + "Unknown": { + "message": "حدث خطأ في إرسال توقيت الرعاة الخاص بك، الرجاء المحاولة مرة أخرى لاحقاً." + }, + "sponsorFound": { + "message": "يحتوي هذا الفيديو على أجزاء في قاعدة البيانات!" + }, + "sponsor404": { + "message": "لم يتم العثور على أجزاء" + }, + "sponsorStart": { + "message": "يبدأ الجزء الآن" + }, + "sponsorEnd": { + "message": "ينتهي الجزء الآن" + }, + "sponsorCancel": { + "message": "إلغاء إنشاء جزء" + }, + "noVideoID": { + "message": "لم يتم العثور على فيديو يوتيوب.\nإذا كان هذا غير صحيح، قم بتحديث الصفحة." + }, + "refreshSegments": { + "message": "تحديث الأجزاء" } } diff --git a/public/_locales/bg/messages.json b/public/_locales/bg/messages.json index 94ab87e6..106f9096 100644 --- a/public/_locales/bg/messages.json +++ b/public/_locales/bg/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Пропускане отново" }, + "unmute": { + "message": "Вкл. на звука" + }, "paused": { "message": "На пауза" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Задайте потребителско име" }, + "copyPublicID": { + "message": "Копиране на публичния UserID" + }, "discordAdvert": { "message": "Елате в официалния Discord сървър, за да давате предложения!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Пропускане" }, + "mute": { + "message": "Заглушаване" + }, "skip_category": { "message": "Пропускане на {0}?" }, @@ -363,7 +372,7 @@ "message": "Импортиране/експортиране на вашия UserID" }, "whatChangeUserID": { - "message": "Това трябва да се пази тайно. То е като парола и не трябва да се споделя с никого. Ако някой го притежава, той може да се представи за вас." + "message": "Това трябва да се пази в тайна. То е като парола и не трябва да се споделя с никого. Ако някой го има, може да се представи за вас. Ако търсите своя публичен потребителски идентификатор, щракнете върху иконата на клипборда в изскачащия прозорец." }, "setUserID": { "message": "Задаване на UserID" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Автоматично пропускане на всички сегменти, когато има сегмент без музика" }, + "muteSegments": { + "message": "Разрешаване на сегменти, които заглушават звука, вместо да се пропускат" + }, "colorFormatIncorrect": { "message": "Вашият цвят не е форматиран правилно. Трябва да бъде 3- или 6-цифрен шестнадесетичен код с „#“ в началото." }, diff --git a/public/_locales/cs/messages.json b/public/_locales/cs/messages.json index b5d5bfa3..b2d2a5a9 100644 --- a/public/_locales/cs/messages.json +++ b/public/_locales/cs/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Znovu přeskočit" }, + "unmute": { + "message": "Zrušit ztlumení" + }, "paused": { "message": "Pozastaveno" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Nastavit uživatelské jméno" }, + "copyPublicID": { + "message": "Kopírovat veřejné uživatelské ID" + }, "discordAdvert": { "message": "Připojte se k oficiálnímu Discord serveru k podání návrhů a zpětné vazby!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Přeskočit" }, + "mute": { + "message": "Ztlumit" + }, "skip_category": { "message": "Přeskočit {0}?" }, @@ -363,7 +372,7 @@ "message": "Importovat / exportovat vaše UserID" }, "whatChangeUserID": { - "message": "Toto byste měli udržet v soukromí. Je to jako heslo a neměli byste jej s nikým sdílet. Pokud jej někdo má, může se za vás vydávat." + "message": "Toto by mělo být ponecháno v soukromí. Je to jako heslo a nemělo by být s nikým sdíleno. Pokud to někdo má, může se za vás vydávat. Pokud hledáte vaše veřejné uživatelské ID, klikněte na ikonu schránky ve vyskakovacím okně." }, "setUserID": { "message": "Nastavit UserID" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Automaticky přeskočit všechny segmenty, když je ve videu nehudební segment" }, + "muteSegments": { + "message": "Povolit segmenty, které místo přeskočení ztlumují zvuk" + }, "colorFormatIncorrect": { "message": "Vaše barva má nesprávný formát. Měl by to být 3 nebo 6 znaků dlouhý HEX kód s křížkem na začátku." }, diff --git a/public/_locales/de/messages.json b/public/_locales/de/messages.json index 2c5e2dd0..22fc5684 100644 --- a/public/_locales/de/messages.json +++ b/public/_locales/de/messages.json @@ -32,7 +32,7 @@ "message": "Melden" }, "reportButtonInfo": { - "message": "Diesen Beitrag als falsch melden." + "message": "Beitrag als unzulässig melden." }, "Dismiss": { "message": "Abbrechen" @@ -52,6 +52,9 @@ "reskip": { "message": "Nochmal überspringen" }, + "unmute": { + "message": "Ton an" + }, "paused": { "message": "Pausiert" }, @@ -86,7 +89,7 @@ "message": "Kein YouTube-Video gefunden.\nWenn dies falsch ist, aktualisiere den Tab." }, "refreshSegments": { - "message": "Segment aktualisieren" + "message": "Segmente aktualisieren" }, "success": { "message": "Geschafft!" @@ -161,6 +164,9 @@ "setUsername": { "message": "Benutzernamen festlegen" }, + "copyPublicID": { + "message": "Öffentliche Benutzer-ID kopieren" + }, "discordAdvert": { "message": "Tritt dem offiziellen Discord-Server bei und teile Anregungen und Feedback!" }, @@ -227,6 +233,21 @@ "showSkipNotice": { "message": "Zeige Pop-up nach dem Überspringen eines Segments" }, + "noticeVisibilityMode0": { + "message": "Skip-Meldung in voller größe" + }, + "noticeVisibilityMode1": { + "message": "Kleine Skip-Meldung für Auto-Skips" + }, + "noticeVisibilityMode2": { + "message": "Alles kleine Skip-Meldungen" + }, + "noticeVisibilityMode3": { + "message": "Verblasste Skip-Meldung für Auto-Skip" + }, + "noticeVisibilityMode4": { + "message": "Alles verblasste Skip-Meldungen" + }, "longDescription": { "message": "SponsorBlock lässt dich gesponserte Videosegmente, Intros, Outros, Interaktions-Erinnerungen, Musikvideoteile ohne Musik und andere nervige Teile von YouTube-Videos überspringen. SponsorBlock ist eine crowdsourced Browser-Erweiterung, in der jeder die Start- und Endzeit gesponserter Videosegmente und anderer Segmente von YouTube-Videos einreicht. Sobald eine Person diese Informationen einreicht, überspringen alle anderen mit dieser Erweiterung das gesponserte Segment.", "description": "Full description of the extension on the store pages." @@ -262,7 +283,8 @@ "keybindDescriptionComplete": { "message": "Die Taste wurde festgelegt auf: " }, - "0": { + + "0": { "message": "Zeitüberschreibung. Überprüfe deine Internetverbindung. Bist du mit dem Internet verbunden, ist der Server wahrscheinlich offline." }, "disableSkipping": { @@ -284,6 +306,9 @@ "skip": { "message": "Überspringen" }, + "mute": { + "message": "Ton aus" + }, "skip_category": { "message": "{0} überspringen?" }, @@ -348,7 +373,7 @@ "message": "Benutzer-ID importieren/exportieren" }, "whatChangeUserID": { - "message": "Halte diese ID geheim. Sie ist dazu in der Lage dich eindeutig zu identifizieren und sollte mit niemanden geteilt werden." + "message": "Dies sollte geheim gehalten werden. Dies ist wie ein Passwort und sollte mit niemandem geteilt werden. Sollte es jemand haben, könnte er sich als dich ausgeben. Wenn du nach deiner öffentlichen Benutzer-ID suchst, klicke das \"Kopieren\"-Symbol bei deinem Benutzernamen im Popup." }, "setUserID": { "message": "Interne Benutzer-ID festlegen" @@ -469,7 +494,7 @@ "message": "Vorschau" }, "unsubmitted": { - "message": "Nicht eingereicht" + "message": "Nicht übermittelt" }, "inspect": { "message": "Überprüfen" @@ -577,12 +602,18 @@ "autoSkip_POI": { "message": "Automatisch zum Start springen" }, + "manualSkip_POI": { + "message": "Beim Laden des Videos fragen" + }, "showOverlay_POI": { - "message": "In der Video-Zeitleiste anzeigen" + "message": "In Suchleiste anzeigen" }, "autoSkipOnMusicVideos": { "message": "Alle Segmente automatisch überspringen, wenn ein nicht-Musiksegment vorhanden ist" }, + "muteSegments": { + "message": "Segmente zulassen, die den Ton ausschalten anstatt zu überspringen" + }, "colorFormatIncorrect": { "message": "Die Farbe ist falsch formatiert. Sie sollte ein 3-6-stelliger Hex-Code mit einer Raute am Anfang sein." }, @@ -693,18 +724,91 @@ "help": { "message": "Hilfe" }, + "GotIt": { + "message": "Verstanden", + "description": "Used as the button to dismiss a tooltip" + }, "experiementOptOut": { - "message": "Abmeldung aller zukünftigen Experimente", + "message": "Aus allen zukünftigen Experimenten abmelden", "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private." }, "hideForever": { "message": "Dauerhaft verbergen" }, "warningChatInfo": { - "message": "Du wurdest ermahnt und kannst zur Zeit keine Segmente einreichen. Uns ist nämlich aufgefallen, dass du ein paar gängige Fehler machst, die nicht bösartig sind. Um die Regeln klarzustellen laden wir dich zu einem kurzem Gespräch auf discord.gg/SponsorBlock oder matrix.to/#/#sponsor:ajay.app ein" + "message": "Du wurdest verwarnt und kannst vorrübergehend keine Segmente einreichen. Es ist uns aufgefallen, dass du gängige Fehler machst, welche nicht schädlich sind, und wir wollen dir nur die Regeln klar machen. Du kannst auch dem Chat durch discord.gg/SponsorBlock oder matrix.to/#/#sponsor:ajay.app beitreten" }, "voteRejectedWarning": { - "message": "Abstimmung wegen einer Warnung abgelehnt. Um über sie zu reden, klicke hier, oder schreibe uns später.", + "message": "Abstimmung wegen einer Warnung abgelehnt. Klicke hier um einen Chat zu öffnen, oder versuch es später erneut, wenn du Zeit hast.", "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "Donate": { + "message": "Spenden" + }, + "hideDonationLink": { + "message": "Verstecke Spendenlink" + }, + "helpPageThanksForInstalling": { + "message": "Danke fürs installieren von SponsorBlock." + }, + "helpPageReviewOptions": { + "message": "Bitte überprüfe die unten stehenden Optionen" + }, + "helpPageFeatureDisclaimer": { + "message": "Viele Funktionen sind standardmäßig deaktiviert. Wenn du Intros und Outtros überspringen willst, Invidious verwenden willst, usw. aktiviere sie unten. Du kannst auch UI-Elemente verstecken/anzeigen." + }, + "helpPageHowSkippingWorks": { + "message": "Wie überspringen funktioniert" + }, + "helpPageHowSkippingWorks1": { + "message": "Videosegmente werden automatisch übersprungen, wenn sie in der Datenbank gefunden werden. Du kannst das Popup öffnen, indem du auf das Erweiterungssymbol klickst, um eine Vorschau darüber zu erhalten, was diese sind." + }, + "helpPageHowSkippingWorks2": { + "message": "Wannimmer du ein Segment überspringst, wirst du benachrichtigt. Wenn das Timing falsch erscheint, kannst du as durch klicken auf den Downvote button downvoten! Du kannst auch im Popup voten." + }, + "Submitting": { + "message": "Übermitteln" + }, + "helpPageSubmitting1": { + "message": "Das übermitteln kann entweder im Popup durch das drücken vom \"Segment Started Jetzt\" Knopf oder im Videoplayer mit den Knöpfen im Player gemacht werden." + }, + "helpPageSubmitting2": { + "message": "Mit einem Klick auf den Play-Knopf wird der Beginn eines Segments und mit dem klick auf den Stop-Knopf das ende eines Segments markiert. Du kannst mehrere Sponsoren vorbereiten, bevor du auf Absenden klickst. Das klicken des Upload-Knopfes wird die Segmente übermitteln. Das klicken des Mülleimers löscht es." + }, + "Editing": { + "message": "Bearbeitung" + }, + "helpPageEditing1": { + "message": "Wenn du etwas falsch gemacht hast, kannst du ein Segment bearbeiten oder löschen nachdem du auf den Auf-Pfeil Knopf gedrückt hast." + }, + "helpPageTooSlow": { + "message": "Das ist zu langsam" + }, + "helpPageTooSlow1": { + "message": "Es gibt Hotkeys, wenn du diese verwenden möchtest. Drücke die Semikolon-Taste um den Anfang/das Ende eines Sponsor-Segments zu markieren und die Abostrophe-Taste um es zu übermitteln. Diese können in den Optionen geändert werden. Wenn du keine QWERTY-Tastatur verwendest, solltest du eventuell die Keybinds ändern." + }, + "helpPageCopyOfDatabase": { + "message": "Kann ich eine kopie der Datenbank erhalten? Was passiert wenn du verschwindest?" + }, + "helpPageCopyOfDatabase1": { + "message": "Die Datenbank ist öffentlich und verfügbar unter" + }, + "helpPageCopyOfDatabase2": { + "message": "Der Quellcode ist frei verfügbar. Selbst wenn mir etwas passieren würde wären deine Übermittlungen nicht verloren." + }, + "helpPageNews": { + "message": "Nachrichten und wie es gemacht wird" + }, + "helpPageSourceCode": { + "message": "Wo kann ich den Quellcode kriegen?" + }, + "Credits": { + "message": "Credits" + }, + "highlightNewFeature": { + "message": "Neu! Gehe mit einem Klick zum Punkt des Videos mit der neuen \"Hervorheben\" Kategorie" + }, + "LearnMore": { + "message": "Erfahre mehr" } } diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index 29bc0ca3..355028e3 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Reskip" }, + "unmute": { + "message": "Unmute" + }, "paused": { "message": "Paused" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Set Username" }, + "copyPublicID": { + "message": "Copy Public UserID" + }, "discordAdvert": { "message": "Come join the official discord server to give suggestions and feedback!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Skip" }, + "mute": { + "message": "Mute" + }, "skip_category": { "message": "Skip {0}?" }, @@ -363,7 +372,7 @@ "message": "Import/Export Your UserID" }, "whatChangeUserID": { - "message": "This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you." + "message": "This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you. If you are looking for your public userID, click the clipboard icon in the popup." }, "setUserID": { "message": "Set UserID" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Auto skip all segments when there is a non-music segment" }, + "muteSegments": { + "message": "Allow segments that mute audio instead of skip" + }, "colorFormatIncorrect": { "message": "Your color is formatted incorrectly. It should be a 3 or 6 digit hex code with a number sign at the beginning." }, diff --git a/public/_locales/es/messages.json b/public/_locales/es/messages.json index d525d305..ba6de9a5 100644 --- a/public/_locales/es/messages.json +++ b/public/_locales/es/messages.json @@ -161,6 +161,9 @@ "setUsername": { "message": "Escoger Nombre De Usuario" }, + "copyPublicID": { + "message": "Copiar el ID de usuario público" + }, "discordAdvert": { "message": "¡Únete al servidor oficial de discord para darnos sugerencias y comentarios!" }, @@ -360,16 +363,13 @@ "message": "Comprueba status.sponsor.ajay.app para ver el estado del servidor." }, "changeUserID": { - "message": "Importar/Exportar tu UserID" - }, - "whatChangeUserID": { - "message": "Esto debería mantenerse privado. Es como una contraseña y no debe ser compartido con nadie. Si alguien tiene esto, pueden imitarte." + "message": "Importar/Exportar tu ID de usuario" }, "setUserID": { - "message": "Establecer la ID de usuario" + "message": "Establecer el ID de usuario" }, "userIDChangeWarning": { - "message": "Advertencia: El cambio de la ID de usuario es irreversible. ¿Está seguro de que le desea hacerlo? Asegúrese de hacer una copia de respaldo de la anterior por si acaso." + "message": "Advertencia: El cambio del ID de usuario es irreversible. ¿Está seguro de que le desea hacerlo? Asegúrese de hacer una copia de respaldo de la anterior por si acaso." }, "createdBy": { "message": "Creado Por" diff --git a/public/_locales/et/messages.json b/public/_locales/et/messages.json index e772e47d..fceb7d8c 100644 --- a/public/_locales/et/messages.json +++ b/public/_locales/et/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Jäta uuesti vahele" }, + "unmute": { + "message": "Tühista vaigistus" + }, "paused": { "message": "Pausil" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Määra kasutajanimi" }, + "copyPublicID": { + "message": "Kopeeri avalik UserID" + }, "discordAdvert": { "message": "Tule liitu ametliku Discordi serveriga, et anda soovitusi ja tagasisidet!" }, @@ -227,6 +233,21 @@ "showSkipNotice": { "message": "Kuva segmendi vahelejätmisel teatis" }, + "noticeVisibilityMode0": { + "message": "Täissuuruses vahelejätmise teavitused" + }, + "noticeVisibilityMode1": { + "message": "Väikesed vahelejätmise teavitused autom. vahelejätmistele" + }, + "noticeVisibilityMode2": { + "message": "Kõik vahelejätmise teavitused on väikesed" + }, + "noticeVisibilityMode3": { + "message": "Hääbuvad vahelejätmise teavitused autom. vahelejätmistele" + }, + "noticeVisibilityMode4": { + "message": "Kõik vahelejätmise teavitused hääbuvad" + }, "longDescription": { "message": "SponsorBlock lubab sul vahele jätta sponsorid, vaheajad, kanali tellimise meeldetuletused ja muud YouTube'i videote tüütud kohad. SponsorBlock on rahva ühistööna toimiv brauserilaiendus, mis lubab igaühel saata sponsoreeritud segmendi algus- ja lõpuaegu ning teiste video segmentide aegu. Kui üks inimene saadab sponsoreeritud segmendi, jätavad teised laienduse kasutajad kohe selle vahele. Laiendus võimaldab ka muusikavideotel mitte-muusika jaotised vahele jätta.", "description": "Full description of the extension on the store pages." @@ -284,6 +305,9 @@ "skip": { "message": "Jäta vahele" }, + "mute": { + "message": "Vaigista" + }, "skip_category": { "message": "Jätad {0} vahele?" }, @@ -348,7 +372,7 @@ "message": "Impordi/ekspordi oma UserID" }, "whatChangeUserID": { - "message": "Seda tuleks privaatsena hoida. See on nagu parool ning seda ei tohiks kellegagi jagada. Kui kellelgi see on, saavad nad sinuna esineda." + "message": "Seda tuleks privaatsena hoida. See on nagu parool ning seda ei tohiks kellegagi jagada. Kui kellelgi see on, saavad nad sinuna esineda.\nKui otsid avalikku UserID'd, klõpsa hüpikus olevat lõikelaua ikooni." }, "setUserID": { "message": "Seadista UserID" @@ -586,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Jäta automaatselt kõik segmendid vahele, kui eksisteerib mitte-muusika segment" }, + "muteSegments": { + "message": "Luba segmente, mis vahelejätmise asemel vaigistavad heli" + }, "colorFormatIncorrect": { "message": "Sinu värv on sobimatult vormistatud. See peaks olema 3- või 6-numbriline 16-kümmendsüsteemis kood, arvu ees trellid." }, @@ -723,9 +750,15 @@ "helpPageThanksForInstalling": { "message": "Täname SponsorBlocki paigaldamise eest." }, + "helpPageNews": { + "message": "Uudised ja kuidas see on valmistatud" + }, "Credits": { "message": "Tiitrid" }, + "highlightNewFeature": { + "message": "Uus! Mine ühe klõpsuga video eesmärgi juurde uue \"esiletõstu\" kategooriaga" + }, "LearnMore": { "message": "Lisateave" } diff --git a/public/_locales/fi/messages.json b/public/_locales/fi/messages.json index 65f6d5f1..dfb72fcf 100644 --- a/public/_locales/fi/messages.json +++ b/public/_locales/fi/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Ohita uudelleen" }, + "unmute": { + "message": "Poista mykistys" + }, "paused": { "message": "Pysäytetty" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Aseta käyttäjänimi" }, + "copyPublicID": { + "message": "Kopio julkinen UserID" + }, "discordAdvert": { "message": "Liity mukaan viralliselle Discord-palvelimelle, jotta voit antaa ehdotuksia ja palautetta!" }, @@ -299,11 +305,14 @@ "skip": { "message": "Ohita" }, + "mute": { + "message": "Mykistä" + }, "skip_category": { "message": "Ohita {0}?" }, "skip_to_category": { - "message": "Ohita {0}an?", + "message": "Ohita kohtaan: {0}", "description": "Used for skipping to things (Skip to Highlight)" }, "skipped": { @@ -311,7 +320,7 @@ "description": "Example: Sponsor Skipped" }, "skipped_to_category": { - "message": "Ohitettiin {0}an", + "message": "Ohitettiin kohtaan: {0}", "description": "Used for skipping to things (Skipped to Highlight)" }, "disableAutoSkip": { @@ -363,7 +372,7 @@ "message": "Tuo/vie UserID:si" }, "whatChangeUserID": { - "message": "Tämä tulisi pitää yksityisenä. Tämä on kuin salasana eikä sitä pitäisi jakaa kenellekään. Jos joku saa tämän, hän voi esiintyä sinuna." + "message": "Tämä pitäisi pitää yksityisenä. Tämä on kuin salasana, eikä sitä pitäisi jakaa kenenkään kanssa. Jos jollakulla on tämä, he voivat esiintyä sinuna. Jos etsit julkista userID:täsi, napsauta leikepöydän kuvaketta ponnahdusikkunassa." }, "setUserID": { "message": "Aseta UserID" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Ohita kaikki segmentit automaattisesti, kun videossa on \"Musiikiton\" segmentti" }, + "muteSegments": { + "message": "Salli segmentit, jotka mykistävät äänen ohittamisen sijaan" + }, "colorFormatIncorrect": { "message": "Väriformaattisi on muotoiltu väärin. Sen pitäisi olla 3 tai 6 numeroinen hex-koodi, jossa on # alussa." }, diff --git a/public/_locales/fr/messages.json b/public/_locales/fr/messages.json index ca8b5a31..a4c9da47 100644 --- a/public/_locales/fr/messages.json +++ b/public/_locales/fr/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Sauter" }, + "unmute": { + "message": "Réactiver le son" + }, "paused": { "message": "En pause" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Choisir un pseudonyme" }, + "copyPublicID": { + "message": "Copier l'ID utilisateur" + }, "discordAdvert": { "message": "Rejoignez le serveur Discord officiel pour toutes suggestions ou remarques!" }, @@ -227,6 +233,21 @@ "showSkipNotice": { "message": "Notifier après qu'un segment ait été sauté" }, + "noticeVisibilityMode0": { + "message": "Notifications de passage" + }, + "noticeVisibilityMode1": { + "message": "Petite notifications de passage pour l'auto skip" + }, + "noticeVisibilityMode2": { + "message": "Toute les petites notifications de passage" + }, + "noticeVisibilityMode3": { + "message": "Notifications de passage qui disparaissent pour l'auto skip" + }, + "noticeVisibilityMode4": { + "message": "Toute les notifications de passage qui disparaissent" + }, "longDescription": { "message": "SponsorBlock vous permet de passer les sponsors, les intros, les outros, les rappels d'abonnement et autres parties ennuyeuses des vidéos YouTube. SponsorBlock est une extension de navigateur qui permet à n'importe qui de soumettre les temps de début et de fin des segments sponsorisés et d'autres segments de vidéos YouTube. Une fois qu'une personne a soumis ces informations, toutes les autres personnes possédant cette extension passeront directement les segments sponsorisés. Vous pouvez également sauter les sections non musicales des vidéos musicales.", "description": "Full description of the extension on the store pages." @@ -284,9 +305,24 @@ "skip": { "message": "Passer" }, + "mute": { + "message": "Couper le son" + }, "skip_category": { "message": "Passer {0} ?" }, + "skip_to_category": { + "message": "Passer à {0}?", + "description": "Used for skipping to things (Skip to Highlight)" + }, + "skipped": { + "message": "{0} ignoré", + "description": "Example: Sponsor Skipped" + }, + "skipped_to_category": { + "message": "Sauté à {0}", + "description": "Used for skipping to things (Skipped to Highlight)" + }, "disableAutoSkip": { "message": "Désactiver le passage automatique" }, @@ -336,7 +372,7 @@ "message": "Importer/Exporter Votre ID d'Utilisateur" }, "whatChangeUserID": { - "message": "Cette information doit rester confidentielle. C'est comme un mot de passe et ne devrait pas être partagé avec quiconque. Si quelqu'un l'obtient, il pourra se faire passer pour vous." + "message": "Cela devrait rester privé. C'est comme un mot de passe et ne devrait être partagé avec personne. Si quelqu'un a cela, il peut vous usurper. Si vous recherchez votre identifiant d'utilisateur public, cliquez sur l'icône du presse-papiers dans le popup." }, "setUserID": { "message": "Définir \"UserID\"" @@ -538,6 +574,12 @@ "category_music_offtopic_short": { "message": "Hors musique" }, + "category_poi_highlight": { + "message": "Surligner" + }, + "category_poi_highlight_description": { + "message": "La partie de la vidéo que la plupart des gens veulent voir. Similaire à \"la vidéo commence à x mins\"." + }, "category_livestream_messages": { "message": "Stream : lecture de dons et messages" }, @@ -556,6 +598,21 @@ "disable": { "message": "Désactiver" }, + "autoSkip_POI": { + "message": "Passer automatiquement au début" + }, + "manualSkip_POI": { + "message": "Demander lors du chargement de la vidéo" + }, + "showOverlay_POI": { + "message": "Afficher dans la barre de recherche" + }, + "autoSkipOnMusicVideos": { + "message": "Ignorer automatiquement tous les segments lorsqu'il y a un segment non-musical" + }, + "muteSegments": { + "message": "Autoriser les segments qui bloquent l'audio au lieu de le passer" + }, "colorFormatIncorrect": { "message": "Votre couleur est mal formatée. Il devrait s'agir d'un code hexadécimal à 3 ou 6 chiffres avec un signe numérique au début." }, @@ -666,11 +723,91 @@ "help": { "message": "Aide" }, + "GotIt": { + "message": "Compris", + "description": "Used as the button to dismiss a tooltip" + }, "experiementOptOut": { "message": "Se désinscrire de toutes les futures expériences", "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private." }, "hideForever": { "message": "Cacher pour toujours" + }, + "warningChatInfo": { + "message": "Vous avez reçu un avertissement et ne pouvez pas soumettre des segments temporairement. Cela signifie que nous avons remarqué que vous commettez des erreurs courantes qui ne sont pas malveillantes, et que nous voulons simplement clarifier les règles. Vous pouvez également rejoindre ce chat en utilisant discord.gg/SponsorBlock ou matrix.to/#/+sponsor:ajay.app" + }, + "voteRejectedWarning": { + "message": "Le vote a été rejeté en raison d'un avertissement. Cliquez pour ouvrir un chat et y mettre fin , ou revenez plus tard lorsque vous avez le temps.", + "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "Donate": { + "message": "Faire un don" + }, + "hideDonationLink": { + "message": "Cacher le lien de don" + }, + "helpPageThanksForInstalling": { + "message": "Merci d'avoir installé SponsorBlock." + }, + "helpPageReviewOptions": { + "message": "Veuillez vérifier les options ci-dessous" + }, + "helpPageFeatureDisclaimer": { + "message": "De nombreuses fonctionnalités sont désactivées par défaut. Si vous voulez ignorer les intros, outros, utiliser Invidious, etc., activez-les ci-dessous. Vous pouvez également masquer/afficher les éléments de l'interface." + }, + "helpPageHowSkippingWorks": { + "message": "Comment fonctionne le saut d'un segment" + }, + "helpPageHowSkippingWorks1": { + "message": "Les segments vidéo seront automatiquement ignorés s'ils sont trouvés dans la base de données. Vous pouvez ouvrir le popup en cliquant sur l'icône de l'extension pour obtenir un aperçu de ces segments." + }, + "helpPageHowSkippingWorks2": { + "message": "À chaque fois que vous sautez un segment, vous en serez averti. Si le timing semble incorrect, vous pouvez disliker le segment, vous pouvez également voter dans le popup." + }, + "Submitting": { + "message": "Soumission en cours" + }, + "helpPageSubmitting1": { + "message": "La soumission peut être effectuée dans le popup en appuyant sur le bouton \"le segment commence maintenant\" ou dans le lecteur vidéo avec les boutons du lecteur." + }, + "helpPageSubmitting2": { + "message": "Cliquer sur le bouton de lecture indique le début d'un segment et cliquer sur l'icône d'arrêt indique la fin. Vous pouvez préparer plusieurs sponsors avant d'appuyer sur Soumettre. Cliquer sur le bouton de soumission enverra le segment. Cliquer sur le poubelle supprimera vos segments." + }, + "Editing": { + "message": "Édition en cours" + }, + "helpPageEditing1": { + "message": "Si vous avez fait une erreur, vous pouvez modifier ou supprimer vos segments après avoir cliqué sur le bouton avec la flèche vers le haut." + }, + "helpPageTooSlow": { + "message": "Ceci est trop lent" + }, + "helpPageTooSlow1": { + "message": "Il y a des raccourcis clavier si vous voulez les utiliser. Appuyez sur la touche point-virgule pour indiquer le début / la fin d'un segment sponsorisé et cliquez sur l'apostrophe pour soumettre. Cela peut être modifié dans les options. Si vous n'utilisez pas un clavier QWERTY, vous devriez probablement changer la touche assignée de base." + }, + "helpPageCopyOfDatabase": { + "message": "Puis-je obtenir une copie de la base de données ? Que se passe-t-il si vous disparaissez ?" + }, + "helpPageCopyOfDatabase1": { + "message": "La base de données est publique et disponible à" + }, + "helpPageCopyOfDatabase2": { + "message": "Le code source est librement disponible. Donc, même si il m'arrive quelque chose, vos soumissions ne seront pas perdues." + }, + "helpPageNews": { + "message": "Nouvelles et comment elles sont faites" + }, + "helpPageSourceCode": { + "message": "Où puis-je obtenir le code source ?" + }, + "Credits": { + "message": "Crédits" + }, + "highlightNewFeature": { + "message": "Nouveau! Aller à l'essentiel de la vidéo en un clic avec la nouvelle catégorie points essentiels" + }, + "LearnMore": { + "message": "En savoir plus" } } diff --git a/public/_locales/hr/messages.json b/public/_locales/hr/messages.json index 6b485d2c..ff7303ca 100644 --- a/public/_locales/hr/messages.json +++ b/public/_locales/hr/messages.json @@ -179,9 +179,6 @@ "hoursLower": { "message": "h" }, - "whatChangeUserID": { - "message": "Ovo bi trebalo ostati privatno. slično je lozinki i ne bi se smjelo dijeliti ni s kime. Ako netko ovo ima, mogu se lažno predstavljati kao ti." - }, "setUserID": { "message": "Postavi UserID" }, diff --git a/public/_locales/hu/messages.json b/public/_locales/hu/messages.json index 36e97bbf..20b38f43 100644 --- a/public/_locales/hu/messages.json +++ b/public/_locales/hu/messages.json @@ -329,9 +329,6 @@ "changeUserID": { "message": "UserID importálása / exportálása" }, - "whatChangeUserID": { - "message": "Ezt titokban kell tartani. Olyan, mint egy jelszó, nem szabad senkivel megosztania. Ha valakinek megvan, megszemélyesítheti Önt." - }, "setUserID": { "message": "UserID beállítása" }, @@ -431,6 +428,9 @@ "preview": { "message": "Előnézet" }, + "unsubmitted": { + "message": "Nincs beküldve" + }, "inspect": { "message": "Megvizsgál" }, @@ -495,6 +495,9 @@ "category_outro_description": { "message": "Stáblista, vagy amikor megjelennek a YouTube zárókártyák. Nem használandó információt tartalmazó következtetésekkor." }, + "category_preview": { + "message": "Előzetes/Ismétlés" + }, "category_music_offtopic": { "message": "Zene: nem-zene szegmens" }, @@ -597,5 +600,33 @@ }, "help": { "message": "Segítség" + }, + "GotIt": { + "message": "Értettem", + "description": "Used as the button to dismiss a tooltip" + }, + "hideForever": { + "message": "Eltüntetés örökre" + }, + "Donate": { + "message": "Támogatás" + }, + "Submitting": { + "message": "Küldés" + }, + "Editing": { + "message": "Szerkesztés" + }, + "helpPageTooSlow": { + "message": "Ez túl lassú" + }, + "helpPageNews": { + "message": "Hírek és hogyan készül" + }, + "Credits": { + "message": "Készítők" + }, + "LearnMore": { + "message": "Tudj meg többet" } } diff --git a/public/_locales/id/messages.json b/public/_locales/id/messages.json index effbcd6c..f0d99414 100644 --- a/public/_locales/id/messages.json +++ b/public/_locales/id/messages.json @@ -281,6 +281,18 @@ "skip_category": { "message": "Lewati {0}?" }, + "skip_to_category": { + "message": "Lompat ke {0}?", + "description": "Used for skipping to things (Skip to Highlight)" + }, + "skipped": { + "message": "{0} dilewati", + "description": "Example: Sponsor Skipped" + }, + "skipped_to_category": { + "message": "Melewati ke {0}", + "description": "Used for skipping to things (Skipped to Highlight)" + }, "disableAutoSkip": { "message": "Nonaktifkan Lewati Otomatis" }, @@ -329,9 +341,6 @@ "changeUserID": { "message": "Impor/Ekspor UserID" }, - "whatChangeUserID": { - "message": "Ini sebaiknya dirahasiakan. Ini terlihat seperti password dan sebaiknya tidak dibagikan ke orang lain. Jika seseorang mempunyai ini, dia dapat berpura-pura menjadi anda." - }, "setUserID": { "message": "Atur UserID" }, @@ -344,6 +353,9 @@ "keybindCurrentlySet": { "message": ". Saat ini diatur pada:" }, + "supportOtherSites": { + "message": "Dukung Situs Youtube Pihak Ketiga" + }, "optionsInfo": { "message": "Aktifkan dukungan Invidious, nonaktifkan lewati otomatis, tombol sembunyi dan lainnya." }, @@ -428,6 +440,9 @@ "preview": { "message": "Pratinjau" }, + "unsubmitted": { + "message": "Belum dikirim" + }, "inspect": { "message": "Inspeksi" }, @@ -492,6 +507,12 @@ "category_outro_description": { "message": "Kredit atau saat kartu akhir YouTube muncul. Tidak untuk kesimpulan dengan informasi." }, + "category_preview": { + "message": "Pratinjau/Rekap" + }, + "category_preview_description": { + "message": "Rekapan singkat dari episode sebelumnya, atau pratinjau tentang apa yang akan terjadi nanti di video. Dimaksudkan untuk klip bersama yang di edit, bukan ringkasan yang diucapkan." + }, "category_music_offtopic": { "message": "Musik: Bagian Non-Musik" }, @@ -519,9 +540,22 @@ "disable": { "message": "Nonaktif" }, + "manualSkip_POI": { + "message": "Tanya saat video dimuat" + }, + "showOverlay_POI": { + "message": "Tampilkan di Bilah Waktu" + }, + "autoSkipOnMusicVideos": { + "message": "Lewati semua segmen secara otomatis ketika ada segmen non-music" + }, "colorFormatIncorrect": { "message": "Warna anda tidak diformat dengan benar. Harusnya terdiri dari 3 atau 6 digit kode heksa dengan tagar di awal." }, + "previewColor": { + "message": "Warna yang Belum Dikirim", + "description": "Referring to submissions that have not been sent to the server yet." + }, "seekBarColor": { "message": "Warna Bilah Waktu" }, @@ -622,7 +656,29 @@ "categoryUpdate2": { "message": "Buka opsi untuk melewati intro, outro, merch, dll." }, + "help": { + "message": "Bantuan" + }, + "GotIt": { + "message": "Mengerti", + "description": "Used as the button to dismiss a tooltip" + }, "hideForever": { "message": "Sembunyikan selamanya" + }, + "Donate": { + "message": "Donasi" + }, + "hideDonationLink": { + "message": "Sembunyikan tautan donasi" + }, + "helpPageThanksForInstalling": { + "message": "Terima kasih telah menginstall SponsorBlock." + }, + "helpPageReviewOptions": { + "message": "Haram ditinjau opsi di bawah ini" + }, + "helpPageHowSkippingWorks": { + "message": "Cara kerja melewati segmen" } } diff --git a/public/_locales/it/messages.json b/public/_locales/it/messages.json index 747bcad5..ccb42357 100644 --- a/public/_locales/it/messages.json +++ b/public/_locales/it/messages.json @@ -161,6 +161,9 @@ "setUsername": { "message": "Imposta Username" }, + "copyPublicID": { + "message": "Copia UserID Pubblico" + }, "discordAdvert": { "message": "Entra nel server Discord ufficiale per darci suggerimenti e feedback!" }, @@ -363,7 +366,7 @@ "message": "Importa/Esporta Il Tuo ID Utente" }, "whatChangeUserID": { - "message": "Questo dovrebbe essere tenuto privato. Questo è come una password e non dovrebbe essere condiviso con nessuno. Se qualcuno ha questo, ti può impersonare." + "message": "Questo dovrebbe esser mantenuto privato. È come una password e non dovrebbe esser condiviso con nessuno. Se qualcuno lo possiede, può impersonarti. Se stai cercando il tuo userID pubblico, clicca l'icona degli appunti nel popup." }, "setUserID": { "message": "Imposta ID utente" diff --git a/public/_locales/ja/messages.json b/public/_locales/ja/messages.json index 8b9f319b..aab831bb 100644 --- a/public/_locales/ja/messages.json +++ b/public/_locales/ja/messages.json @@ -362,9 +362,6 @@ "changeUserID": { "message": "ユーザーIDのインポート/エクスポート" }, - "whatChangeUserID": { - "message": "ユーザーIDは公開しないでください。これはパスワードのようなもので誰とも共有するべきではありません。 他の誰かが知った場合、あなたになりすます可能性があります。" - }, "setUserID": { "message": "ユーザーIDを設定" }, diff --git a/public/_locales/ko/messages.json b/public/_locales/ko/messages.json index fd700bb2..e71c6159 100644 --- a/public/_locales/ko/messages.json +++ b/public/_locales/ko/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "다시 건너뛰기" }, + "unmute": { + "message": "음소거 해제" + }, "paused": { "message": "정지됨" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "사용자 이름 설정" }, + "copyPublicID": { + "message": "공개 사용자 ID 복사" + }, "discordAdvert": { "message": "공식 디스코드 서버에 들어와서 기능 제안을 해주시거나 피드백을 남겨주세요!" }, @@ -227,6 +233,21 @@ "showSkipNotice": { "message": "구간을 건너뛴 후 알림 표시" }, + "noticeVisibilityMode0": { + "message": "건너뛰기 알림 크게" + }, + "noticeVisibilityMode1": { + "message": "자동 건너뛰기에 대해서는 건너뛰기 알림 작게" + }, + "noticeVisibilityMode2": { + "message": "모든 건너뛰기 알림 작게" + }, + "noticeVisibilityMode3": { + "message": "자동 건너뛰기에 대해서는 건너뛰기 알림 숨김" + }, + "noticeVisibilityMode4": { + "message": "모든 건너뛰기 알림 숨김" + }, "longDescription": { "message": "SponsorBlock을 사용하면 영상에서 스폰서 광고, 인트로 영상, 아웃트로 영상, 구독 광고와 그 외 쓸데없는 부분을 즉시 건너뛸 수 있습니다. SponsorBlock은 모든 사람들이 참여하는 브라우저 확장 기능으로 확장 기능 사용자는 스폰서 광고 또는 다른 광고의 시작 시간과 끝 시간을 확인하여 서버로 전송할 수 있습니다. 이러한 정보가 전송되면 그 영상을 보는 다른 사용자들은 광고 구간이 나오기 전에 자동으로 건너뛸 수 있습니다. SponsorBlock을 사용하면 뮤직 비디오에서 음악이나 노래가 아닌 구간도 건너뛸 수 있습니다.", "description": "Full description of the extension on the store pages." @@ -284,6 +305,9 @@ "skip": { "message": "스킵" }, + "mute": { + "message": "음소거" + }, "skip_category": { "message": "{0} 을(를) 건너뛰겠어요?" }, @@ -348,7 +372,7 @@ "message": "사용자 ID 가져오기/내보내기" }, "whatChangeUserID": { - "message": "이 정보는 다른 사람에게 공개하지 마세요. 이것은 비밀번호처럼 절대로 알려주면 안되는 정보입니다. 다른 사람이 이 정보를 습득했을 경우 사용자를 사칭할 수도 있습니다." + "message": "이 정보는 다른 사람에게 공개하지 마세요. 이것은 비밀번호처럼 절대로 알려주면 안되는 정보입니다. 다른 사람이 이 정보를 습득했을 경우 사용자를 사칭할 수도 있습니다. 혹시 공개 사용자 ID를 찾고 있다면, 팝업 내 클립보드 아이콘을 누르시기 바랍니다." }, "setUserID": { "message": "사용자ID 설정" @@ -586,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "음악이 아닌 구간이 있을 때는 모든 구간 자동 건너뛰기" }, + "muteSegments": { + "message": "구간을 건너뛰지 않고 음소거 처리하도록 합니다" + }, "colorFormatIncorrect": { "message": "올바르지 않은 색상 코드입니다. 색상 코드는 샵 (#) 기호로 시작하여 3자리 또는 6자리의 16진수로 구성되어야 합니다." }, @@ -744,6 +771,9 @@ "helpPageSubmitting1": { "message": "\"광고 구간 시작\" 버튼을 누른 다음 팝업에서 제출할 수도 있으며 동영상 플레이어 내 버튼으로 제출할 수도 있습니다." }, + "helpPageSubmitting2": { + "message": "재생 아이콘을 누르면 구간의 시점을 정할 수 있고 중지 아이콘을 누르면 구간의 종점을 정할 수 있습니다. 제출하기 전 여러 구간을 설정할 수 있습니다. 업로드 아이콘을 눌러 제출할 수 있습니다. 휴지통 아이콘을 눌러 구간을 제거할 수 있습니다." + }, "Editing": { "message": "수정" }, @@ -753,6 +783,18 @@ "helpPageTooSlow": { "message": "너무 느립니다" }, + "helpPageTooSlow1": { + "message": "원하는 경우 단축키를 이용할 수 있습니다. 쌍반점 키를 눌러 스폰서 구간의 시점/종점을 설정할 수 있으며 작은따옴표 키를 눌러 구간을 제출할 수 있습니다. 설정에서 이를 변경할 수 있습니다. QWERTY 자판을 사용하지 않는 경우, 단축키 설정을 변경해야 할 수 있습니다." + }, + "helpPageCopyOfDatabase": { + "message": "데이터베이스의 사본을 구할 수 있을까요? 개발자에게 무슨 일이 생기면 어떻게 되는 거죠?" + }, + "helpPageCopyOfDatabase1": { + "message": "데이터베이스는 공개되어 있으며 다음 주소를 통해 접근할 수 있습니다" + }, + "helpPageCopyOfDatabase2": { + "message": "소스 코드는 자유롭게 이용할 수 있습니다. 따라서 제게 무슨 일이 생기더라도, 기여 사항이 사라지는 일은 없습니다." + }, "helpPageNews": { "message": "소식 및 제작 방법" }, diff --git a/public/_locales/ml/messages.json b/public/_locales/ml/messages.json index c4d67dca..47fdfbf5 100644 --- a/public/_locales/ml/messages.json +++ b/public/_locales/ml/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "നിങ്ങളുടെ യൂസർ ഐഡി ഇറക്കുമതി ചെയ്യുക / കയറ്റുമതി ചെയ്യുക" }, - "whatChangeUserID": { - "message": "ഇത് സ്വകാര്യമായി സൂക്ഷിക്കണം. ഇത് ഒരു പാസ്വേഡ് പോലെയാണ്, ഇത് ആരുമായും പങ്കിടാൻ പാടില്ല. ആർക്കെങ്കിലും ഇത് ഉണ്ടെങ്കിൽ, അവർക്ക് നിങ്ങളെ ആൾമാറാട്ടം നടത്താം." - }, "setUserID": { "message": "യൂസർ ഐഡി സജ്ജമാക്കുക" }, diff --git a/public/_locales/ms/messages.json b/public/_locales/ms/messages.json index 18bdcbd2..923c3f6d 100644 --- a/public/_locales/ms/messages.json +++ b/public/_locales/ms/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "Import / Eksport Id Pengguna Anda" }, - "whatChangeUserID": { - "message": "Perkara ini harus dirahsiakan. Ini seperti kata laluan dan tidak boleh dikongsi dengan sesiapa pun. Sekiranya seseorang mempunyai ini, mereka boleh menyamar sebagai anda." - }, "setUserID": { "message": "Tetapkan Id Pengguna" }, diff --git a/public/_locales/nl/messages.json b/public/_locales/nl/messages.json index 79b9e86a..c32c5ed4 100644 --- a/public/_locales/nl/messages.json +++ b/public/_locales/nl/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Opnieuw overslaan" }, + "unmute": { + "message": "Niet meer dempen" + }, "paused": { "message": "Gepauzeerd" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Gebruikersnaam instellen" }, + "copyPublicID": { + "message": "Publieke gebruikers-ID kopiëren" + }, "discordAdvert": { "message": "Word lid van de officiële Discord-server om suggesties en feedback te geven!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Overslaan" }, + "mute": { + "message": "Dempen" + }, "skip_category": { "message": "{0} overslaan?" }, @@ -363,7 +372,7 @@ "message": "Uw gebruikers-ID importeren/exporteren" }, "whatChangeUserID": { - "message": "Dit moet privé gehouden worden. Dit is als een wachtwoord en mag met niemand gedeeld worden. Als iemand dit heeft, kan hij zich voordoen als u." + "message": "Dit moet privé gehouden worden. Dit is als een wachtwoord en mag met niemand gedeeld worden. Als iemand dit heeft, kan hij zich voordoen als u. Klik op het klembordpictogram in de popup als u op zoek bent naar uw publieke gebrukers-ID." }, "setUserID": { "message": "Gebruikers-ID instellen" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Automatisch alle segmenten overslaan wanneer er een niet-muziek-segment is" }, + "muteSegments": { + "message": "Segmenten toestaan die audio dempen in plaats van overslaan" + }, "colorFormatIncorrect": { "message": "Uw kleur is verkeerd geformatteerd. Het moet een hexadecimale code van 3 of 6 cijfers zijn met een hekje aan het begin." }, diff --git a/public/_locales/no/messages.json b/public/_locales/no/messages.json index c83a5731..384c7d5e 100644 --- a/public/_locales/no/messages.json +++ b/public/_locales/no/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "Importer/Eksporter din bruker-ID" }, - "whatChangeUserID": { - "message": "Dette burde holdes privat. Dette er som et passord og burde ikke deles med noen. Hvis noen har dette, kan de etterligne deg." - }, "setUserID": { "message": "Angi bruker-ID" }, diff --git a/public/_locales/pl/messages.json b/public/_locales/pl/messages.json index 99c93082..27c02d7a 100644 --- a/public/_locales/pl/messages.json +++ b/public/_locales/pl/messages.json @@ -287,6 +287,10 @@ "skip_category": { "message": "Pominąć {0}?" }, + "skip_to_category": { + "message": "Przejść do {0}?", + "description": "Used for skipping to things (Skip to Highlight)" + }, "disableAutoSkip": { "message": "Wyłącz autopomijanie" }, @@ -335,9 +339,6 @@ "changeUserID": { "message": "Importuj/Eksportuj swój identyfikator użytkownika" }, - "whatChangeUserID": { - "message": "Ta informacja jest poufna i działa jak hasło. Użytkownik, który ma do niej dostęp, może zgłaszać treści jako ty." - }, "setUserID": { "message": "Ustaw identyfikator użytkownika" }, @@ -538,6 +539,9 @@ "category_music_offtopic_short": { "message": "Bez muzyki" }, + "category_poi_highlight": { + "message": "Podświetlone" + }, "category_livestream_messages": { "message": "Transmisja live: Dotacja/Czytanie wiadomości" }, @@ -682,5 +686,14 @@ "voteRejectedWarning": { "message": "Głosowanie odrzucone z powodu ostrzeżenia. Kliknij, aby otworzyć czat w celu rozwiązania problemu lub wróć później, gdy będziesz miał czas.", "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "helpPageSourceCode": { + "message": "Gdzie mogę otrzymać kod źródłowy?" + }, + "Credits": { + "message": "Autorzy" + }, + "LearnMore": { + "message": "Dowiedz się więcej" } } diff --git a/public/_locales/pt_BR/messages.json b/public/_locales/pt_BR/messages.json index eeb11707..1395f283 100644 --- a/public/_locales/pt_BR/messages.json +++ b/public/_locales/pt_BR/messages.json @@ -362,9 +362,6 @@ "changeUserID": { "message": "Importar/Exportar seu ID de usuário" }, - "whatChangeUserID": { - "message": "Isso deve ser mantido em segredo. É como se fosse uma senha e não deve ser compartilhado com ninguém. Se alguém tiver isso, poderá se passar por você." - }, "setUserID": { "message": "Definir ID de usuário" }, diff --git a/public/_locales/ro/messages.json b/public/_locales/ro/messages.json index 3ce2ff83..79c95539 100644 --- a/public/_locales/ro/messages.json +++ b/public/_locales/ro/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "Importă/Exportă Id-ul Tău De Utilizator" }, - "whatChangeUserID": { - "message": "Acest lucru trebuie să fie păstrat. Este ca și o parolă și nu ar trebui împartășită cu nimeni. Daca cineva are acest lucru, se poate da drept tu." - }, "setUserID": { "message": "Setează Id-ul Utilizatorului" }, diff --git a/public/_locales/ru/messages.json b/public/_locales/ru/messages.json index 40a2b1e4..28e44548 100644 --- a/public/_locales/ru/messages.json +++ b/public/_locales/ru/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Пропустить" }, + "unmute": { + "message": "Включить звук" + }, "paused": { "message": "Пауза" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Установить имя пользователя" }, + "copyPublicID": { + "message": "Копировать публичный UserID" + }, "discordAdvert": { "message": "Присоединяйтесь к официальному серверу Discord, чтобы оставить предложения и обратную связь!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Пропустить" }, + "mute": { + "message": "Заглушить" + }, "skip_category": { "message": "Пропустить {0}?" }, @@ -363,7 +372,7 @@ "message": "Импорт/Экспорт Вашего идентификатора пользователя" }, "whatChangeUserID": { - "message": "Его нужно держать в секрете. Это как пароль, не стоит им ни с кем делиться. Если он у кого-то есть, он сможет выдать себя за Вас." + "message": "Держите его в тайне. Относитесь к нему как к паролю и не передавайте никому. Если кто-то им завладеет, то сможет выдать себя за вас. Если вы ищете публичный ID пользователя, нажмите значок буфера обмена во всплывающем окне." }, "setUserID": { "message": "Установить идентификатор пользователя" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Пропускать все сегменты автоматически при наличии сегмента без музыки" }, + "muteSegments": { + "message": "Разрешить сегменты, которые отключают звук вместо пропуска" + }, "colorFormatIncorrect": { "message": "Вы ввели цвет в неправильном формате. Это должно быть 3-х или 6-ти значное шестнадцатеричное число с символом # в начале." }, diff --git a/public/_locales/sk/messages.json b/public/_locales/sk/messages.json index 0b995fb4..00528470 100644 --- a/public/_locales/sk/messages.json +++ b/public/_locales/sk/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Znovu preskočiť" }, + "unmute": { + "message": "Zrušiť stíšenie" + }, "paused": { "message": "Pozastavené" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Nastaviť Používateľské meno" }, + "copyPublicID": { + "message": "Skopírovať verejné ID používateľa" + }, "discordAdvert": { "message": "Pripojte sa k oficiálnemu Discord serveru a zanechajte nám pripomienky!" }, @@ -284,6 +290,9 @@ "skip": { "message": "Preskočiť" }, + "mute": { + "message": "Stíšiť" + }, "skip_category": { "message": "Preskočiť {0}?" }, @@ -348,7 +357,7 @@ "message": "Import/export vášho ID používateľa" }, "whatChangeUserID": { - "message": "Toto si držte v bezpečí. Je to ako heslo a nemali by ste ho s nikým zdieľať. Ten kto ho má by sa mohol za vás vydávať." + "message": "Toto si starostlivo uchovajte. Podobne ako heslo by ste to nemali s nikým zdieľať. Ak by to získal niekto ďalší, mohol by vám uškodiť. Ak hľadáte vaše verejné ID používateľa, stlačte ikonu schránky v podokne." }, "setUserID": { "message": "Nastaviť Používateľove ID" @@ -586,6 +595,9 @@ "autoSkipOnMusicVideos": { "message": "Automaticky preskočiť všetky segmenty ak neexistuje segment bez hudby" }, + "muteSegments": { + "message": "Povoliť segmenty, ktoré namiesto preskočenia stíšía zvuk" + }, "colorFormatIncorrect": { "message": "Vaša farba je nesprávne naformátovaná. Mal by to byť 3 alebo 6-miestny hexadecimálny kód so znakom čísla na začiatku." }, diff --git a/public/_locales/sv/messages.json b/public/_locales/sv/messages.json index c3a6a179..0a0ef90a 100644 --- a/public/_locales/sv/messages.json +++ b/public/_locales/sv/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Hoppa över igen" }, + "unmute": { + "message": "Ljud på" + }, "paused": { "message": "Pausad" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Ange användarnamn" }, + "copyPublicID": { + "message": "Kopiera publikt Användar-ID" + }, "discordAdvert": { "message": "Gå med i den officiella discordservern för att ge förslag och feedback!" }, @@ -299,6 +305,9 @@ "skip": { "message": "Hoppa över" }, + "mute": { + "message": "Ljud av" + }, "skip_category": { "message": "Hoppa över {0}?" }, @@ -363,7 +372,7 @@ "message": "Importera/Exportera Ditt AnvändarID" }, "whatChangeUserID": { - "message": "Denna ska hållas privat. Den fungerar som ett lösenord och ska inte delas med någon. Om någon får tag i den kan de utge sig för att vara dig." + "message": "Detta ska hållas privat. Detta är som ett lösenord och ska inte delas med någon. Om andra får tag i det kan de utge sig för att vara dig. Om du letar efter ditt offentliga Användar-ID kan du klicka på urklippsikonen i popupen." }, "setUserID": { "message": "Ange AnvändarID" @@ -601,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Hoppa över alla segment automatiskt när det finns ett icke-musiksegment" }, + "muteSegments": { + "message": "Tillåt segment som tystar ljudet i stället för att hoppa över" + }, "colorFormatIncorrect": { "message": "Din färg är felaktigt formaterad. Det ska vara en 3- eller 6-siffrig hex-kod med en siffra i början." }, diff --git a/public/_locales/ta/messages.json b/public/_locales/ta/messages.json index bfcc183e..6a140e35 100644 --- a/public/_locales/ta/messages.json +++ b/public/_locales/ta/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "உங்கள் பயனர் ஐடியை இறக்குமதி / ஏற்றுமதி செய்யுங்கள்" }, - "whatChangeUserID": { - "message": "இதை தனிப்பட்ட முறையில் வைத்திருக்க வேண்டும். இது கடவுச்சொல் போன்றது மற்றும் யாருடனும் பகிரக்கூடாது. யாராவது இதை வைத்திருந்தால், அவர்கள் உங்களைப் போல ஆள்மாறாட்டம் செய்யலாம்." - }, "setUserID": { "message": "UserID ஐ அமைக்கவும்" }, diff --git a/public/_locales/te/messages.json b/public/_locales/te/messages.json index 7fdf6e7c..1e9740c9 100644 --- a/public/_locales/te/messages.json +++ b/public/_locales/te/messages.json @@ -320,9 +320,6 @@ "changeUserID": { "message": "మీ యూజర్ఐడిని దిగుమతి / ఎగుమతి చేయండి" }, - "whatChangeUserID": { - "message": "దీన్ని ప్రైవేట్గా ఉంచాలి. ఇది పాస్వర్డ్ లాంటిది మరియు ఎవరితోనూ భాగస్వామ్యం చేయకూడదు. ఎవరైనా దీన్ని కలిగి ఉంటే, వారు మిమ్మల్ని వంచించగలరు." - }, "setUserID": { "message": "UserID ని సెట్ చేయండి" }, diff --git a/public/_locales/tr/messages.json b/public/_locales/tr/messages.json index de252d18..f0e26c33 100644 --- a/public/_locales/tr/messages.json +++ b/public/_locales/tr/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Tekrar atla" }, + "unmute": { + "message": "Sesi Aç" + }, "paused": { "message": "Duraklatıldı" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Kullanıcı Adı Belirle" }, + "copyPublicID": { + "message": "Herkese Açık Kullanıcı Kimliğini Kopyala" + }, "discordAdvert": { "message": "Öneri ve geri bildirimleriniz için resmi Discord serverımıza katılın!" }, @@ -227,6 +233,15 @@ "showSkipNotice": { "message": "Bir Kısmı Atladıktan Sonra Uyarı Göster" }, + "noticeVisibilityMode0": { + "message": "Tam Boyutlu Atlama Bildirimleri" + }, + "noticeVisibilityMode1": { + "message": "Otomatik Atlama için Küçük Atlama Bildirimleri" + }, + "noticeVisibilityMode2": { + "message": "Tüm Küçük Atlama Bildirimleri" + }, "longDescription": { "message": "SponsorBlock, sponsorları, giriş ve bitiş kısımlarını, abonelik hatırlatıcılarını ve YouTube videolarının diğer can sıkıcı kısımlarını atlamanıza olanak tanır. SponsorBlock, herkesin sponsorlu kısımları ve YouTube videolarının diğer kısımlarının başlangıç ve bitiş zamanlarını göndermesine izin veren kitle kaynaklı bir tarayıcı uzantısıdır. Bir kişi bu bilgiyi gönderdikten sonra, bu uzantıya sahip diğer herkes sponsorlu kısımları hemen atlayacaktır. Müzik videolarının müzik dışı bölümlerini de atlayabilirsiniz.", "description": "Full description of the extension on the store pages." @@ -284,6 +299,9 @@ "skip": { "message": "Atla" }, + "mute": { + "message": "Sustur" + }, "skip_category": { "message": "{0} atla?" }, @@ -348,7 +366,7 @@ "message": "Kullanıcı kimliğini Dışarı/İçeri Aktar" }, "whatChangeUserID": { - "message": "Bu gizli tutulmalıdır. Bu bir şifreye benzer ve diğerleriyle paylaşılmaması gerekir. Birinin eline geçerse, sizi taklit edebilir." + "message": "Bu gizli tutulmalıdır. Bu bir şifre gibidir ve kimseyle paylaşılmamalıdır. Eğer birisi buna sahipse, seni taklit edebilir. Herkese açık kullanıcı kimliğinizi arıyorsanız, açılır pencerede pano simgesine tıklayın." }, "setUserID": { "message": "Kullanıcı kimliği Belirle" @@ -550,6 +568,12 @@ "category_music_offtopic_short": { "message": "Müzik Olmayan Bölüm" }, + "category_poi_highlight": { + "message": "Vurgu" + }, + "category_poi_highlight_description": { + "message": "Videoda, çoğu insanın aradığı kısım. \"Video x sürede başlıyor\" yorumlarına benzer." + }, "category_livestream_messages": { "message": "Canlı Yayın: Bağış/Mesaj Okuma" }, @@ -580,6 +604,9 @@ "autoSkipOnMusicVideos": { "message": "Müzik olmayan kısım varsa tüm kısımları otomatik atla" }, + "muteSegments": { + "message": "Atlamak yerine sesi kapatan bölümlere izin ver" + }, "colorFormatIncorrect": { "message": "Renginiz yanlış biçimlendirilmiştir. Başında bir kare işareti bulunan 3 veya 6 basamaklı bir onaltılık kod olmalıdır." }, @@ -690,6 +717,10 @@ "help": { "message": "Yardım" }, + "GotIt": { + "message": "Anladım", + "description": "Used as the button to dismiss a tooltip" + }, "experiementOptOut": { "message": "Gelecekteki deneylerin hiçbirine katılma", "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private." @@ -703,5 +734,23 @@ "voteRejectedWarning": { "message": "Bir uyarı nedeniyle oy reddedildi. Çözüm bulmak için buraya tıklayarak bir sohbet açın veya daha sonra vaktiniz olduğunda uğrayın.", "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "Donate": { + "message": "Bağış Yap" + }, + "hideDonationLink": { + "message": "Bağış Bağlantısını Gizle" + }, + "helpPageThanksForInstalling": { + "message": "SponsorBlock'u yüklediğiniz için teşekkürler." + }, + "helpPageReviewOptions": { + "message": "Lütfen aşağıdaki seçenekleri inceleyin" + }, + "helpPageFeatureDisclaimer": { + "message": "Birçok özellik varsayılan olarak devre dışıdır. İntroları, outroları atlamak vb. kullanmak istiyorsanız, bunları aşağıdan etkinleştirin. Ayrıca arayüz öğelerini gizleyebilir/gösterebilirsiniz." + }, + "helpPageHowSkippingWorks": { + "message": "Atlama nasıl çalışıyor" } } diff --git a/public/_locales/uk/messages.json b/public/_locales/uk/messages.json index 1a951274..75161a7c 100644 --- a/public/_locales/uk/messages.json +++ b/public/_locales/uk/messages.json @@ -52,6 +52,9 @@ "reskip": { "message": "Пропустити" }, + "unmute": { + "message": "Увімкнути звук" + }, "paused": { "message": "Пауза" }, @@ -161,6 +164,9 @@ "setUsername": { "message": "Встановити ім'я користувача" }, + "copyPublicID": { + "message": "Копіювати публічний UserID" + }, "discordAdvert": { "message": "Приєднуйтесь до офіційного сервера Discord, щоб залишити пропозиції і зворотний зв'язок!" }, @@ -227,6 +233,21 @@ "showSkipNotice": { "message": "Показувати сповіщення після пропуску сегмента" }, + "noticeVisibilityMode0": { + "message": "Повнорозмірні сповіщення про пропуски" + }, + "noticeVisibilityMode1": { + "message": "Зменшені сповіщення для автоматичних пропусків" + }, + "noticeVisibilityMode2": { + "message": "Всі сповіщення зменшеного розміру" + }, + "noticeVisibilityMode3": { + "message": "Напівпрозорі сповіщення для автоматичних пропусків" + }, + "noticeVisibilityMode4": { + "message": "Напівпрозорі сповіщення для всіх пропусків" + }, "longDescription": { "message": "SponsorBlock дозволяє пропускати спонсорські вставки, початкові і кінцеві заставки, прохання підписатися і інше в відео на YouTube. SponsorBlock - колективне розширення, яке дозволяє кожному надіслати час початку і кінця подібних сегментів в відео. Після того, як хто-небудь надсилає цю інформацію, всі інші користувачі розширення будуть автоматично пропускати ці сегменти. Так само можна пропускати частини кліпів без музики.", "description": "Full description of the extension on the store pages." @@ -284,6 +305,9 @@ "skip": { "message": "Пропустити" }, + "mute": { + "message": "Вимкнути звук" + }, "skip_category": { "message": "Пропустити {0}?" }, @@ -348,7 +372,7 @@ "message": "Імпортувати/Експортувати Ваш ідентифікатор користувача" }, "whatChangeUserID": { - "message": "Це потрібно тримати в секреті. Це як пароль, не варто ним ні з ким ділитися. Якщо він у кого-то є, він зможе видати себе за Вас." + "message": "Тримайте його в таємниці. Ставтеся до нього як до паролю і не передавайте нікому. Якщо хтось їм заволодіє, то зможе видати себе за вас. Якщо ви шукаєте публічний ID користувача, натисніть значок буфера обміну у спливаючому вікні." }, "setUserID": { "message": "Встановити ідентифікатор користувача" @@ -586,6 +610,9 @@ "autoSkipOnMusicVideos": { "message": "Автоматично пропустити усі сегменти, якщо присутній сегмент без музики" }, + "muteSegments": { + "message": "Дозволити сегменти, які відключають звук замість пропуску" + }, "colorFormatIncorrect": { "message": "Ви ввели колір в неправильному форматі. Це повинно бути 3-х або 6-ти значне шістнадцяткове число з символом # на початку." }, @@ -696,6 +723,10 @@ "help": { "message": "Довідка" }, + "GotIt": { + "message": "Зрозуміло", + "description": "Used as the button to dismiss a tooltip" + }, "experiementOptOut": { "message": "Відмова від усіх майбутніх експериментів", "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private." @@ -709,5 +740,74 @@ "voteRejectedWarning": { "message": "Голосування відхилено через попередження. Натисніть, щоб відкрити чат для вирішення цієї проблеми, або поверніться пізніше.", "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "Donate": { + "message": "Пожертвувати" + }, + "hideDonationLink": { + "message": "Приховати посилання на пожертвування" + }, + "helpPageThanksForInstalling": { + "message": "Дякую за встановлення SponsorBlock." + }, + "helpPageReviewOptions": { + "message": "Будь ласка, ознайомтеся з налаштуваннями нижче" + }, + "helpPageFeatureDisclaimer": { + "message": "Багато функцій за замовчуванням відключені. Якщо ви хочете пропускати початкові і кінцеві заставки, використовувати Invidious, тощо, увімкніть їх нижче. Ви також можете приховати / показати елементи інтерфейсу." + }, + "helpPageHowSkippingWorks": { + "message": "Як працює пропуск" + }, + "helpPageHowSkippingWorks1": { + "message": "Сегменти відео будуть автоматично пропущені, якщо вони знаходяться в базі даних. Ви можете відкрити спливаюче вікно, натиснувши на значок розширення, щоб подивитися, які сегменти додані." + }, + "helpPageHowSkippingWorks2": { + "message": "Коли ви будете пропускати сегмент, ви отримаєте сповіщення. Якщо час здасться вам неправильним, проголосуйте проти, натиснувши на палець вниз! Ви також можете проголосувати у спливаючому вікні." + }, + "Submitting": { + "message": "Відправлення" + }, + "helpPageSubmitting1": { + "message": "Відправлення може бути виконана у спливаючому вікні натисканням на кнопку \"Сегмент починається звідси\" або кнопками в відеоплеєрі." + }, + "helpPageSubmitting2": { + "message": "Натискання на кнопку відтворення означає початок сегмента і натискання на кнопку стоп позначає його кінець. Ви можете позначити кілька сегментів перед тим, як натиснути на кнопку відправлення. Натискання на кошик видалить все." + }, + "Editing": { + "message": "Редагування" + }, + "helpPageEditing1": { + "message": "Якщо ви зробили щось не так, ви можете відредагувати або видалити сегменти, натиснувши на кнопку зі стрілкою вгору." + }, + "helpPageTooSlow": { + "message": "Це занадто повільно" + }, + "helpPageTooSlow1": { + "message": "Все це також можна робити за допомогою гарячих клавіш. Натисніть \"ж\" для вказівки початку/кінця сегмента, \"є\" для відправки. Клавіші можуть бути змінені в налаштуваннях. Якщо ви не використовуєте QWERTY, то варто відразу поміняти гарячі клавіші." + }, + "helpPageCopyOfDatabase": { + "message": "Чи можу я отримати копію бази даних? Що якщо ви пропадете?" + }, + "helpPageCopyOfDatabase1": { + "message": "База даних доступна для всіх тут:" + }, + "helpPageCopyOfDatabase2": { + "message": "Вихідний код у відкритому доступі, так що навіть якщо щось трапиться зі мною, ваш вклад не пропаде." + }, + "helpPageNews": { + "message": "Новини та як це зроблено" + }, + "helpPageSourceCode": { + "message": "Де можна отримати вихідний код?" + }, + "Credits": { + "message": "Автори" + }, + "highlightNewFeature": { + "message": "Новинка! Переходьте відразу до головного моменту відео за допомогою нової категорії \"Важливе\"" + }, + "LearnMore": { + "message": "Дізнатися більше" } } diff --git a/public/_locales/vi/messages.json b/public/_locales/vi/messages.json index ede8416e..33c48069 100644 --- a/public/_locales/vi/messages.json +++ b/public/_locales/vi/messages.json @@ -161,6 +161,9 @@ "setUsername": { "message": "Đặt tên người dùng" }, + "copyPublicID": { + "message": "Sao chép Public UserID" + }, "discordAdvert": { "message": "Hãy tham gia server Discord chính thức để đăng gợi ý và phản hồi!" }, @@ -227,6 +230,21 @@ "showSkipNotice": { "message": "Hiển thị thông báo sau khi bỏ qua quảng cáo" }, + "noticeVisibilityMode0": { + "message": "Thông báo bỏ qua với kích thước đầy đủ" + }, + "noticeVisibilityMode1": { + "message": "Thông báo bỏ qua kích thước nhỏ nếu phân đoạn được tự động bỏ qua" + }, + "noticeVisibilityMode2": { + "message": "Thông báo bỏ qua kích thước nhỏ cho toàn bộ phân đoạn" + }, + "noticeVisibilityMode3": { + "message": "Thông báo bỏ qua mờ nếu phân đoạn được tự động bỏ qua" + }, + "noticeVisibilityMode4": { + "message": "Thông báo bỏ qua mờ cho tất cả các phân đoạn" + }, "longDescription": { "message": "SponsorBlock giúp bạn bỏ qua quảng cáo từ nhà tài trợ, đoạn giới thiệu, đoạn kết, lời nhắc đăng ký kênh, và những phần khó chịu khác trong các video Youtube. SponsorBlock là một tiện ích mở rộng cho trình duyệt, cho phép tất cả người dùng đăng thời điểm bắt đầu và kết thúc của những đoạn quảng cáo từ nhà tài trợ và các đoạn khác trong video Youtube. Sau khi một người đăng thông tin này lên, tất cả mọi người dùng tiện ích mở rộng này sẽ bỏ qua đoạn quảng cáo đó. Bạn cũng có thể bỏ qua phần không có nhạc trong những video âm nhạc.", "description": "Full description of the extension on the store pages." @@ -335,9 +353,6 @@ "changeUserID": { "message": "Nhập/Xuất mã người dùng của bạn" }, - "whatChangeUserID": { - "message": "Bạn nên giữ bí mật mã này. Nó như mật khẩu vậy, do đó không nên chia sẻ với người khác. Nếu ai đó có mã này, họ có thể giả mạo bạn." - }, "setUserID": { "message": "Đặt mã người dùng" }, @@ -682,5 +697,20 @@ "voteRejectedWarning": { "message": "Bỏ phiếu bị từ chối do có cảnh báo. Nhấp để mở cuộc trò chuyện để giải quyết hoặc quay lại sau.", "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser." + }, + "Donate": { + "message": "Donate" + }, + "hideDonationLink": { + "message": "Ẩn link donate" + }, + "helpPageThanksForInstalling": { + "message": "Cảm ơn bạn đã cài đặt SponsorBlock." + }, + "helpPageReviewOptions": { + "message": "Xin hãy xem xét các tuỳ chọn bên dưới" + }, + "helpPageTooSlow": { + "message": "Quá chậm" } } diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json index 0c4c76f4..147c341c 100644 --- a/public/_locales/zh_CN/messages.json +++ b/public/_locales/zh_CN/messages.json @@ -323,9 +323,6 @@ "changeUserID": { "message": "导入/导出您的用户 ID" }, - "whatChangeUserID": { - "message": "这应该被保密。这就像一个密码，且不应该告诉任何人。如果有人拥有它，他就可以冒充您。" - }, "setUserID": { "message": "设定用户 ID" }, diff --git a/public/_locales/zh_TW/messages.json b/public/_locales/zh_TW/messages.json index 6b347efd..d731fe49 100644 --- a/public/_locales/zh_TW/messages.json +++ b/public/_locales/zh_TW/messages.json @@ -335,9 +335,6 @@ "changeUserID": { "message": "匯入/匯出您的使用者 ID" }, - "whatChangeUserID": { - "message": "這應該被保密。這就像一個密碼，不應該與他人分享。如果有人擁有它，他們就可以冒充您。" - }, "setUserID": { "message": "設定使用者 ID" }, diff --git a/public/content.css b/public/content.css index b2e4b1e5..13cab8e4 100644 --- a/public/content.css +++ b/public/content.css @@ -140,7 +140,6 @@ min-width: 350px; max-width: 50%; - border-radius: 5px; border-spacing: 5px 10px; padding-left: 5px; padding-right: 5px; @@ -148,13 +147,20 @@ border-collapse: unset; } -.sponsorSkipNotice { - min-width: 350px; +.sponsorSkipNoticeTableContainer { background-color: rgba(28, 28, 28, 0.9); + border-radius: 5px; + min-width: 100%; +} +.sponsorSkipNotice { transition: all 0.1s ease-out; } +.sponsorSkipNoticeLimitWidth { + min-width: calc(100% - 50px); +} + .sponsorSkipNotice .hidden { display: none; } @@ -311,7 +317,6 @@ .sponsorTimesInfoMessage { font-size: 13.3333px; color: rgb(235, 235, 235); - text-align: center; } .voteButton { @@ -467,7 +472,7 @@ input::-webkit-inner-spin-button { text-decoration: underline; } -.sponsorTimeCategories { +.sponsorTimeEditSelector { margin-top: 5px; margin-bottom: 5px; diff --git a/public/help/index.html b/public/help/index.html index 94007bef..4d69f321 100644 --- a/public/help/index.html +++ b/public/help/index.html @@ -119,7 +119,7 @@ <a href="https://github.com/ajayyy/SponsorBlockServer/graphs/contributors">SponsorBlockServer contributors</a> and <a href="https://github.com/ajayyy/SponsorBlockSite/graphs/contributors">SponsorBlockSite contributors</a> such as <a href="https://github.com/NDevTK">NDev</a>, <a href="https://github.com/Joe-Dowd">Joe Dowd</a>, - <a href="https://github.com/bershanskiy">Anton Bershanskiy</a> and more. + <a href="https://mchang.name/">Michael Chang</a> and more. </p> <p>The awesome <a href="https://github.com/omarroth/invidious/wiki/API">Invidious API</a> is used to grab the time the video was published.</p> diff --git a/public/options/options.html b/public/options/options.html index 540b5122..b1a0dcb4 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -50,6 +50,22 @@ <br/> </div> + <div option-type="toggle" sync-option="muteSegments"> + <label class="switch-container"> + <label class="switch"> + <input type="checkbox" checked> + <span class="slider round"></span> + </label> + <div class="switch-label"> + __MSG_muteSegments__ + </div> + </label> + + <br/> + <br/> + <br/> + </div> + <br/> <br/> diff --git a/public/popup.css b/public/popup.css index 4398eaa4..96259cf2 100644 --- a/public/popup.css +++ b/public/popup.css @@ -265,7 +265,7 @@ background-color:#ec1c1c; align-items: center; } -.sbSlimButton, #additionalButtons>button, button#setUsernameButton, #submitUsername { +.sbSlimButton, #additionalButtons>button, button#setUsernameButton, #submitUsername, #copyUserID { background: none; border: none; color: white; @@ -341,6 +341,14 @@ label>p, #disableExtension>p, #usernameValue, #usernameElement > div > p,#sponso cursor: pointer; } +#copyUserID { + width: 100%; +} + +#setUsernameContainer { + display: flex; +} + #usernameElement > div, #sponsorTimesContributionsContainer > div { display: flex; flex-flow: column nowrap; diff --git a/public/popup.html b/public/popup.html index f7cfb07a..f21c674d 100644 --- a/public/popup.html +++ b/public/popup.html @@ -19,7 +19,7 @@ <p id="loadingIndicator">__MSG_noVideoID__</p> <!-- If the video was found in the database --> <p id="videoFound"></p> - <button class="sbSlimButton hidden" id="refreshSegmentsButton" title="__MSG_refreshSegments__"> + <button class="sbSlimButton" id="refreshSegmentsButton" title="__MSG_refreshSegments__"> <img id="refreshSegments" src="/icons/refresh.svg"/> </button> </div> @@ -90,6 +90,9 @@ <button id="setUsernameButton" title="__MSG_setUsername__"> <img src="/icons/pencil.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconEdit"> </button> + <button id="copyUserID" title="__MSG_copyPublicID__"> + <img src="/icons/clipboard.svg" alt="__MSG_copyPublicID__" width="16" height="16" id="sbPopupIconCopyUserID"> + </button> </div> <div id="setUsername" style="display: none"> <div id="setUsernameStatusContainer" style="display: none"> diff --git a/src/components/NoticeComponent.tsx b/src/components/NoticeComponent.tsx index 4c088258..fc514ec5 100644 --- a/src/components/NoticeComponent.tsx +++ b/src/components/NoticeComponent.tsx @@ -25,6 +25,7 @@ export interface NoticeProps { bottomRow?: React.ReactElement[], smaller?: boolean, + limitWidth?: boolean, // Callback for when this is closed closeListener: () => void, @@ -102,65 +103,69 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> { onMouseEnter={(e) => this.onMouseEnter(e) } onMouseLeave={() => this.timerMouseLeave()} style={noticeStyle} > - <table className={"sponsorSkipObject sponsorSkipNotice" + <div className={"sponsorSkipNoticeTableContainer" + (this.props.fadeIn ? " sponsorSkipNoticeFadeIn" : "") - + (this.state.startFaded ? " sponsorSkipNoticeFaded" : "") } > - <tbody> - - {/* First row */} - <tr id={"sponsorSkipNoticeFirstRow" + this.idSuffix}> - {/* Left column */} - <td className="noticeLeftIcon"> - {/* Logo */} - <img id={"sponsorSkipLogo" + this.idSuffix} - className="sponsorSkipLogo sponsorSkipObject" - src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}> - </img> - - <span id={"sponsorSkipMessage" + this.idSuffix} - style={{float: "left"}} - className="sponsorSkipMessage sponsorSkipObject"> - - {this.state.noticeTitle} - </span> + + (this.state.startFaded ? " sponsorSkipNoticeFaded" : "") }> + <table className={"sponsorSkipObject sponsorSkipNotice" + + (this.props.limitWidth ? " sponsorSkipNoticeLimitWidth" : "")}> + <tbody> - {this.props.firstColumn} - </td> + {/* First row */} + <tr id={"sponsorSkipNoticeFirstRow" + this.idSuffix} + className="sponsorSkipNoticeFirstRow"> + {/* Left column */} + <td className="noticeLeftIcon"> + {/* Logo */} + <img id={"sponsorSkipLogo" + this.idSuffix} + className="sponsorSkipLogo sponsorSkipObject" + src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}> + </img> + + <span id={"sponsorSkipMessage" + this.idSuffix} + style={{float: "left"}} + className="sponsorSkipMessage sponsorSkipObject"> + + {this.state.noticeTitle} + </span> - {this.props.firstRow} + {this.props.firstColumn} + </td> - {/* Right column */} - <td className="sponsorSkipNoticeRightSection" - style={{top: "9.32px"}}> - - {/* Time left */} - {this.props.timed ? ( - <span id={"sponsorSkipNoticeTimeLeft" + this.idSuffix} - onClick={() => this.toggleManualPause()} - className="sponsorSkipObject sponsorSkipNoticeTimeLeft"> + {this.props.firstRow} - {this.getCountdownElements()} + {/* Right column */} + <td className="sponsorSkipNoticeRightSection" + style={{top: "9.32px"}}> + + {/* Time left */} + {this.props.timed ? ( + <span id={"sponsorSkipNoticeTimeLeft" + this.idSuffix} + onClick={() => this.toggleManualPause()} + className="sponsorSkipObject sponsorSkipNoticeTimeLeft"> - </span> - ) : ""} - + {this.getCountdownElements()} + + </span> + ) : ""} + - {/* Close button */} - <img src={chrome.extension.getURL("icons/close.png")} - className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton" - onClick={() => this.close()}> - </img> - </td> - </tr> + {/* Close button */} + <img src={chrome.extension.getURL("icons/close.png")} + className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton" + onClick={() => this.close()}> + </img> + </td> + </tr> - {this.props.children} + {this.props.children} - {!this.props.smaller && this.props.bottomRow ? - this.props.bottomRow - : null} + {!this.props.smaller && this.props.bottomRow ? + this.props.bottomRow + : null} - </tbody> - </table> + </tbody> + </table> + </div> {/* Add as a hidden table to keep the height constant */} {this.props.smaller && this.props.bottomRow ? diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx index 0af1efad..b96ce070 100644 --- a/src/components/SkipNoticeComponent.tsx +++ b/src/components/SkipNoticeComponent.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import * as CompileConfig from "../../config.json"; import Config from "../config" -import { Category, ContentContainer, CategoryActionType, SponsorHideType, SponsorTime, NoticeVisbilityMode } from "../types"; +import { Category, ContentContainer, CategoryActionType, SponsorHideType, SponsorTime, NoticeVisbilityMode, ActionType } from "../types"; import NoticeComponent from "./NoticeComponent"; import NoticeTextSelectionComponent from "./NoticeTextSectionComponent"; @@ -39,8 +39,9 @@ export interface SkipNoticeState { maxCountdownTime?: () => number; countdownText?: string; - unskipText?: string; - unskipCallback?: (index: number) => void; + skipButtonText?: string; + skipButtonCallback?: (index: number) => void; + showSkipButton?: boolean; downvoting?: boolean; choosingCategory?: boolean; @@ -82,7 +83,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta this.audio = null; const noticeTitle = getSkippingText(this.segments, this.props.autoSkip); - + const previousSkipNotices = document.getElementsByClassName("sponsorSkipNoticeParent"); this.amountOfPreviousNotices = previousSkipNotices.length; // If there is at least one already in the first slot @@ -110,8 +111,9 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta countdownTime: Config.config.skipNoticeDuration, countdownText: null, - unskipText: chrome.i18n.getMessage("unskip"), - unskipCallback: (index) => this.unskip(index), + skipButtonText: this.getUnskipText(), + skipButtonCallback: (index) => this.unskip(index), + showSkipButton: true, downvoting: false, choosingCategory: false, @@ -126,7 +128,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta if (!this.autoSkip) { // Assume manual skip is only skipping 1 submission - Object.assign(this.state, this.getUnskippedModeInfo(0, chrome.i18n.getMessage("skip"))); + Object.assign(this.state, this.getUnskippedModeInfo(0, this.getSkipText())); } } @@ -165,6 +167,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta ref={this.noticeRef} closeListener={() => this.closeListener()} smaller={this.state.smaller} + limitWidth={true} firstColumn={firstColumn} bottomRow={[...this.getMessageBoxes(), ...this.getBottomRow() ]} onMouseEnter={() => this.onMouseEnter() } > @@ -296,9 +299,9 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta } getSkipButton(): JSX.Element { - if (this.segments.length > 1 + if (this.state.showSkipButton && (this.segments.length > 1 || getCategoryActionType(this.segments[0].category) !== CategoryActionType.POI - || this.props.unskipTime) { + || this.props.unskipTime)) { return ( <span className="sponsorSkipNoticeUnskipSection"> <button id={"sponsorSkipUnskipButton" + this.idSuffix} @@ -306,7 +309,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta style={{marginLeft: "4px"}} onClick={() => this.prepAction(SkipNoticeAction.Unskip)}> - {this.state.unskipText + (this.state.showKeybindHint ? " (" + Config.config.skipKeybind + ")" : "")} + {this.state.skipButtonText + (this.state.showKeybindHint ? " (" + Config.config.skipKeybind + ")" : "")} </button> </span> ); @@ -396,7 +399,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta this.contentContainer().vote(undefined, this.segments[index].UUID, this.categoryOptionRef.current.value as Category, this) break; case SkipNoticeAction.Unskip: - this.state.unskipCallback(index); + this.state.skipButtonCallback(index); break; } @@ -456,7 +459,29 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta unskip(index: number): void { this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime); - this.unskippedMode(index, chrome.i18n.getMessage("reskip")); + this.unskippedMode(index, this.getReskipText()); + } + + reskip(index: number): void { + this.contentContainer().reskipSponsorTime(this.segments[index]); + + const newState: SkipNoticeState = { + skipButtonText: this.getUnskipText(), + skipButtonCallback: this.unskip.bind(this), + + maxCountdownTime: () => Config.config.skipNoticeDuration, + countdownTime: Config.config.skipNoticeDuration + }; + + // See if the title should be changed + if (!this.autoSkip) { + newState.noticeTitle = chrome.i18n.getMessage("noticeTitle"); + } + + //reset countdown + this.setState(newState, () => { + this.noticeRef.current.resetCountdown(); + }); } /** Sets up notice to be not skipped yet */ @@ -478,36 +503,14 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta } : this.state.maxCountdownTime; return { - unskipText: buttonText, - unskipCallback: (index) => this.reskip(index), + skipButtonText: buttonText, + skipButtonCallback: (index) => this.reskip(index), // change max duration to however much of the sponsor is left maxCountdownTime: maxCountdownTime, countdownTime: maxCountdownTime() } as SkipNoticeState; } - reskip(index: number): void { - this.contentContainer().reskipSponsorTime(this.segments[index]); - - const newState: SkipNoticeState = { - unskipText: chrome.i18n.getMessage("unskip"), - unskipCallback: this.unskip.bind(this), - - maxCountdownTime: () => Config.config.skipNoticeDuration, - countdownTime: Config.config.skipNoticeDuration - }; - - // See if the title should be changed - if (!this.autoSkip) { - newState.noticeTitle = chrome.i18n.getMessage("noticeTitle"); - } - - //reset countdown - this.setState(newState, () => { - this.noticeRef.current.resetCountdown(); - }); - } - afterVote(segment: SponsorTime, type: number, category: Category): void { this.addVoteButtonInfo(chrome.i18n.getMessage("voted")); @@ -558,6 +561,52 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta this.props.closeListener(); } + + unmutedListener(): void { + if (this.props.segments.length === 1 + && this.props.segments[0].actionType === ActionType.Mute + && this.contentContainer().v.currentTime >= this.props.segments[0].segment[1]) { + this.setState({ + showSkipButton: false + }); + } + } + + private getUnskipText(): string { + switch (this.props.segments[0].actionType) { + case ActionType.Mute: { + return chrome.i18n.getMessage("unmute"); + } + case ActionType.Skip: + default: { + return chrome.i18n.getMessage("unskip"); + } + } + } + + private getReskipText(): string { + switch (this.props.segments[0].actionType) { + case ActionType.Mute: { + return chrome.i18n.getMessage("mute"); + } + case ActionType.Skip: + default: { + return chrome.i18n.getMessage("reskip"); + } + } + } + + private getSkipText(): string { + switch (this.props.segments[0].actionType) { + case ActionType.Mute: { + return chrome.i18n.getMessage("mute"); + } + case ActionType.Skip: + default: { + return chrome.i18n.getMessage("skip"); + } + } + } } export default SkipNoticeComponent; diff --git a/src/components/SponsorTimeEditComponent.tsx b/src/components/SponsorTimeEditComponent.tsx index 8d9f516e..5664f7a9 100644 --- a/src/components/SponsorTimeEditComponent.tsx +++ b/src/components/SponsorTimeEditComponent.tsx @@ -1,12 +1,12 @@ import * as React from "react"; - -import Config from "../config"; import * as CompileConfig from "../../config.json"; - +import Config from "../config"; +import { ActionType, ActionTypes, Category, CategoryActionType, ContentContainer, SponsorTime } from "../types"; import Utils from "../utils"; -import { Category, CategoryActionType, ContentContainer, SponsorTime } from "../types"; -import SubmissionNoticeComponent from "./SubmissionNoticeComponent"; import { getCategoryActionType } from "../utils/categoryUtils"; +import SubmissionNoticeComponent from "./SubmissionNoticeComponent"; + + const utils = new Utils(); export interface SponsorTimeEditProps { @@ -32,6 +32,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo idSuffix: string; categoryOptionRef: React.RefObject<HTMLSelectElement>; + actionTypeOptionRef: React.RefObject<HTMLSelectElement>; configUpdateListener: () => void; @@ -39,6 +40,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo super(props); this.categoryOptionRef = React.createRef(); + this.actionTypeOptionRef = React.createRef(); this.idSuffix = this.props.idSuffix; @@ -171,7 +173,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo {/* Category */} <div style={{position: "relative"}}> <select id={"sponsorTimeCategories" + this.idSuffix} - className="sponsorTimeCategories" + className="sponsorTimeEditSelector sponsorTimeCategories" defaultValue={sponsorTime.category} ref={this.categoryOptionRef} onChange={this.categorySelectionChange.bind(this)}> @@ -188,6 +190,19 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo </a> </div> + {/* Action Type */} + {getCategoryActionType(sponsorTime.category) === CategoryActionType.Skippable ? ( + <div style={{position: "relative"}}> + <select id={"sponsorTimeActionTypes" + this.idSuffix} + className="sponsorTimeEditSelector sponsorTimeActionTypes" + defaultValue={sponsorTime.actionType} + ref={this.actionTypeOptionRef} + onChange={() => this.saveEditTimes()}> + {this.getActionTypeOptions()} + </select> + </div> + ): ""} + <br/> {/* Editing Tools */} @@ -269,6 +284,21 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo this.saveEditTimes(); } + getActionTypeOptions(): React.ReactElement[] { + const elements = []; + + for (const actionType of ActionTypes) { + elements.push( + <option value={actionType} + key={actionType}> + {chrome.i18n.getMessage(actionType)} + </option> + ); + } + + return elements; + } + setTimeToNow(index: number): void { this.setTimeTo(index, this.props.contentContainer().getRealCurrentTime()); } @@ -331,6 +361,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo } sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value as Category; + sponsorTimesSubmitting[this.props.index].actionType = + this.actionTypeOptionRef?.current ? this.actionTypeOptionRef.current.value as ActionType : ActionType.Skip; Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimesSubmitting); diff --git a/src/config.ts b/src/config.ts index 8aa314fb..8bcdc061 100644 --- a/src/config.ts +++ b/src/config.ts @@ -17,6 +17,7 @@ interface SBConfig { submissionCountSinceCategories: number, // New count used to show the "Read The Guidelines!!" message showTimeWithSkips: boolean, disableSkipping: boolean, + muteSegments: boolean, trackViewCount: boolean, trackViewCountInPrivate: boolean, dontShowNotice: boolean, @@ -162,6 +163,7 @@ const Config: SBObject = { submissionCountSinceCategories: 0, showTimeWithSkips: true, disableSkipping: false, + muteSegments: true, trackViewCount: true, trackViewCountInPrivate: true, dontShowNotice: false, diff --git a/src/content.ts b/src/content.ts index d5365aae..a4175d61 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1,5 +1,5 @@ import Config from "./config"; -import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, VideoInfo, StorageChangesObject, CategoryActionType, ChannelIDInfo, ChannelIDStatus, SponsorSourceType, SegmentUUID, Category, SkipToTimeParams, ToggleSkippable } from "./types"; +import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, VideoInfo, StorageChangesObject, CategoryActionType, ChannelIDInfo, ChannelIDStatus, SponsorSourceType, SegmentUUID, Category, SkipToTimeParams, ToggleSkippable, ActionType, ScheduledTime } from "./types"; import { ContentContainer } from "./types"; import Utils from "./utils"; @@ -45,6 +45,7 @@ let sponsorSkipped: boolean[] = []; //the video let video: HTMLVideoElement; +let videoMuted = false; // Has it been attempted to be muted let videoMutationObserver: MutationObserver = null; // List of videos that have had event listeners added to them const videosWithEventListeners: HTMLVideoElement[] = []; @@ -396,7 +397,6 @@ function cancelSponsorSchedule(): void { } /** - * * @param currentTime Optional if you don't want to use the actual current time */ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?: number, includeNonIntersectingSegments = true): void { @@ -412,6 +412,17 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?: } if (!video || video.paused) return; + if (currentTime === undefined || currentTime === null) currentTime = video.currentTime; + + if (videoMuted && !inMuteSegment(currentTime)) { + video.muted = false; + videoMuted = false; + + for (const notice of skipNotices) { + // So that the notice can hide buttons + notice.unmutedListener(); + } + } if (Config.config.disableSkipping || channelWhitelisted || (channelIDInfo.status === ChannelIDStatus.Fetching && Config.config.forceChannelCheck)){ return; @@ -419,14 +430,12 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?: if (incorrectVideoCheck()) return; - if (currentTime === undefined || currentTime === null) currentTime = video.currentTime; - const skipInfo = getNextSkipIndex(currentTime, includeIntersectingSegments, includeNonIntersectingSegments); if (skipInfo.index === -1) return; const currentSkip = skipInfo.array[skipInfo.index]; - const skipTime: number[] = [currentSkip.segment[0], skipInfo.array[skipInfo.endIndex].segment[1]]; + const skipTime: number[] = [currentSkip.scheduledTime, skipInfo.array[skipInfo.endIndex].segment[1]]; const timeUntilSponsor = skipTime[0] - currentTime; const videoID = sponsorVideoID; @@ -461,7 +470,8 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?: openNotice: skipInfo.openNotice }); - if (utils.getCategorySelection(currentSkip.category)?.option === CategorySkipOption.ManualSkip) { + if (utils.getCategorySelection(currentSkip.category)?.option === CategorySkipOption.ManualSkip + || currentSkip.actionType === ActionType.Mute) { forcedSkipTime = skipTime[0] + 0.001; } else { forcedSkipTime = skipTime[1]; @@ -480,12 +490,19 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?: } } +function inMuteSegment(currentTime: number): boolean { + const checkFunction = (segment) => segment.actionType === ActionType.Mute && segment.segment[0] <= currentTime && segment.segment[1] > currentTime; + return sponsorTimes?.some(checkFunction) || sponsorTimesSubmitting.some(checkFunction); +} + /** * This makes sure the videoID is still correct and if the sponsorTime is included */ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boolean { const currentVideoID = getYouTubeVideoID(document.URL); - if (currentVideoID !== (videoID || sponsorVideoID) || (sponsorTime && (!sponsorTimes || !sponsorTimes.includes(sponsorTime)) && !sponsorTimesSubmitting.includes(sponsorTime))) { + if (currentVideoID !== (videoID || sponsorVideoID) || (sponsorTime + && (!sponsorTimes || !sponsorTimes?.some((time) => time.segment === sponsorTime.segment)) + && !sponsorTimesSubmitting.some((time) => time.segment === sponsorTime.segment))) { // Something has really gone wrong console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be."); console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID); @@ -575,7 +592,7 @@ function setupVideoListeners() { } if (!Config.config.dontShowNotice) { - const currentPoiSegment = sponsorTimes.find((segment) => + const currentPoiSegment = sponsorTimes?.find((segment) => getCategoryActionType(segment.category) === CategoryActionType.POI && video.currentTime - segment.segment[0] > 0 && video.currentTime - segment.segment[0] < previewBar.getMinimumSize(true)); @@ -644,6 +661,7 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) { const hashPrefix = (await utils.getHash(id, 1)).substr(0, 4); const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, { categories, + actionTypes: Config.config.muteSegments ? [ActionType.Skip, ActionType.Mute] : [ActionType.Skip], userAgent: `${chrome.runtime.id}` }); @@ -945,31 +963,33 @@ async function whitelistCheck() { * Returns info about the next upcoming sponsor skip */ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: boolean, includeNonIntersectingSegments: boolean): - {array: SponsorTime[], index: number, endIndex: number, openNotice: boolean} { + {array: ScheduledTime[], index: number, endIndex: number, openNotice: boolean} { - const sponsorStartTimes = getStartTimes(sponsorTimes, includeIntersectingSegments, includeNonIntersectingSegments); - const sponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimes, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, true, true); + const { includedTimes: submittedArray, startTimeIndexes: sponsorStartTimes } = + getStartTimes(sponsorTimes, includeIntersectingSegments, includeNonIntersectingSegments); + const { startTimeIndexes: sponsorStartTimesAfterCurrentTime } = getStartTimes(sponsorTimes, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, true, true); const minSponsorTimeIndex = sponsorStartTimes.indexOf(Math.min(...sponsorStartTimesAfterCurrentTime)); - const endTimeIndex = getLatestEndTimeIndex(sponsorTimes, minSponsorTimeIndex); + const endTimeIndex = getLatestEndTimeIndex(submittedArray, minSponsorTimeIndex); - const unsubmittedSponsorStartTimes = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments); - const unsubmittedSponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, false, false); + const { includedTimes: unsubmittedArray, startTimeIndexes: unsubmittedSponsorStartTimes } = + getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments); + const { startTimeIndexes: unsubmittedSponsorStartTimesAfterCurrentTime } = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, false, false); const minUnsubmittedSponsorTimeIndex = unsubmittedSponsorStartTimes.indexOf(Math.min(...unsubmittedSponsorStartTimesAfterCurrentTime)); - const previewEndTimeIndex = getLatestEndTimeIndex(sponsorTimesSubmitting, minUnsubmittedSponsorTimeIndex); + const previewEndTimeIndex = getLatestEndTimeIndex(unsubmittedArray, minUnsubmittedSponsorTimeIndex); if ((minUnsubmittedSponsorTimeIndex === -1 && minSponsorTimeIndex !== -1) || sponsorStartTimes[minSponsorTimeIndex] < unsubmittedSponsorStartTimes[minUnsubmittedSponsorTimeIndex]) { return { - array: sponsorTimes.filter((segment) => getCategoryActionType(segment.category) === CategoryActionType.Skippable), + array: submittedArray, index: minSponsorTimeIndex, endIndex: endTimeIndex, openNotice: true }; } else { return { - array: sponsorTimesSubmitting.filter((segment) => getCategoryActionType(segment.category) === CategoryActionType.Skippable), + array: unsubmittedArray, index: minUnsubmittedSponsorTimeIndex, endIndex: previewEndTimeIndex, openNotice: false @@ -993,7 +1013,10 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideHiddenSponsors = true): number { // Only combine segments for AutoSkip if (index == -1 || - shouldAutoSkip(sponsorTimes[index])) return index; + !shouldAutoSkip(sponsorTimes[index]) + || sponsorTimes[index].actionType !== ActionType.Skip) { + return index; + } // Default to the normal endTime let latestEndTimeIndex = index; @@ -1004,7 +1027,8 @@ function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideH if (currentSegment[0] <= latestEndTime && currentSegment[1] > latestEndTime && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible) - && shouldAutoSkip(sponsorTimes[i])) { + && shouldAutoSkip(sponsorTimes[i]) + && sponsorTimes[i].actionType === ActionType.Skip) { // Overlapping segment latestEndTimeIndex = i; } @@ -1029,24 +1053,43 @@ function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideH * the current time, but end after */ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments: boolean, includeNonIntersectingSegments: boolean, - minimum?: number, onlySkippableSponsors = false, hideHiddenSponsors = false): number[] { - if (sponsorTimes === null) return []; + minimum?: number, onlySkippableSponsors = false, hideHiddenSponsors = false): {includedTimes: ScheduledTime[], startTimeIndexes: number[]} { + if (!sponsorTimes) return {includedTimes: [], startTimeIndexes: []}; + + const includedTimes: ScheduledTime[] = []; + const startTimeIndexes: number[] = []; + + const possibleTimes = sponsorTimes.flatMap((sponsorTime) => { + const results = [{ + ...sponsorTime, + scheduledTime: sponsorTime.segment[0] + }] + + if (sponsorTime.actionType === ActionType.Mute) { + // Schedule at the end time to know when to unmute + results.push({ + ...sponsorTime, + scheduledTime: sponsorTime.segment[1] + }) + } - const startTimes: number[] = []; + return results; + }) - for (let i = 0; i < sponsorTimes?.length; i++) { + for (let i = 0; i < possibleTimes.length; i++) { if ((minimum === undefined - || ((includeNonIntersectingSegments && sponsorTimes[i].segment[0] >= minimum) - || (includeIntersectingSegments && sponsorTimes[i].segment[0] < minimum && sponsorTimes[i].segment[1] > minimum))) - && (!onlySkippableSponsors || shouldSkip(sponsorTimes[i])) - && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible) - && getCategoryActionType(sponsorTimes[i].category) === CategoryActionType.Skippable) { - - startTimes.push(sponsorTimes[i].segment[0]); + || ((includeNonIntersectingSegments && possibleTimes[i].scheduledTime >= minimum) + || (includeIntersectingSegments && possibleTimes[i].scheduledTime < minimum && possibleTimes[i].segment[1] > minimum))) + && (!onlySkippableSponsors || shouldSkip(possibleTimes[i])) + && (!hideHiddenSponsors || possibleTimes[i].hidden === SponsorHideType.Visible) + && getCategoryActionType(possibleTimes[i].category) === CategoryActionType.Skippable) { + + startTimeIndexes.push(possibleTimes[i].scheduledTime); + includedTimes.push(possibleTimes[i]); } } - return startTimes; + return { includedTimes, startTimeIndexes }; } /** @@ -1085,17 +1128,34 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped: //skip from the start time to the end time for a certain index sponsor time function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, unskipTime}: SkipToTimeParams): void { + if (Config.config.disableSkipping) return; + // There will only be one submission if it is manual skip const autoSkip: boolean = forceAutoSkip || shouldAutoSkip(skippingSegments[0]); - if ((autoSkip || sponsorTimesSubmitting.includes(skippingSegments[0])) && v.currentTime !== skipTime[1]) { - // Fix for looped videos not working when skipping to the end #426 - // for some reason you also can't skip to 1 second before the end - if (v.loop && v.duration > 1 && skipTime[1] >= v.duration - 1) { - v.currentTime = 0; - } else { - v.currentTime = skipTime[1]; + if ((autoSkip || sponsorTimesSubmitting.some((time) => time.segment === skippingSegments[0].segment)) + && v.currentTime !== skipTime[1]) { + switch(skippingSegments[0].actionType) { + case ActionType.Skip: { + // Fix for looped videos not working when skipping to the end #426 + // for some reason you also can't skip to 1 second before the end + if (v.loop && v.duration > 1 && skipTime[1] >= v.duration - 1) { + v.currentTime = 0; + } else { + v.currentTime = skipTime[1]; + } + + break; + } + case ActionType.Mute: { + if (!v.muted) { + v.muted = true; + videoMuted = true; + } + break; + } } + } if (!autoSkip @@ -1135,19 +1195,29 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u } function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null) { - //add a tiny bit of time to make sure it is not skipped again - console.log(unskipTime) - video.currentTime = unskipTime ?? segment.segment[0] + 0.001; + if (segment.actionType === ActionType.Mute) { + video.muted = false; + videoMuted = false; + } else { + //add a tiny bit of time to make sure it is not skipped again + video.currentTime = unskipTime ?? segment.segment[0] + 0.001; + } + } function reskipSponsorTime(segment: SponsorTime) { - const skippedTime = Math.max(segment.segment[1] - video.currentTime, 0); - const segmentDuration = segment.segment[1] - segment.segment[0]; - const fullSkip = skippedTime / segmentDuration > manualSkipPercentCount; - - video.currentTime = segment.segment[1]; - sendTelemetryAndCount([segment], skippedTime, fullSkip); - startSponsorSchedule(true, segment.segment[1], false); + if (segment.actionType === ActionType.Mute) { + video.muted = true; + videoMuted = true; + } else { + const skippedTime = Math.max(segment.segment[1] - video.currentTime, 0); + const segmentDuration = segment.segment[1] - segment.segment[0]; + const fullSkip = skippedTime / segmentDuration > manualSkipPercentCount; + + video.currentTime = segment.segment[1]; + sendTelemetryAndCount([segment], skippedTime, fullSkip); + startSponsorSchedule(true, segment.segment[1], false); + } } function createButton(baseID: string, title: string, callback: () => void, imageName: string, isDraggable = false): HTMLElement { @@ -1190,13 +1260,13 @@ function createButton(baseID: string, title: string, callback: () => void, image function shouldAutoSkip(segment: SponsorTime): boolean { return utils.getCategorySelection(segment.category)?.option === CategorySkipOption.AutoSkip || - (Config.config.autoSkipOnMusicVideos && sponsorTimes.some((s) => s.category === "music_offtopic") + (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic") && getCategoryActionType(segment.category) === CategoryActionType.Skippable); } function shouldSkip(segment: SponsorTime): boolean { return utils.getCategorySelection(segment.category)?.option !== CategorySkipOption.ShowOverlay || - (Config.config.autoSkipOnMusicVideos && sponsorTimes.some((s) => s.category === "music_offtopic")); + (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic")); } function getControls(): HTMLElement | false { @@ -1330,6 +1400,7 @@ function startOrEndTimingNewSegment() { segment: [getRealCurrentTime()], UUID: null, category: Config.config.defaultCategory, + actionType: ActionType.Skip, source: SponsorSourceType.Local }); } else { @@ -1386,6 +1457,7 @@ function updateSponsorTimesSubmitting(getFromConfig = true) { segment: segmentTime.segment, UUID: segmentTime.UUID, category: segmentTime.category, + actionType: segmentTime.actionType, source: segmentTime.source }); } @@ -1457,11 +1529,13 @@ function openInfoMenu() { const logo = <HTMLImageElement> popup.querySelector("#sponsorBlockPopupLogo"); const settings = <HTMLImageElement> popup.querySelector("#sbPopupIconSettings"); const edit = <HTMLImageElement> popup.querySelector("#sbPopupIconEdit"); + const copy = <HTMLImageElement> popup.querySelector("#sbPopupIconCopyUserID"); const check = <HTMLImageElement> popup.querySelector("#sbPopupIconCheck"); const refreshSegments = <HTMLImageElement> popup.querySelector("#refreshSegments"); logo.src = chrome.extension.getURL("icons/IconSponsorBlocker256px.png"); settings.src = chrome.extension.getURL("icons/settings.svg"); edit.src = chrome.extension.getURL("icons/pencil.svg"); + copy.src = chrome.extension.getURL("icons/clipboard.svg"); check.src = chrome.extension.getURL("icons/check.svg"); refreshSegments.src = chrome.extension.getURL("icons/refresh.svg"); diff --git a/src/popup.ts b/src/popup.ts index 0b0664c0..680e0779 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -1,9 +1,10 @@ import Config from "./config"; import Utils from "./utils"; -import { SponsorTime, SponsorHideType } from "./types"; +import { SponsorTime, SponsorHideType, CategoryActionType } from "./types"; import { Message, MessageResponse } from "./messageTypes"; import { showDonationLink } from "./utils/configUtils"; +import { getCategoryActionType } from "./utils/categoryUtils"; const utils = new Utils(); interface MessageListener { @@ -96,6 +97,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { "usernameInput", "usernameValue", "submitUsername", + "sbPopupIconCopyUserID", // More "submissionSection", "mainControls", @@ -134,6 +136,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { PageElements.optionsButton.addEventListener("click", openOptions); PageElements.helpButton.addEventListener("click", openHelp); PageElements.refreshSegmentsButton.addEventListener("click", refreshSegments); + PageElements.sbPopupIconCopyUserID.addEventListener("click", async () => navigator.clipboard.writeText(await utils.getHash(Config.config.userID))); /** If true, the content script is in the process of creating a new segment. */ let creatingSegment = false; @@ -291,12 +294,10 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { if (request.found) { PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound"); - PageElements.refreshSegmentsButton.classList.remove("hidden"); displayDownloadedSponsorTimes(request); } else { PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404"); - PageElements.refreshSegmentsButton.classList.add("hidden"); } } @@ -401,7 +402,10 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> { const textNode = document.createTextNode(utils.shortCategoryName(segmentTimes[i].category) + extraInfo); const segmentTimeFromToNode = document.createElement("div"); - segmentTimeFromToNode.innerText = utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true); + segmentTimeFromToNode.innerText = utils.getFormattedTime(segmentTimes[i].segment[0], true) + + (getCategoryActionType(segmentTimes[i].category) !== CategoryActionType.POI + ? " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true) + : ""); segmentTimeFromToNode.style.margin = "5px"; sponsorTimeButton.appendChild(categoryColorCircle); diff --git a/src/render/SkipNotice.tsx b/src/render/SkipNotice.tsx index 24f98369..5113c2da 100644 --- a/src/render/SkipNotice.tsx +++ b/src/render/SkipNotice.tsx @@ -71,6 +71,10 @@ class SkipNotice { toggleSkip(): void { this.skipNoticeRef?.current?.prepAction(SkipNoticeAction.Unskip); } + + unmutedListener(): void { + this.skipNoticeRef?.current?.unmutedListener(); + } } export default SkipNotice;
\ No newline at end of file diff --git a/src/types.ts b/src/types.ts index dd72ad4b..cb5cc0e2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -56,6 +56,13 @@ export enum CategoryActionType { POI = "_POI" } +export enum ActionType { + Skip = "skip", + Mute = "mute" +} + +export const ActionTypes = [ActionType.Skip, ActionType.Mute]; + export type SegmentUUID = string & { __segmentUUIDBrand: unknown }; export type Category = string & { __categoryBrand: unknown }; @@ -69,11 +76,16 @@ export interface SponsorTime { UUID: SegmentUUID; category: Category; + actionType: ActionType; hidden?: SponsorHideType; source?: SponsorSourceType; } +export interface ScheduledTime extends SponsorTime { + scheduledTime: number; +} + export interface PreviewBarOption { color: string, opacity: string diff --git a/test/selenium.test.ts b/test/selenium.test.ts new file mode 100644 index 00000000..3ec4037e --- /dev/null +++ b/test/selenium.test.ts @@ -0,0 +1,146 @@ +import { Builder, By, until, WebDriver } from "selenium-webdriver"; +import * as Chrome from "selenium-webdriver/chrome"; +import * as Path from "path"; + +test("Selenium Chrome test", async () => { + const driver = await setup(); + + try { + await waitForInstall(driver); + // This video has no ads + await goToVideo(driver, "jNQXAC9IVRw"); + + await createSegment(driver, "4", "10.33", "0:04.000 to 0:10.330"); + + await editSegments(driver, 0, "0:04.000", "0:10.330", "5", "13.211", "0:05.000 to 0:13.211", false); + await autoskipSegment(driver, 5, 13.211); + + await setSegmentActionType(driver, 0, 1, false); + await editSegments(driver, 0, "0:05.000", "0:13.211", "5", "7.5", "0:05.000 to 0:07.500", false); + await muteSkipSegment(driver, 5, 7.5); + } finally { + await driver.quit(); + } +}, 100_000); + +async function setup(): Promise<WebDriver> { + const options = new Chrome.Options(); + options.addArguments("--load-extension=" + Path.join(__dirname, "../dist/")); + options.addArguments("--mute-audio"); + options.addArguments("--disable-features=PreloadMediaEngagementData, MediaEngagementBypassAutoplayPolicies"); + + const driver = await new Builder().forBrowser("chrome").setChromeOptions(options).build(); + driver.manage().setTimeouts({ + implicit: 5000 + }); + + return driver; +} + +async function waitForInstall(driver: WebDriver, startingTab = 0): Promise<void> { + // Selenium only knows about the one tab it's on, + // so we can't wait for the help page to appear + await driver.sleep(3000); + + const handles = await driver.getAllWindowHandles(); + await driver.switchTo().window(handles[startingTab]); +} + +async function goToVideo(driver: WebDriver, videoId: string): Promise<void> { + await driver.get("https://www.youtube.com/watch?v=" + videoId); + await driver.wait(until.elementIsVisible(await driver.findElement(By.className("ytd-video-primary-info-renderer")))); +} + +async function createSegment(driver: WebDriver, startTime: string, endTime: string, expectedDisplayedTime: string): Promise<void> { + const startSegmentButton = await driver.findElement(By.id("startSegmentButton")); + const cancelSegmentButton = await driver.findElement(By.id("cancelSegmentButton")); + await driver.executeScript("document.querySelector('video').currentTime = " + startTime); + + await startSegmentButton.click(); + await driver.wait(until.elementIsVisible(cancelSegmentButton)); + + await driver.executeScript("document.querySelector('video').currentTime = " + endTime); + + await startSegmentButton.click(); + await driver.wait(until.elementIsNotVisible(cancelSegmentButton)); + + const submitButton = await driver.findElement(By.id("submitButton")); + await submitButton.click(); + + const sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay")); + const sponsorTimeDisplay = sponsorTimeDisplays[sponsorTimeDisplays.length - 1]; + await driver.wait(until.elementTextIs(sponsorTimeDisplay, expectedDisplayedTime)); +} + +async function editSegments(driver: WebDriver, index: number, expectedStartTimeBox: string, expectedEndTimeBox: string, + startTime: string, endTime: string, expectedDisplayedTime: string, openSubmitBox: boolean): Promise<void> { + + if (openSubmitBox) { + const submitButton = await driver.findElement(By.id("submitButton")); + await submitButton.click(); + } + + let editButton = await driver.findElement(By.id("sponsorTimeEditButtonSubmissionNotice" + index)); + let sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay")); + let sponsorTimeDisplay = sponsorTimeDisplays[index]; + await sponsorTimeDisplay.click(); + // Ensure edit time appears + await driver.findElement(By.id("submittingTime0SubmissionNotice" + index)); + + // Try the edit button too + await editButton.click(); + await editButton.click(); + + const startTimeBox = await driver.findElement(By.id("submittingTime0SubmissionNotice" + index)); + expect((await startTimeBox.getAttribute("value"))).toBe(expectedStartTimeBox); + await startTimeBox.clear(); + await startTimeBox.sendKeys(startTime); + + const endTimeBox = await driver.findElement(By.id("submittingTime1SubmissionNotice" + index)); + expect((await endTimeBox.getAttribute("value"))).toBe(expectedEndTimeBox); + await endTimeBox.clear(); + await endTimeBox.sendKeys(endTime); + + editButton = await driver.findElement(By.id("sponsorTimeEditButtonSubmissionNotice" + index)); + await editButton.click(); + + sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay")); + sponsorTimeDisplay = sponsorTimeDisplays[index]; + await driver.wait(until.elementTextIs(sponsorTimeDisplay, expectedDisplayedTime)); +} + +async function setSegmentActionType(driver: WebDriver, index: number, actionTypeIndex: number, openSubmitBox: boolean): Promise<void> { + if (openSubmitBox) { + const submitButton = await driver.findElement(By.id("submitButton")); + await submitButton.click(); + } + + const actionTypeSelection = await driver.findElement(By.css(`#sponsorTimeActionTypesSubmissionNotice${index} > option:nth-child(${actionTypeIndex + 1})`)); + actionTypeSelection.click(); +} + +async function autoskipSegment(driver: WebDriver, startTime: number, endTime: number): Promise<void> { + const video = await driver.findElement(By.css("video")); + + await driver.executeScript("document.querySelector('video').currentTime = " + (startTime - 0.5)); + await driver.executeScript("document.querySelector('video').play()"); + + await driver.sleep(1300); + expect(parseFloat(await video.getAttribute("currentTime"))).toBeGreaterThan(endTime); + await driver.executeScript("document.querySelector('video').pause()"); +} + +async function muteSkipSegment(driver: WebDriver, startTime: number, endTime: number): Promise<void> { + const duration = endTime - startTime; + const video = await driver.findElement(By.css("video")); + + await driver.executeScript("document.querySelector('video').currentTime = " + (startTime - 0.5)); + await driver.executeScript("document.querySelector('video').play()"); + + await driver.sleep(1300); + expect(await video.getAttribute("muted")).toEqual("true"); + + await driver.sleep(duration * 1000 + 300); + expect(await video.getAttribute("muted")).toBeNull(); // Default is null for some reason + await driver.executeScript("document.querySelector('video').pause()"); +}
\ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 8fa7472c..55769505 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,11 @@ "noEmitOnError": false, "typeRoots": [ "node_modules/@types" ], "resolveJsonModule": true, - "jsx": "react" + "jsx": "react", + "lib": [ + "es2019", + "dom", + "dom.iterable" + ] } }
\ No newline at end of file |