Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-06 19:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Switched all xmlhttp requests to use new dedicated function.

Browse Source
This commit is contained in:
Ajay Ramachandran
2019-07-20 15:33:52 -04:00
parent 4cc44258e8
commit 91f0b65d06
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
background.js
View File

@@ -87,7 +87,7 @@ function addSponsorTime(time) {
function submitVote(type, UUID, callback) { function submitVote(type, UUID, callback) {
getUserID(function(userID) { getUserID(function(userID) {
//publish this vote //publish this vote
sendRequestToUser('GET', "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) { sendRequestToServer('GET', "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
callback({ callback({
successType: 1 successType: 1
@@ -116,13 +116,10 @@ function submitTimes(videoID) {
if (sponsorTimes != undefined && sponsorTimes.length > 0) { if (sponsorTimes != undefined && sponsorTimes.length > 0) {
//submit these times //submit these times
for (let i = 0; i < sponsorTimes.length; i++) { for (let i = 0; i < sponsorTimes.length; i++) {
let xmlhttp = new XMLHttpRequest(); getUserID(function(userIDStorage) {
let userIDStorage = getUserID(function(userIDStorage) {
//submit the sponsorTime //submit the sponsorTime
xmlhttp.open('GET', serverAddress + "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1] sendRequestToServer('GET', "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
+ "&userID=" + userIDStorage, true); + "&userID=" + userIDStorage);
xmlhttp.send();
}); });
} }
} }
@@ -179,18 +176,20 @@ function getUserID(callback) {
}); });
} }
function sendRequestToUser(type, address, callback) { function sendRequestToServer(type, address, callback) {
let xmlhttp = new XMLHttpRequest(); let xmlhttp = new XMLHttpRequest();
xmlhttp.open(type, serverAddress + address, true); xmlhttp.open(type, serverAddress + address, true);
xmlhttp.onreadystatechange = function () { if (callback != undefined) {
callback(xmlhttp, false); xmlhttp.onreadystatechange = function () {
}; callback(xmlhttp, false);
};
xmlhttp.onerror = function(ev) {
callback(xmlhttp, true); xmlhttp.onerror = function(ev) {
}; callback(xmlhttp, true);
};
}
//submit this request //submit this request
xmlhttp.send(); xmlhttp.send();

48
content.js
View File

@@ -118,24 +118,21 @@ function sponsorsLookup(id) {
let xmlhttp = new XMLHttpRequest(); let xmlhttp = new XMLHttpRequest();
//check database for sponsor times //check database for sponsor times
xmlhttp.open('GET', serverAddress + "/api/getVideoSponsorTimes?videoID=" + id, true); sendRequestToServer('GET', "/api/getVideoSponsorTimes?videoID=" + id, function(xmlhttp) {
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
sponsorDataFound = true;
xmlhttp.onreadystatechange = function () { sponsorTimes = JSON.parse(xmlhttp.responseText).sponsorTimes;
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { UUIDs = JSON.parse(xmlhttp.responseText).UUIDs;
sponsorDataFound = true;
sponsorTimes = JSON.parse(xmlhttp.responseText).sponsorTimes; // If the sponsor data exists, add the event to run on the videos "ontimeupdate"
UUIDs = JSON.parse(xmlhttp.responseText).UUIDs; v.ontimeupdate = function () {
sponsorCheck(sponsorTimes);
// If the sponsor data exists, add the event to run on the videos "ontimeupdate" };
v.ontimeupdate = function () { } else {
sponsorCheck(sponsorTimes); sponsorDataFound = false;
}; }
} else { });
sponsorDataFound = false;
}
};
xmlhttp.send(null);
} }
function sponsorCheck(sponsorTimes) { // Video skipping function sponsorCheck(sponsorTimes) { // Video skipping
@@ -463,6 +460,25 @@ function sponsorMessageStarted() {
toggleStartSponsorButton(); toggleStartSponsorButton();
} }
function sendRequestToServer(type, address, callback) {
let xmlhttp = new XMLHttpRequest();
xmlhttp.open(type, serverAddress + address, true);
if (callback != undefined) {
xmlhttp.onreadystatechange = function () {
callback(xmlhttp, false);
};
xmlhttp.onerror = function(ev) {
callback(xmlhttp, true);
};
}
//submit this request
xmlhttp.send();
}
function getYouTubeVideoID(url) { // Returns with video id else returns false function getYouTubeVideoID(url) { // Returns with video id else returns false
var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#\&\?]*).*/; var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#\&\?]*).*/;
var match = url.match(regExp); var match = url.match(regExp);