Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge waitEndOfAd into waitTimer #45

Merged
merged 1 commit into from
May 23, 2021
Merged

merge waitEndOfAd into waitTimer #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 18 additions & 50 deletions app/scripts/modules/liker-material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ class MaterialLiker {
if (this.options.like_timer == "instant") {
callback();
return;
}
}
else if (this.video.closest(".ad-showing,.ad-interrupting") !== null) {
setTimeout(() => this.waitTimer(callback), 1000 );
}
else if (this.options.like_timer == "random") {
let duration = this.video.duration;

Expand Down Expand Up @@ -226,39 +229,6 @@ class MaterialLiker {
subscribeButton.getAttribute("aria-pressed") === "true");
}

/**
* Wait the end of the ad
* @return {function} callback The function to execute when the ad
* is finished
*/
_waitEndOfAd(callback) {
// wait 1s to be sure that ad as load or not :
// if not waiting, js may be faster than ad loading (which is done after video loading)
// fortunatly, true video never start auto when an ad is loading, then wait video start to
// detect if this is an ad or true vid
this.waitTimerTwo(1, () => {
if (typeof this.video === "undefined") {
console.error(
"waitEndOfAd can only be used after waitForVideo or else this.video is not defined"
);
}
if (this.video.closest(".ad-showing,.ad-interrupting") !== null) {
setTimeout(() => this._waitEndOfAd(callback), 1000);
return;
} else {
log("ad finished");

// update video element to not be the ad element
callback();
}
});
}
waitEndOfAd(callback) {
log("Detecting ad");
this._waitEndOfAd(callback);

}

shouldLike() {
let rated = this.isVideoRated();
if (rated) {
Expand Down Expand Up @@ -390,22 +360,20 @@ class MaterialLiker {
this.randomTimerPercent = this.randomIntFromInterval(0, 99);
}

this.waitEndOfAd(() => {
this.waitTimer(() => {
/*
Maybe the use did an action while we was waiting, so check again
*/
if ( !this.shouldLike() ) {
log("not liked check 2");
this.finish();
return;
}
this.attemptLike();
log('liked');
this.options.counter += 1;
optionManager.set(this.options).then(() => {
this.finish();
});
this.waitTimer(() => {
/*
Maybe the use did an action while we was waiting, so check again
*/
if ( !this.shouldLike() ) {
log("not liked check 2");
this.finish();
return;
}
this.attemptLike();
log('liked');
this.options.counter += 1;
optionManager.set(this.options).then(() => {
this.finish();
});
});
});
Expand Down