Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2026-01-27 21:01:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added migration code for whitelisted channelIDs vs URLs

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-04-26 18:07:10 -04:00
parent 89c4432b89
commit 8a6488f082
2 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/utils.ts
View File

@@ -270,27 +270,26 @@ class Utils {
}
/**
* Sends a request to the SponsorBlock server with address added as a query
* Sends a request to a custom server
*
* @param type The request type. "GET", "POST", etc.
* @param address The address to add to the SponsorBlock server address
* @param callback
*/
async asyncRequestToServer(type: string, address: string, data = {}) {
let serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
async asyncRequestToCustomServer(type: string, url: string, data = {}) {
// If GET, convert JSON to parameters
if (type.toLowerCase() === "get") {
for (const key in data) {
let seperator = address.includes("?") ? "&" : "?";
let seperator = url.includes("?") ? "&" : "?";
let value = (typeof(data[key]) === "string") ? data[key]: JSON.stringify(data[key]);
address += seperator + key + "=" + value;
url += seperator + key + "=" + value;
}
data = null;
}
const response = await fetch(serverAddress + address, {
const response = await fetch(url, {
method: type,
headers: {
'Content-Type': 'application/json'
@@ -302,6 +301,19 @@ class Utils {
return response;
}
/**
* Sends a request to the SponsorBlock server with address added as a query
*
* @param type The request type. "GET", "POST", etc.
* @param address The address to add to the SponsorBlock server address
* @param callback
*/
async asyncRequestToServer(type: string, address: string, data = {}) {
let serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
return await (this.asyncRequestToCustomServer(type, serverAddress + address, data));
}
/**
* Sends a request to the SponsorBlock server with address added as a query
*
@@ -361,10 +373,14 @@ class Utils {
return minutes * 60 + seconds;
}
isContentScript(): boolean {
return window.location.protocol === "http:" || window.location.protocol === "https:";
}
/**
* Is this Firefox (web-extensions)
*/
isFirefox() {
isFirefox(): boolean {
return typeof(browser) !== "undefined";
}
}