mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-21 15:08:27 +03:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7904913fdb | ||
|
|
464561992e | ||
|
|
4db73d5e54 | ||
|
|
19020d2131 | ||
|
|
244cce56c0 | ||
|
|
b05d696057 |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "__MSG_fullName__",
|
"name": "__MSG_fullName__",
|
||||||
"short_name": "SponsorBlock",
|
"short_name": "SponsorBlock",
|
||||||
"version": "5.11.9",
|
"version": "5.11.10",
|
||||||
"default_locale": "en",
|
"default_locale": "en",
|
||||||
"description": "__MSG_Description__",
|
"description": "__MSG_Description__",
|
||||||
"homepage_url": "https://sponsor.ajay.app",
|
"homepage_url": "https://sponsor.ajay.app",
|
||||||
|
|||||||
Submodule maze-utils updated: d47ec4cca4...b22477a864
Submodule public/_locales updated: 010e475341...e9efadcf82
@@ -566,7 +566,7 @@
|
|||||||
|
|
||||||
<div id="advanced" class="option-group hidden">
|
<div id="advanced" class="option-group hidden">
|
||||||
|
|
||||||
<div id="support-invidious" data-type="toggle" data-sync="supportInvidious">
|
<div id="support-invidious" data-type="toggle" data-sync="supportInvidious" data-no-safari="true">
|
||||||
<div class="switch-container">
|
<div class="switch-container">
|
||||||
<label class="switch">
|
<label class="switch">
|
||||||
<input id="supportInvidious" type="checkbox">
|
<input id="supportInvidious" type="checkbox">
|
||||||
@@ -581,7 +581,7 @@
|
|||||||
<div class="small-description">__MSG_supportOtherSitesDescription__ </div>
|
<div class="small-description">__MSG_supportOtherSitesDescription__ </div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-type="private-text-change" data-sync="invidiousInstances" data-dependent-on="supportInvidious">
|
<div data-type="private-text-change" data-sync="invidiousInstances" data-dependent-on="supportInvidious" data-no-safari="true">
|
||||||
<div class="option-button trigger-button">
|
<div class="option-button trigger-button">
|
||||||
__MSG_addInvidiousInstance__
|
__MSG_addInvidiousInstance__
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -704,7 +704,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
|
|||||||
getFullDurationCountdown(index: number): () => number {
|
getFullDurationCountdown(index: number): () => number {
|
||||||
return () => {
|
return () => {
|
||||||
const sponsorTime = this.segments[index];
|
const sponsorTime = this.segments[index];
|
||||||
const duration = Math.round((sponsorTime.segment[1] - getCurrentTime()) * (1 / (getVideo()?.playbackRate ?? 1)));
|
const duration = Math.round((sponsorTime.segment[1] - (getCurrentTime() ?? 0)) * (1 / (getVideo()?.playbackRate ?? 1)));
|
||||||
|
|
||||||
return Math.max(duration, Config.config.skipNoticeDuration);
|
return Math.max(duration, Config.config.skipNoticeDuration);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2008,7 +2008,7 @@ function startOrEndTimingNewSegment() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
verifyCurrentTime();
|
verifyCurrentTime(getRealCurrentTime());
|
||||||
const roundedTime = Math.round((getRealCurrentTime() + Number.EPSILON) * 1000) / 1000;
|
const roundedTime = Math.round((getRealCurrentTime() + Number.EPSILON) * 1000) / 1000;
|
||||||
if (!isSegmentCreationInProgress()) {
|
if (!isSegmentCreationInProgress()) {
|
||||||
sponsorTimesSubmitting.push({
|
sponsorTimesSubmitting.push({
|
||||||
|
|||||||
@@ -114,8 +114,25 @@ async function init() {
|
|||||||
|
|
||||||
if (await shouldHideOption(optionsElements[i]) || (dependentOn && (isDependentOnReversed ? Config.config[dependentOnName] : !Config.config[dependentOnName]))) {
|
if (await shouldHideOption(optionsElements[i]) || (dependentOn && (isDependentOnReversed ? Config.config[dependentOnName] : !Config.config[dependentOnName]))) {
|
||||||
optionsElements[i].classList.add("hidden", "hiding");
|
optionsElements[i].classList.add("hidden", "hiding");
|
||||||
if (!dependentOn)
|
if (!dependentOn) {
|
||||||
|
if (optionsElements[i].getAttribute("data-no-safari") === "true" && optionsElements[i].id === "support-invidious") {
|
||||||
|
// Put message about being disabled on safari
|
||||||
|
const infoBox = document.createElement("div");
|
||||||
|
infoBox.innerText = chrome.i18n.getMessage("invidiousDisabledSafari");
|
||||||
|
|
||||||
|
const link = document.createElement("a");
|
||||||
|
link.style.display = "block";
|
||||||
|
const url = "https://bugs.webkit.org/show_bug.cgi?id=290508";
|
||||||
|
link.href = url;
|
||||||
|
link.innerText = url;
|
||||||
|
|
||||||
|
infoBox.appendChild(link);
|
||||||
|
|
||||||
|
optionsElements[i].parentElement.insertBefore(infoBox, optionsElements[i].nextSibling);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const option = optionsElements[i].getAttribute("data-sync");
|
const option = optionsElements[i].getAttribute("data-sync");
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse>
|
|||||||
const hashParams = getHashParams();
|
const hashParams = getHashParams();
|
||||||
if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
|
if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
|
||||||
|
|
||||||
const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
|
const hashPrefix = (await getHash(videoID, 1)).slice(0, 5) as VideoID & HashedValue;
|
||||||
const hasDownvotedSegments = !!Config.local.downvotedSegments[hashPrefix];
|
const hasDownvotedSegments = !!Config.local.downvotedSegments[hashPrefix];
|
||||||
const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
|
const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
|
||||||
categories: CompileConfig.categoryList,
|
categories: CompileConfig.categoryList,
|
||||||
|
|||||||
Reference in New Issue
Block a user