Sync SponsorBlock 5.14..9a526c5 and DeArrow 2.1.8; remove dearrowPromotion; src-only Discord cleanup

src/background.ts

@@ -6,6 +6,15 @@ import "content-scripts-register-polyfill";
 import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "../maze-utils/src/background-request-proxy";
 import { setupTabUpdates } from "../maze-utils/src/tab-updates";
 import { generateUserID } from "../maze-utils/src/setup";
+function serializeOrStringify(e: unknown): string {
+    if (e instanceof Error) return e.stack || e.message || String(e);
+    try {
+        if (typeof e === "object") return JSON.stringify(e as unknown as Record<string, unknown>);
+    } catch (err) {
+        return String(err);
+    }
+    return String(e);
+}
 
 import Utils from "./utils";
 
@@ -217,33 +226,15 @@ async function submitVote(type: number, UUID: string, category: string, videoID:
 
     try {
         const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&videoID=" + videoID + "&userID=" + userID + typeSection);
-
-        if (response.ok) {
-            return {
-                successType: 1,
-                responseText: await response.text()
-            };
-        } else if (response.status == 405) {
-            //duplicate vote
-            return {
-                successType: 0,
-                statusCode: response.status,
-                responseText: await response.text()
-            };
-        } else {
-            //error while connect
-            return {
-                successType: -1,
-                statusCode: response.status,
-                responseText: await response.text()
-            };
-        }
+        return {
+            status: response.status,
+            ok: response.ok,
+            responseText: await response.text(),
+        };
     } catch (e) {
-        console.error(e);
+        console.error("Error while voting:", e);
         return {
-            successType: -1,
-            statusCode: -1,
-            responseText: ""
+            error: serializeOrStringify(e),
         };
     }
 }

src/components/CategoryPillComponent.tsx

@@ -8,8 +8,8 @@ import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
 import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { Tooltip } from "../render/Tooltip";
-import { getErrorMessage } from "../../maze-utils/src/formating";
-
+import { formatJSErrorMessage, getLongErrorMessage } from "../utils/errorFormat";
+import { logRequest } from "../utils/requestLogging";
 export interface CategoryPillProps {
     vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>;
     showTextByDefault: boolean;
@@ -127,15 +127,19 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
             const response = await this.props.vote(type, this.state.segment.UUID);
             await stopAnimation();
 
-            if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
+            if ("error" in response) {
+                console.error("[SB] Caught error while attempting to vote on a FV label", response.error);
+                alert(formatJSErrorMessage(response.error));
+            } else if (response.ok || response.status === 429) {
                 this.setState({
                     open: false,
                     show: type === 1
                 });
 
                 this.closeTooltip();
-            } else if (response.statusCode !== 403) {
-                alert(getErrorMessage(response.statusCode, response.responseText));
+            } else if (response.status !== 403) {
+                logRequest({headers: null, ...response}, "SB", "vote on FV label");
+                alert(getLongErrorMessage(response.status, response.responseText));
             }
         }
     }

src/components/ChapterVoteComponent.tsx

@@ -8,7 +8,8 @@ import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
 import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { Tooltip } from "../render/Tooltip";
-import { getErrorMessage } from "../../maze-utils/src/formating";
+import { formatJSErrorMessage, getLongErrorMessage } from "../utils/errorFormat";
+import { logRequest } from "../utils/requestLogging";
 
 export interface ChapterVoteProps {
     vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>;
@@ -119,12 +120,16 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote
             const response = await this.props.vote(type, this.state.segment.UUID);
             await stopAnimation();
 
-            if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
+            if ("error" in response){
+                console.error("[SB] Caught error while attempting to vote on a chapter", response.error);
+                alert(formatJSErrorMessage(response.error));
+            } else if (response.ok || response.status == 429) {
                 this.setState({
                     show: type === 1
                 });
-            } else if (response.statusCode !== 403) {
-                alert(getErrorMessage(response.statusCode, response.responseText));
+            } else if (response.status !== 403) {
+                logRequest({headers: null, ...response}, "SB", "vote on chapter");
+                alert(getLongErrorMessage(response.status, response.responseText));
             }
         }
     }

src/config.ts

