external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-11-10 01:01:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix mobile and invidious

Browse source
This commit is contained in:
Ajay 2023-02-13 02:43:43 -05:00
parent 5859c33ce8
commit d3117d603f
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/content.ts
View file

@ -39,7 +39,7 @@ import { Tooltip } from "./render/Tooltip";
import { noRefreshFetchingChaptersAllowed } from "./utils/licenseKey";
import { waitFor } from "@ajayyy/maze-utils";
import { getFormattedTime } from "@ajayyy/maze-utils/lib/formating";
import { setupVideoMutationListener, getChannelIDInfo, getVideo, refreshVideoAttachments, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID } from "@ajayyy/maze-utils/lib/video";
import { setupVideoMutationListener, getChannelIDInfo, getVideo, refreshVideoAttachments, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube } from "@ajayyy/maze-utils/lib/video";
import { StorageChangesObject } from "@ajayyy/maze-utils/lib/config";
import { findValidElement } from "@ajayyy/maze-utils/lib/dom"
@ -95,20 +95,7 @@ const controlsWithEventListeners: HTMLElement[] = [];
setupVideoModule({
videoIDChange,
channelIDChange,
videoElementChange: (newVideo) => {
if (newVideo) {
setupVideoListeners();
setupSkipButtonControlBar();
setupCategoryPill();
}
if (previewBar && !utils.findReferenceNode()?.contains(previewBar.container)) {
previewBar.remove();
previewBar = null;
createPreviewBar();
}
},
videoElementChange,
playerInit: () => {
previewBar = null; // remove old previewbar
createPreviewBar();
@ -120,10 +107,6 @@ setupVideoModule({
resetValues
}, () => Config);
// This misleading variable name will be fixed soon
let onInvidious: boolean;
let onMobileYouTube: boolean;
//the video id of the last preview bar update
let lastPreviewBarUpdate: VideoID;
@ -178,7 +161,7 @@ const skipNoticeContentContainer: ContentContainer = () => ({
sponsorVideoID: getVideoID(),
reskipSponsorTime,
updatePreviewBar,
onMobileYouTube,
onMobileYouTube: isOnMobileYouTube(),
sponsorSubmissionNotice: submissionNotice,
resetSponsorSubmissionNotice,
updateEditButtonsOnPlayer,
@ -216,7 +199,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
status: lastResponseStatus,
sponsorTimes: sponsorTimes,
time: getVideo().currentTime,
onMobileYouTube
onMobileYouTube: isOnMobileYouTube()
});
if (!request.updating && popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
@ -397,7 +380,7 @@ function resetValues() {
function videoIDChange(): void {
//setup the preview bar
if (previewBar === null) {
if (onMobileYouTube) {
if (isOnMobileYouTube()) {
// Mobile YouTube workaround
const observer = new MutationObserver(handleMobileControlsMutations);
let controlsContainer = null;
@ -502,7 +485,7 @@ function createPreviewBar(): void {
if (el) {
const chapterVote = new ChapterVote(voteAsync);
previewBar = new PreviewBar(el, onMobileYouTube, onInvidious, chapterVote, () => importExistingChapters(false));
previewBar = new PreviewBar(el, isOnMobileYouTube(), isOnInvidious(), chapterVote, () => importExistingChapters(false));
updatePreviewBar();
@ -929,7 +912,7 @@ function setupSkipButtonControlBar() {
openNotice: true,
forceAutoSkip: true
}),
onMobileYouTube
onMobileYouTube: isOnMobileYouTube()
});
}
@ -941,7 +924,7 @@ function setupCategoryPill() {
categoryPill = new CategoryPill();
}
categoryPill.attachToPage(onMobileYouTube, onInvidious, voteAsync);
categoryPill.attachToPage(isOnMobileYouTube(), isOnInvidious(), voteAsync);
}
async function sponsorsLookup(keepOldSubmissions = true) {
@ -1110,7 +1093,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {
status: lastResponseStatus,
sponsorTimes: sponsorTimes,
time: getVideo().currentTime,
onMobileYouTube
onMobileYouTube: isOnMobileYouTube()
});
if (Config.config.isVip) {
@ -1320,6 +1303,21 @@ async function channelIDChange(channelIDInfo: ChannelIDInfo) {
if (Config.config.forceChannelCheck && sponsorTimes?.length > 0) startSkipScheduleCheckingForStartSponsors();
}
function videoElementChange(newVideo: boolean): void {
if (newVideo) {
setupVideoListeners();
setupSkipButtonControlBar();
setupCategoryPill();
}
if (previewBar && !utils.findReferenceNode()?.contains(previewBar.container)) {
previewBar.remove();
previewBar = null;
createPreviewBar();
}
}
/**
* Returns info about the next upcoming sponsor skip
*/
@ -1563,7 +1561,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
&& skippingSegments.length === 1
&& skippingSegments[0].actionType === ActionType.Poi) {
skipButtonControlBar.enable(skippingSegments[0]);
if (onMobileYouTube || Config.config.skipKeybind == null) skipButtonControlBar.setShowKeybindHint(false);
if (isOnMobileYouTube() || Config.config.skipKeybind == null) skipButtonControlBar.setShowKeybindHint(false);
activeSkipKeybindElement?.setShowKeybindHint(false);
activeSkipKeybindElement = skipButtonControlBar;
@ -1600,7 +1598,7 @@ function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, un
}
const newSkipNotice = new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer, unskipTime, startReskip);
if (onMobileYouTube || Config.config.skipKeybind == null) newSkipNotice.setShowKeybindHint(false);
if (isOnMobileYouTube() || Config.config.skipKeybind == null) newSkipNotice.setShowKeybindHint(false);
skipNotices.push(newSkipNotice);
activeSkipKeybindElement?.setShowKeybindHint(false);
@ -1699,7 +1697,7 @@ async function createButtons(): Promise<void> {
createButton("info", "openPopup", () => openInfoMenu(), "PlayerInfoIconSponsorBlocker.svg");
const controlsContainer = getControls();
if (Config.config.autoHideInfoButton && !onInvidious && controlsContainer
if (Config.config.autoHideInfoButton && !isOnInvidious() && controlsContainer
&& playerButtons["info"]?.button && !controlsWithEventListeners.includes(controlsContainer)) {
controlsWithEventListeners.push(controlsContainer);
@ -1710,14 +1708,14 @@ async function createButtons(): Promise<void> {
/** Creates any missing buttons on the player and updates their visiblity. */
async function updateVisibilityOfPlayerControlsButton(): Promise<void> {
// Not on a proper video yet
if (!getVideoID() || onMobileYouTube) return;
if (!getVideoID() || isOnMobileYouTube()) return;
await createButtons();
updateEditButtonsOnPlayer();
// Don't show the info button on embeds
if (Config.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || onInvidious
if (Config.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || isOnInvidious()
|| document.getElementById("sponsorBlockPopupContainer") != null) {
playerButtons.info.button.style.display = "none";
} else {
@ -1728,9 +1726,9 @@ async function updateVisibilityOfPlayerControlsButton(): Promise<void> {
/** Updates the visibility of buttons on the player related to creating segments. */
function updateEditButtonsOnPlayer(): void {
// Don't try to update the buttons if we aren't on a YouTube video page
if (!getVideoID() || onMobileYouTube) return;
if (!getVideoID() || isOnMobileYouTube()) return;
const buttonsEnabled = !(Config.config.hideVideoPlayerControls || onInvidious);
const buttonsEnabled = !(Config.config.hideVideoPlayerControls || isOnInvidious());
let creatingSegment = false;
let submitButtonVisible = false;
@ -2353,14 +2351,14 @@ function updateAdFlag(): void {
}
function showTimeWithoutSkips(skippedDuration: number): void {
if (onInvidious) return;
if (isOnInvidious()) return;
if (isNaN(skippedDuration) || skippedDuration < 0) {
skippedDuration = 0;
}
// YouTube player time display
const displayClass = onMobileYouTube ? "ytm-time-display" : "ytp-time-display.notranslate"
const displayClass = isOnMobileYouTube() ? "ytm-time-display" : "ytp-time-display.notranslate"
const display = document.querySelector(`.${displayClass}`);
if (!display) return;