Added has prefix implementation (no config page)

This commit is contained in:
Joe Dowd
2020-09-04 00:05:41 +01:00
parent 3ec3a01128
commit 40d522694d
5 changed files with 52 additions and 5 deletions

5
package-lock.json generated
View File

@@ -10494,6 +10494,11 @@
"traverse": "0.4.x" "traverse": "0.4.x"
} }
}, },
"js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
"integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
},
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

View File

@@ -11,6 +11,7 @@
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",
"concurrently": "^5.1.0", "concurrently": "^5.1.0",
"js-sha256": "^0.9.0",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0" "react-dom": "^16.12.0"
}, },

View File

@@ -35,6 +35,7 @@ interface SBConfig {
audioNotificationOnSkip, audioNotificationOnSkip,
checkForUnlistedVideos: boolean, checkForUnlistedVideos: boolean,
testingServer: boolean, testingServer: boolean,
hashPrefix: boolean
// What categories should be skipped // What categories should be skipped
categorySelections: CategorySelection[], categorySelections: CategorySelection[],
@@ -166,6 +167,7 @@ var Config: SBObject = {
audioNotificationOnSkip: false, audioNotificationOnSkip: false,
checkForUnlistedVideos: false, checkForUnlistedVideos: false,
testingServer: false, testingServer: false,
hashPrefix: false,
categorySelections: [{ categorySelections: [{
name: "sponsor", name: "sponsor",

View File

@@ -618,12 +618,36 @@ function sponsorsLookup(id: string) {
categories.push(categorySelection.name); categories.push(categorySelection.name);
} }
utils.asyncRequestToServer('GET', "/api/skipSegments", { // Check for hashPrefix setting
videoID: id, let getRequest;
categories if (Config.config.hashPrefix) {
}).then(async (response: FetchResponse) => { getRequest = utils.asyncRequestToServer('GET', "/api/skipSegments/"+utils.getHash(id, 1).substr(0,4), {
categories
});
} else {
getRequest = utils.asyncRequestToServer('GET', "/api/skipSegments", {
videoID: id,
categories
});
}
getRequest.then(async (response: FetchResponse) => {
if (response?.ok) { if (response?.ok) {
let recievedSegments: SponsorTime[] = JSON.parse(response.responseText); let getResult = JSON.parse(response.responseText);
if (Config.config.hashPrefix) {
getResult = getResult.filter((video) => {
return video.videoID = id;
});
if (getResult.length === 1) {
getResult = getResult[0].segments;
if (getResult.length === 0) { // return if no regments found
return;
}
} else { // return if no video found
return;
}
}
let recievedSegments: SponsorTime[] = getResult;
if (!recievedSegments.length) { if (!recievedSegments.length) {
console.error("[SponsorBlock] Server returned malformed response: " + JSON.stringify(recievedSegments)); console.error("[SponsorBlock] Server returned malformed response: " + JSON.stringify(recievedSegments));
return; return;

View File

@@ -1,5 +1,6 @@
import Config from "./config"; import Config from "./config";
import { CategorySelection, SponsorTime, FetchResponse } from "./types"; import { CategorySelection, SponsorTime, FetchResponse } from "./types";
import { sha256 } from 'js-sha256';
import * as CompileConfig from "../config.json"; import * as CompileConfig from "../config.json";
@@ -378,6 +379,20 @@ class Utils {
isFirefox(): boolean { isFirefox(): boolean {
return typeof(browser) !== "undefined"; return typeof(browser) !== "undefined";
} }
getHash(value: string, times=5000): string {
if (times <= 0) return "";
for (let i = 0; i < times; i++) {
let hash = sha256.create();
hash.update(value);
hash.hex();
value = hash.toString();
}
return value;
}
} }
export default Utils; export default Utils;