@@ -35,8 +35,6 @@ interface SBConfig {
     hideDeleteButtonPlayerControls: boolean;
     hideUploadButtonPlayerControls: boolean;
     hideSkipButtonPlayerControls: boolean;
-    hideDiscordLaunches: number;
-    hideDiscordLink: boolean;
     invidiousInstances: string[];
     supportInvidious: boolean;
     serverAddress: string;
@@ -305,8 +303,6 @@ const syncDefaults = {
     hideDeleteButtonPlayerControls: false,
     hideUploadButtonPlayerControls: false,
     hideSkipButtonPlayerControls: false,
-    hideDiscordLaunches: 0,
-    hideDiscordLink: false,
     invidiousInstances: [],
     supportInvidious: false,
     serverAddress: CompileConfig.serverAddress,

src/content.ts

@@ -35,6 +35,7 @@ import { ChapterVote } from "./render/ChapterVote";
 import { openWarningDialog } from "./utils/warnings";
 import { extensionUserAgent, isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { getErrorMessage, getFormattedTime } from "../maze-utils/src/formating";
+import { formatJSErrorMessage, getLongErrorMessage } from "./utils/errorFormat";
 import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube, isOnYouTubeMusic, isOnYTTV, getLastNonInlineVideoID, triggerVideoIDChange, triggerVideoElementChange, getIsInline, getCurrentTime, setCurrentTime, getVideoDuration, verifyCurrentTime, waitForVideo } from "../maze-utils/src/video";
 import { Keybind, StorageChangesObject, isSafari, keybindEquals, keybindToString } from "../maze-utils/src/config";
 import { findValidElement } from "../maze-utils/src/dom"
@@ -1720,7 +1721,13 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped:
                 counted = true;
             }
 
-            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID + "&videoID=" + getVideoID());
+            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID + "&videoID=" + getVideoID())
+                .then(r => {
+                    // eslint-disable-next-line @typescript-eslint/no-var-requires
+                    const { logRequest } = require("./utils/requestLogging");
+                    if (!r.ok) logRequest(r, "SB", "segment skip log");
+                })
+                .catch(e => console.warn("[SB] Caught error while attempting to log segment skip", e));
         }
     }
 }
@@ -2287,14 +2294,17 @@ async function vote(type: number, UUID: SegmentUUID, category?: Category, skipNo
     if (response != undefined) {
         //see if it was a success or failure
         if (skipNotice != null) {
-            if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
+            if ("error" in response) {
+                skipNotice.setNoticeInfoMessage.bind(skipNotice)(formatJSErrorMessage(response.error as unknown as Error));
+                skipNotice.resetVoteButtonInfo.bind(skipNotice)();
+            } else if (response.ok || response.status === 429) {
                 //success (treat rate limits as a success)
                 skipNotice.afterVote.bind(skipNotice)(utils.getSponsorTimeFromUUID(sponsorTimes, UUID), type, category);
-            } else if (response.successType == -1) {
-                if (response.statusCode === 403 && response.responseText.startsWith("Vote rejected due to a tip from a moderator.")) {
+            } else {
+                if (response.status === 403 && response.responseText.startsWith("Vote rejected due to a tip from a moderator.")) {
                     openWarningDialog(skipNoticeContentContainer);
                 } else {
-                    skipNotice.setNoticeInfoMessage.bind(skipNotice)(getErrorMessage(response.statusCode, response.responseText))
+                    skipNotice.setNoticeInfoMessage.bind(skipNotice)(getLongErrorMessage(response.status, response.responseText));
                 }
 
                 skipNotice.resetVoteButtonInfo.bind(skipNotice)();
@@ -2334,8 +2344,12 @@ async function voteAsync(type: number, UUID: SegmentUUID, category?: Category):
             category: category,
             videoID: getVideoID()
         }, (response) => {
-            if (response.successType === 1) {
-                // Change the sponsor locally
+            if (!response || "error" in response) {
+                resolve(response);
+                return;
+            }
+
+            if (response.ok || response.status === 429) {
                 const segment = utils.getSponsorTimeFromUUID(sponsorTimes, UUID);
                 if (segment) {
                     if (type === 0) {

src/messageTypes.ts

@@ -77,7 +77,7 @@ export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoF
 
 export interface IsInfoFoundMessageResponse {
     found: boolean;
-    status: number;
+    status: number | string | Error;
     sponsorTimes: SponsorTime[];
     time: number;
     onMobileYouTube: boolean;
@@ -120,12 +120,13 @@ export type MessageResponse =
     | LogResponse
     | LoopedChapterResponse;
 
-export interface VoteResponse {
-    successType: number;
-    statusCode: number;
+export type VoteResponse = {
+    status: number;
+    ok: boolean;
     responseText: string;
-}
-
+} | {
+    error: Error | string;
+};
 interface ImportSegmentsResponse {
     importedSegments: SponsorTime[];
 }

src/popup/PopupComponent.tsx

@@ -159,12 +159,6 @@ export const PopupComponent = () => {
                         titleFormatting={titleFormatting}
                     />
                 </a>
-                <a href="https://discord.gg/SponsorBlock" target="_blank" rel="noreferrer">
-                    <FormattedText
-                        text="Discord"
-                        titleFormatting={titleFormatting}
-                    />
-                </a>
                 <a href="https://matrix.to/#/#edittogether:matrix.org" target="_blank" rel="noreferrer">
                     <FormattedText
                         text="Matrix"

src/popup/SegmentListComponent.tsx

@@ -3,7 +3,8 @@ import { ActionType, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "
 import Config from "../config";
 import { waitFor } from "../../maze-utils/src";
 import { shortCategoryName } from "../utils/categoryUtils";
-import { getErrorMessage, getFormattedTime } from "../../maze-utils/src/formating";
+import { getFormattedTime } from "../../maze-utils/src/formating";
+import { formatJSErrorMessage, getLongErrorMessage } from "../utils/errorFormat";
 import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { asyncRequestToServer } from "../utils/requests";
 import { Message, MessageResponse, VoteResponse } from "../messageTypes";
@@ -303,11 +304,13 @@ async function vote(props: {
 
     if (response != undefined) {
         // See if it was a success or failure
-        if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
+        if ("error" in response) {
+            props.setVoteMessage(formatJSErrorMessage(response.error));
+        } else if (response.ok || response.status === 429) {
             // Success (treat rate limits as a success)
             props.setVoteMessage(chrome.i18n.getMessage("voted"));
-        } else if (response.successType == -1) {
-            props.setVoteMessage(getErrorMessage(response.statusCode, response.responseText));
+        } else {
+            props.setVoteMessage(getLongErrorMessage(response.status, response.responseText));
         }
         setTimeout(() => props.setVoteMessage(null), 1500);
     }

src/submission/SubmissionComponent.tsx

@@ -158,7 +158,7 @@
             const upvotedThumbnail = unsubmitted.thumbnails.find((t) => t.selected);
             if (upvotedThumbnail) {
                 const upvotedThumbnailIndex = thumbnails.findIndex((t) => (t.type === ThumbnailType.Original && upvotedThumbnail.original) 
                     || (t.type === ThumbnailType.SpecifiedTime && !upvotedThumbnail.original && t.timestamp === (upvotedThumbnail as any).timestamp));
                 if (upvotedThumbnailIndex !== -1) {
                     setUpvotedThumbnailIndex(upvotedThumbnailIndex);
                 }
@@ -236,7 +236,7 @@
                                 titles: []
                             };
 
                             const existingSubmission = unsubmitted.thumbnails.findIndex((s) => !s.original && (s as any).timestamp === (t as any).timestamp);
                             if (existingSubmission === -1) {
                                 unsubmitted.thumbnails.unshift(t);
 
@@ -251,7 +251,7 @@
 
                             if (existingSubmission !== -1) {
                                 const extraUnsubmitted = extraThumbnails.findIndex((s) => s.type === ThumbnailType.SpecifiedTime
                                     && s.timestamp === (t as any).timestamp);
 
                                 if (extraUnsubmitted !== -1) {
                                     selectedIndex = defaultThumbnails.length + extraUnsubmitted;
@@ -399,7 +399,7 @@
                         <a className="cbNoticeButton"
                             href={`https://chat.sponsor.ajay.app/#${objectToURI("", {
                                 displayName: getChatDisplayName(chatDisplayName),
-                                customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://discord.gg/SponsorBlock\nhttps://matrix.to/#/#edittogether:matrix.org`,
+                                customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://matrix.to/#/#edittogether:matrix.org`,
                                 bigDescription: true
                             }, false)}`}
                             target="_blank"
@@ -453,7 +453,7 @@
         if (unsubmittedThumbnails) {
             thumbnailsResult = unsubmittedThumbnails
                 .filter((t) => thumbnails.every((s) => !t.original && (s.type !== ThumbnailType.SpecifiedTime
                     || s.timestamp !== (t as any).timestamp)))
                 .map((t) => ({
                 type: ThumbnailType.SpecifiedTime,
                 timestamp: (t as CustomThumbnailResult).timestamp,
@@ -583,7 +583,7 @@
                 name: chrome.i18n.getMessage("questionButton"),
                 listener: () => window.open(`https://chat.sponsor.ajay.app/#${objectToURI("", {
                     displayName: getChatDisplayName(name),
-                    customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://discord.gg/SponsorBlock\nhttps://matrix.to/#/#sponsor:ajay.app?via=matrix.org`,
+                    customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://matrix.to/#/#sponsor:ajay.app?via=matrix.org`,
                     bigDescription: true
                 }, false)}`)
             }],

src/submission/autoWarning.ts

@@ -179,7 +179,7 @@ function showAutoWarningIfRequiredInternal(title: string, element: HTMLElement):
 
                     window.open(`https://chat.sponsor.ajay.app/#${objectToURI("", {
                         displayName: getChatDisplayName(name),
-                        customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://discord.gg/SponsorBlock\nhttps://matrix.to/#/#edittogether:matrix.org?via=matrix.org`,
+                        customDescription: `${chrome.i18n.getMessage("chatboxDescription")}\n\nhttps://matrix.to/#/#edittogether:matrix.org?via=matrix.org`,
                         bigDescription: true
                     }, false)}`);
                 }

src/thumbnails/thumbnailRenderer.ts

@@ -521,6 +521,7 @@ export function getThumbnailImageSelector(brandingLocation: BrandingLocation): s
         case BrandingLocation.Endcards:
             return ".ytp-ce-covering-image";
         case BrandingLocation.Autoplay:
+        case BrandingLocation.EndAutonav:
             return "div.ytp-autonav-endscreen-upnext-thumbnail";
         case BrandingLocation.EndRecommendations:
             return "div.ytp-videowall-still-image";
@@ -551,6 +552,7 @@ function getThumbnailBox(image: HTMLElement, brandingLocation: BrandingLocation)
                 return image;
             }
         case BrandingLocation.Autoplay:
+        case BrandingLocation.EndAutonav:
         case BrandingLocation.UpNextPreview:
             return image;
         default:

src/titles/titleFormatter.ts

@@ -24,21 +24,19 @@ if (LOAD_CLD) {
  */
 
 export async function formatTitle(title: string, isCustom: boolean, videoID: VideoID | null): Promise<string> {
-    const shouldOnlyFormatCustom = !Config.config!.formatOriginalTitles && Config.config!.formatCustomTitles;
-    return formatTitleInternal(title, isCustom, await getTitleFormatting(videoID), await shouldCleanEmojis(videoID), shouldOnlyFormatCustom);
+    return formatTitleInternal(title, isCustom, await getTitleFormatting(videoID), await shouldCleanEmojis(videoID), Config.config!.formatCustomTitles, Config.config!.formatOriginalTitles);
 }
 
 export async function formatTitleDefaultSettings(title: string, isCustom: boolean): Promise<string> {
-    const shouldOnlyFormatCustom = !Config.config!.formatOriginalTitles && Config.config!.formatCustomTitles;
-    return await formatTitleInternal(title, isCustom, Config.config!.titleFormatting, Config.config!.shouldCleanEmojis, shouldOnlyFormatCustom);
+    return await formatTitleInternal(title, isCustom, Config.config!.titleFormatting, Config.config!.shouldCleanEmojis, Config.config!.formatCustomTitles, Config.config!.formatOriginalTitles);
 }
 
-export async function formatTitleInternal(title: string, isCustom: boolean, titleFormatting: TitleFormatting, shouldCleanEmojis: boolean, onlyFormatCustomTitles = false): Promise<string> {
+export async function formatTitleInternal(title: string, isCustom: boolean, titleFormatting: TitleFormatting, shouldCleanEmojis: boolean, formatCustomTitles = true, formatOriginalTitles = true): Promise<string> {
     if (shouldCleanEmojis) {
         title = cleanFancyText(cleanEmojis(title));
     }
 
-    if (onlyFormatCustomTitles && !isCustom) {
+    if ((!formatCustomTitles && isCustom) || (!formatOriginalTitles && !isCustom)) {
         titleFormatting = TitleFormatting.Disable;
     }
 
@@ -645,7 +643,7 @@ export function cleanFancyText(title: string): string {
         // Allow emoji variation selectors on either side of the replacement character
         // Supports emojis such as 🅱️
         title = title.replace(new RegExp(`[\u{fe00}-\u{fe0f}\u{e0100}-\u{e01ef}]?${replacement[0]}[\u{fe00}-\u{fe0f}\u{e0100}-\u{e01ef}]?`
-            , "ug"), replacement[1].toUpperCase());
+            , "ug"), replacement[1]);
     }
 
     return title.trim();

src/utils/errorFormat.ts

@@ -0,0 +1,15 @@
+export function formatJSErrorMessage(e: unknown): string {
+    try {
+        if (e instanceof Error) return e.message || String(e);
+        if (typeof e === "object") return JSON.stringify(e);
+    } catch (err) {
+        return String(err);
+    }
+    return String(e);
+}
+
+export function getLongErrorMessage(status: number, responseText?: string): string {
+    let base = `Error ${status}`;
+    if (responseText) base += `: ${responseText}`;
+    return base;
+}

src/utils/requestLogging.ts

@@ -0,0 +1,18 @@
+export function serializeOrStringify(e: unknown): string {
+    if (e instanceof Error) return e.stack || e.message || String(e);
+    try {
+        if (typeof e === "object") return JSON.stringify(e);
+    } catch (err) {
+        return String(err);
+    }
+    return String(e);
+}
+
+export function logRequest(response: { status: number; ok: boolean; responseText?: string; headers?: Record<string, string> | null }, prefix = "SB", action = "request"): void {
+    try {
+        // eslint-disable-next-line no-console
+        console.warn(`[${prefix}] Non-OK ${action}: status=${response.status} ok=${response.ok}`, response.responseText);
+    } catch (_err) {
+        void _err;
+    }
+}