bump version

Fix some channel information requests failing
update translations
2025-12-06 11:37:02 +03:00 · 2025-06-20 21:58:00 -04:00 · 2025-06-20 21:57:51 -04:00 · 2025-06-19 17:11:21 -04:00 · 2025-06-19 17:10:57 -04:00 · 2025-06-19 17:07:34 -04:00
54 changed files with 3162 additions and 1805 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,10 +16,22 @@ jobs:
        with:
          node-version: '18'
      - run: npm ci
-      - run: sudo apt-get install chromium-chromedriver
+      - run: sudo apt-get remove google-chrome-stable
+
+      - uses: browser-actions/setup-chrome@c785b87e244131f27c9f19c1a33e2ead956ab7ce
+        with:
+          chrome-version: 135
+          install-dependencies: true
+          install-chromedriver: true
      
      - name: Copy configuration
        run: cp config.json.example config.json
+
+      - name: Set up WireGuard Connection
+        uses: niklaskeerl/easy-wireguard-action@50341d5f4b8245ff3a90e278aca67b2d283c78d0
+        with:
+          WG_CONFIG_FILE: ${{ secrets.WG_CONFIG_FILE }}
+
      - name: Run tests
        run: npm run test

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ https://crowdin.com/project/sponsorblock

 # Building
 ## Building locally
-0. You must have [Node.js 16 or later](https://nodejs.org/) and npm installed. Works best on Linux
+0. You must have [Node.js 22 or later](https://nodejs.org/) and npm installed. Works best on Linux
 1. Clone with submodules
  ```bash
  git clone --recursive https://github.com/ajayyy/SponsorBlock
--- a/config.json.example
+++ b/config.json.example
@@ -24,7 +24,7 @@
        "intro": "https://wiki.sponsor.ajay.app/w/Intermission/Intro_Animation",
        "outro": "https://wiki.sponsor.ajay.app/w/Endcards/Credits",
        "preview": "https://wiki.sponsor.ajay.app/w/Preview/Recap",
-        "filler": "https://wiki.sponsor.ajay.app/w/Filler_Tangent",
+        "filler": "https://wiki.sponsor.ajay.app/w/Tangents/Jokes",
        "music_offtopic": "https://wiki.sponsor.ajay.app/w/Music:_Non-Music_Section",
        "poi_highlight": "https://wiki.sponsor.ajay.app/w/Highlight",
        "guidelines": "https://wiki.sponsor.ajay.app/w/Guidelines",
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
    "name": "__MSG_fullName__",
    "short_name": "SponsorBlock",
-    "version": "5.10.2",
+    "version": "5.13.1",
    "default_locale": "en",
    "description": "__MSG_Description__",
    "homepage_url": "https://sponsor.ajay.app",
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
    "@types/wicg-mediasession": "^1.1.4",
    "@typescript-eslint/eslint-plugin": "^5.54.1",
    "@typescript-eslint/parser": "^5.54.1",
-    "chromedriver": "^110.0.0",
+    "chromedriver": "^135.0.0",
    "concurrently": "^7.6.0",
    "copy-webpack-plugin": "^11.0.0",
    "eslint": "^8.35.0",
--- a/public/_locales
+++ b/public/_locales
--- a/public/content.css
+++ b/public/content.css
@@ -31,6 +31,15 @@
 	transition: transform .1s cubic-bezier(0,0,0.2,1);
 }

+/* Prevent bar from covering highlights on YTTV */
+#previewbar.sponsorblock-yttv-container  {
+	z-index: unset;
+}
+
+ytu-time-bar.ytu-storyboard {
+	text-align: center;
+}
+
 /* May 2024 hover preview */
 .YtPlayerProgressBarProgressBar #previewbar {
 	transform: none;
@@ -67,6 +76,11 @@ div:hover > #previewbar.sbNotInvidious {
 	min-width: 1px;
 }

+.previewbar-yttv {
+	height: 10px;
+	top: 14px;
+}
+
 .previewbar.requiredSegment {
 	transform: scaleY(3);
 }
@@ -88,7 +102,7 @@ div:hover > #previewbar.sbNotInvidious {
 	display: none !important;
 }

-.ytp-tooltip.sponsorCategoryTooltipVisible {
+.ytp-tooltip.sponsorCategoryTooltipVisible:not(.sponsorTooltipHasYTChapters) {
 	transform: translateY(-1em) !important;
 }

@@ -101,6 +115,14 @@ div:hover > #previewbar.sbNotInvidious {
 	transform: translateY(-2em) !important;
 }

+.ytp-tooltip.sponsorCategoryTooltipVisible.sponsorHasOriginalTooltip {
+	transform: translateY(-2em) !important;
+}
+
+.ytp-tooltip.sponsorCategoryTooltipVisible.sponsorTwoTooltips.sponsorHasOriginalTooltip {
+	transform: translateY(-3em) !important;
+}
+
 .ytp-big-mode .ytp-tooltip.sponsorCategoryTooltipVisible {
 	transform: translateY(-2em) !important;
 }
@@ -184,6 +206,16 @@ div:hover > .sponsorBlockChapterBar {
 	padding-right: 3.6px;
 }

+.sbButtonYTTV {
+	padding-left: 5px !important;
+}
+
+/* YTTV only */
+.ytu-player-controls > .skipButtonControlBarContainer > div {
+	padding-left: 5px;
+	align-content: center;
+}
+
 .autoHiding {
 	overflow: visible !important;
 }
--- a/public/icons/loop.svg
+++ b/public/icons/loop.svg
@@ -0,0 +1,4 @@
+<svg width="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="#FFFFFF">
+  <path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-8 4-8 7h2s1-5 6-5c1.66 0 3.14.69 4.22 1.78L14 10h6V4l-2.35 2.35z"/>
+  <path d="M5.85 17.65C7.3 19.1 9.29 20 11.5 20c4.42 0 8-4 8-7h-2s-1 5-6 5c-1.66 0-3.14-.69-4.22-1.78L9.5 14h-6v6z"/>
+</svg>
--- a/public/icons/looped.svg
+++ b/public/icons/looped.svg
@@ -0,0 +1,4 @@
+<svg width="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="#80fff6">
+  <path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-8 4-8 7h2s1-5 6-5c1.66 0 3.14.69 4.22 1.78L14 10h6V4l-2.35 2.35z"/>
+  <path d="M5.85 17.65C7.3 19.1 9.29 20 11.5 20c4.42 0 8-4 8-7h-2s-1 5-6 5c-1.66 0-3.14-.69-4.22-1.78L9.5 14h-6v6z"/>
+</svg>
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -373,6 +373,7 @@ input[type='number'] {
    display: inline-block;
    width: 40px;
    height: 24px;
+    min-width: 40px;
 }

 .switch input { 
@@ -730,4 +731,17 @@ svg {
  
 .dearrow-link:hover .close-button {
    opacity: 1;
+}
+
+.invalid-advanced-config {
+    color: red;
+}
+
+.advanced-skip-options-menu {
+    margin-top: 10px;
+}
+
+.advanced-config-help-message {
+    margin-bottom: 10px;
+    transition: none;
 }
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -140,6 +140,8 @@
 					<div class="small-description">__MSG_whatManualSkipOnFullVideo__</div>
 				</div>

+				<div data-type="react-AdvancedSkipOptionsComponent"></div>
+
 				<div data-type="toggle" data-sync="forceChannelCheck">
 					<div class="switch-container">
 						<label class="switch">
@@ -154,20 +156,6 @@
 					<div class="small-description">__MSG_whatForceChannelCheck__</div>
 				</div>

-				<div data-type="toggle" data-sync="refetchWhenNotFound">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="refetchWhenNotFound" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="refetchWhenNotFound">
-							__MSG_enableRefetchWhenNotFound__
-						</label>
-					</div>
-	
-					<div class="small-description">__MSG_whatRefetchWhenNotFound__</div>
-				</div>
-
 				<div data-type="toggle" data-sync="showCategoryWithoutPermission">
 					<div class="switch-container">
 						<label class="switch">
@@ -486,6 +474,16 @@
 					<div class="inline"></div>
 				</div>

+				<div data-type="keybind-change" data-sync="upvoteKeybind">	
+					<label class="optionLabel">__MSG_setUpvoteKeybind__:</label>
+					<div class="inline"></div>
+				</div>
+
+				<div data-type="keybind-change" data-sync="downvoteKeybind">	
+					<label class="optionLabel">__MSG_setDownvoteKeybind__:</label>
+					<div class="inline"></div>
+				</div>
+				
 			</div>

 			<div id="import" class="option-group hidden">
@@ -570,7 +568,7 @@

 			<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">
 						<label class="switch">
 							<input id="supportInvidious" type="checkbox">
@@ -585,7 +583,7 @@
 					<div class="small-description">__MSG_supportOtherSitesDescription__ </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">
 						__MSG_addInvidiousInstance__
 					</div>
--- a/public/popup.css
+++ b/public/popup.css
@@ -293,7 +293,7 @@
  padding: 10px 15px;
  transition: background-color 0.2s ease-in-out;
 }
-.sbControlsMenu-item:hover {
+.sbControlsMenu-item:hover, .sbControlsMenu-item:focus {
  background-color: #444;
 }
 .sbControlsMenu-itemIcon {
@@ -582,6 +582,10 @@
  margin: 0 !important;
 }

+#sponsorBlockPopupBody .u-mZ.cleanPopupMargin {
+  margin-top: 10px !important;
+}
+
 #sponsorBlockPopupBody .hidden {
  display: none !important;
 }
@@ -618,4 +622,9 @@

 #issueReporterTabs > span.sbSelected > span::after {
  transform: scaleX(0.8);
+}
+
+.sbPopupButton {
+  width: 16px;
+  fill: var(--sb-main-fg-color);
 }
--- a/public/popup.html
+++ b/public/popup.html
@@ -1,209 +1,13 @@
-<!DOCTYPE html>
 <html id="sponsorBlockPopupHTML">
-  <head>
-    <meta charset="utf-8" />
-    <title>__MSG_openPopup__</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link id="sponsorBlockPopupFont" href="/libs/Source+Sans+Pro.css" rel="stylesheet">
-    <link id="sponsorBlockStyleSheet" href="popup.css" rel="stylesheet">
-    <link id="sponsorBlockStyleSheet" href="shared.css" rel="stylesheet">
-  </head>
+    <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1" /> 

-  <body id="sponsorBlockPopupBody" style="visibility: hidden">
-    <div id="sponsorblockPopup" class="sponsorBlockPageBody sb-preload">
+        <link href="popup.css" rel="stylesheet">
+        <link href="shared.css" rel="stylesheet">
+        <script src="./js/popup.js"></script>
+    </head>

-      <button id="sbCloseButton" title="__MSG_closePopup__" class="sbCloseButton hidden">
-        <img src="icons/close.png" width="15" height="15" alt="Close icon">
-      </button>
+    <body id="sponsorBlockPopupBody">

-      <div id="sbBetaServerWarning" class="hidden" title="__MSG_openOptionsPage__">
-        __MSG_betaServerWarning__
-      </div>
-
-      <header id="sbPopupLogo" class="sbPopupLogo">
-        <img src="icons/IconSponsorBlocker256px.png" alt="SponsorBlock" width="40" height="40" id="sponsorBlockPopupLogo">
-        <p class="u-mZ">SponsorBlock</p>
-      </header>
-
-      <div id="videoInfo">
-        <!-- Loading text -->
-        <p id="loadingIndicator" class="u-mZ grey-text">__MSG_noVideoID__</p>
-        <!-- If the video was found in the database -->
-        <p id="videoFound" class="u-mZ grey-text"></p>
-        <button id="refreshSegmentsButton" title="__MSG_refreshSegments__">
-          <img src="/icons/refresh.svg" alt="Refresh icon" id="refreshSegments" />
-        </button>
-        <!-- Video Segments -->
-        <div id="issueReporterContainer">
-          <div id="issueReporterTabs" class="hidden">
-            <span id="issueReporterTabSegments" class="sbSelected">
-              <span>__MSG_SegmentsCap__</span>
-            </span>
-            <span id="issueReporterTabChapters">
-              <span>__MSG_Chapters__</span>
-            </span>
-          </div>
-          <div id="issueReporterTimeButtons"></div>
-          <div id="issueReporterImportExport" class="hidden">
-            <div id="importExportButtons">
-              <button id="importSegmentsButton" title="__MSG_importSegments__">
-                <img src="/icons/import.svg" alt="Refresh icon" id="importSegments" />
-              </button>
-              <button id="exportSegmentsButton" class="hidden" title="__MSG_exportSegments__">
-                <img src="/icons/export.svg" alt="Export icon" id="exportSegments" />
-              </button>
-            </div>
-
-            <span id="importSegmentsMenu" class="hidden">
-              <textarea id="importSegmentsText" rows="5" style="width:80%"></textarea>
-
-              <button id="importSegmentsSubmit" title="__MSG_importSegments__">
-                __MSG_Import__
-              </button>
-            </span>
-          </div>
-        </div>
-      </div>
-
-      <!-- Toggle Box -->
-      <div class="sbControlsMenu">
-        <label id="whitelistButton" for="whitelistToggle" class="hidden sbControlsMenu-item">
-          <input type="checkbox" style="display: none" id="whitelistToggle">
-          <svg viewBox="0 0 24 24" width="23" height="23" class="SBWhitelistIcon sbControlsMenu-itemIcon">
-            <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
-          </svg>
-          <span id="whitelistChannel">__MSG_whitelistChannel__</span>
-          <span id="unwhitelistChannel" style="display: none">__MSG_removeFromWhitelist__</span>
-        </label>
-        <!--github: mbledkowski/toggle-switch-->
-        <label id="disableExtension" for="toggleSwitch" class="toggleSwitchContainer sbControlsMenu-item">
-          <span class="toggleSwitchContainer-switch">
-            <input type="checkbox" style="display: none" id="toggleSwitch" checked>
-            <span class="switchBg shadow"></span>
-            <span class="switchBg white"></span>
-            <span class="switchBg green"></span>
-            <span class="switchDot"></span>
-          </span>
-          <span id="disableSkipping">__MSG_disableSkipping__</span>
-          <span id="enableSkipping" style="display: none">__MSG_enableSkipping__</span>
-        </label>
-        <button id="optionsButton" class="sbControlsMenu-item" title="__MSG_optionsInfo__">
-          <img src="/icons/settings.svg" alt="Settings icon" width="23" height="23" class="sbControlsMenu-itemIcon" id="sbPopupIconSettings" />
-          __MSG_Options__
-        </button>
-      </div>
-
-      <a id="whitelistForceCheck" class="hidden">
-        __MSG_forceChannelCheckPopup__
-      </a>
-
-      <!-- Submit box -->
-      <div id="mainControls" style="display: none">
-        <h1 class="sbHeader">
-          __MSG_recordTimesDescription__
-        </h1>
-        <sub class="sponsorStartHint grey-text">__MSG_popupHint__</sub>
-        <div style="text-align: center; margin: 8px 0;">
-          <button id="sponsorStart" class="sbMediumButton" style="margin-right: 8px">__MSG_sponsorStart__</button>
-          <button id="submitTimes" class="sbMediumButton" style="display: none">__MSG_OpenSubmissionMenu__</button>
-        </div>
-        <span id="submissionHint" style="display: none">__MSG_submissionEditHint__</span>
-      </div>
-
-      <!-- Your Work box -->
-      <div id="sbYourWorkBox" class="sbYourWorkBox">
-        <h1 class="sbHeader" style="padding: 8px 15px;">
-          __MSG_yourWork__
-        </h1>
-        <div class="sbYourWorkCols">
-          <!-- Username -->
-          <div id="usernameElement">
-            <p class="u-mZ grey-text">__MSG_Username__:
-              <!-- loading/errors -->
-              <span id="setUsernameStatus" class="u-mZ white-text" style="display: none"></span>
-            </p>
-            <div id="setUsernameContainer">
-              <p id="usernameValue"></p>
-              <button id="setUsernameButton" title="__MSG_setUsername__">
-                <img src="/icons/pencil.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconEdit">
-              </button>
-              <button id="copyUserID" title="__MSG_copyPublicID__">
-                <img src="/icons/clipboard.svg" alt="__MSG_copyPublicID__" width="16" height="16" id="sbPopupIconCopyUserID">
-              </button>
-            </div>
-            <div id="setUsername" style="display: none">
-              <input id="usernameInput" placeholder="Username">
-              <button id="submitUsername">
-                <img src="/icons/check.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconCheck">
-              </button>
-            </div>
-          </div>
-          <!-- Submissions -->
-          <div id="sponsorTimesContributionsContainer" class="hidden">
-            <p class="u-mZ grey-text">__MSG_Submissions__:</p>
-            <p id="sponsorTimesContributionsDisplay" class="u-mZ">0</p>
-          </div>
-        </div>
-
-        <p id="sponsorTimesViewsContainer" style="display: none" class="u-mZ sbStatsSentence">
-          __MSG_savedPeopleFrom__
-          <b>
-            <span id="sponsorTimesViewsDisplay">0</span>
-          </b>
-          <span id="sponsorTimesViewsDisplayEndWord">__MSG_Segments__</span>
-          <br />
-          <span class="sbExtraInfo">
-            (
-            <b>
-              <span id="sponsorTimesOthersTimeSavedDisplay">0</span>
-              <span id="sponsorTimesOthersTimeSavedEndWord">__MSG_minsLower__</span>
-            </b>
-            <span>__MSG_youHaveSavedTimeEnd__</span>
-            )
-          </span>
-        </p>
-        <p id="sponsorTimesSkipsDoneContainer" style="display: none" class="u-mZ sbStatsSentence">
-          __MSG_youHaveSkipped__
-          <b>
-            <span id="sponsorTimesSkipsDoneDisplay">0</span>
-          </b>
-          <span id="sponsorTimesSkipsDoneEndWord">__MSG_Segments__</span>
-          <span class="sbExtraInfo">
-            (
-              <b>
-                <span id="sponsorTimeSavedDisplay">0</span>
-                <span id="sponsorTimeSavedEndWord">__MSG_minsLower__</span>
-              </b>
-            )
-          </span>
-        </p>
-      </div>
-
-      <div id="sponsorTimesDonateContainer" style="display: none; align-items: center; justify-content: center;">
-        <img class="sbHeart" src="/icons/heart.svg" alt="Heart icon" />
-        <a id="sbConsiderDonateLink" href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener">
-          __MSG_considerDonating__
-        </a>
-        <img id="sbCloseDonate" src="/icons/close.png" alt="__MSG_closeIcon__" height="8" style="padding-left: 5px; cursor: pointer;" />
-      </div>
-
-      <footer id="sbFooter">
-        <a id="helpButton">__MSG_help__</a>
-        <a href="https://sponsor.ajay.app" target="_blank" rel="noopener">__MSG_website__</a>
-        <a href="https://sponsor.ajay.app/stats" target="_blank" rel="noopener">__MSG_viewLeaderboard__</a>
-        <br />
-        <a href="https://github.com/ajayyy/SponsorBlock" target="_blank" rel="noopener">GitHub</a>
-        <a href="https://discord.gg/SponsorBlock" target="_blank" rel="noopener">Discord</a>
-        <a href="https://matrix.to/#/#sponsor:ajay.app?via=ajay.app&via=matrix.org&via=mozilla.org" target="_blank" rel="noopener">Matrix</a>
-        <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener" id="sbDonate">__MSG_Donate__</a>
-        <br />
-        <a id="debugLogs">__MSG_copyDebugLogs__</a>
-      </footer>
-
-      <button id="showNoticeAgain" style="display: none">__MSG_showNotice__</button>
-
-    </div>
-    <!-- Scripts that need to load after the html -->
-    <script src="./js/popup.js" async></script>
-  </body>
-</html>
+    </body>
+</html>
--- a/src/background.ts
+++ b/src/background.ts
@@ -43,7 +43,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
            chrome.tabs.create({url: chrome.runtime.getURL(request.url)});
            return false;
        case "submitVote":
-            submitVote(request.type, request.UUID, request.category).then(callback);
+            submitVote(request.type, request.UUID, request.category, request.videoID).then(callback);

            //this allows the callback to be called later
            return true;
@@ -214,7 +214,7 @@ async function  unregisterFirefoxContentScript(id: string) {
    }
 }

-async function submitVote(type: number, UUID: string, category: string) {
+async function submitVote(type: number, UUID: string, category: string, videoID: string) {
    let userID = Config.config.userID;

    if (userID == undefined || userID === "undefined") {
@@ -226,7 +226,7 @@ async function submitVote(type: number, UUID: string, category: string) {
    const typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;

    try {
-        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection);
+        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&videoID=" + videoID + "&userID=" + userID + typeSection);
    
        if (response.ok) {
            return {
--- a/src/components/ChapterVoteComponent.tsx
+++ b/src/components/ChapterVoteComponent.tsx
@@ -44,7 +44,7 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote
            <>
                {/* Upvote Button */}
                <button id={"sponsorTimesDownvoteButtonsContainerUpvoteChapter"}
-                        className={"playerButton sbPlayerUpvote ytp-button " + (!this.state.show ? "sbhidden" : "")}
+                        className={"playerButton sbPlayerUpvote ytp-button " + (!this.state.show ? "sbhidden " : " ") + (document.location.host === "tv.youtube.com" ? "sbButtonYTTV" : "")}
                        draggable="false"
                        title={chrome.i18n.getMessage("upvoteButtonInfo")}
                        onClick={(e) => this.vote(e, 1)}>
@@ -55,7 +55,7 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote

                {/* Downvote Button */}
                <button id={"sponsorTimesDownvoteButtonsContainerDownvoteChapter"}
-                        className={"playerButton sbPlayerDownvote ytp-button " + (!this.state.show ? "sbhidden" : "")}
+                        className={"playerButton sbPlayerDownvote ytp-button " + (!this.state.show ? "sbhidden " : " ") + (document.location.host === "tv.youtube.com" ? "sbButtonYTTV" : "")}
                        draggable="false"
                        title={chrome.i18n.getMessage("reportButtonInfo")}
                        onClick={(e) => {
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -1,12 +1,12 @@
 import * as React from "react";
 import * as CompileConfig from "../../config.json";
 import Config from "../config"
-import { Category, ContentContainer, SponsorTime, NoticeVisbilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
+import { Category, ContentContainer, SponsorTime, NoticeVisibilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
 import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 import Utils from "../utils";
 const utils = new Utils();
-import { getSkippingText, getUpcomingText } from "../utils/categoryUtils";
+import { getSkippingText, getUpcomingText, getVoteText } from "../utils/categoryUtils";

 import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
@@ -29,6 +29,7 @@ export interface SkipNoticeProps {
    autoSkip: boolean;
    startReskip?: boolean;
    upcomingNotice?: boolean;
+    voteNotice?: boolean;
    // Contains functions and variables from the content script needed by the skip notice
    contentContainer: ContentContainer;

@@ -102,7 +103,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        this.autoSkip = props.autoSkip;
        this.contentContainer = props.contentContainer;

-        const noticeTitle = !this.props.upcomingNotice ? getSkippingText(this.segments, this.props.autoSkip) : getUpcomingText(this.segments);
+        const noticeTitle = this.props.voteNotice ? getVoteText(this.segments) : !this.props.upcomingNotice ? getSkippingText(this.segments, this.props.autoSkip) : getUpcomingText(this.segments);

        const previousSkipNotices = document.querySelectorAll(".sponsorSkipNoticeParent:not(.sponsorSkipUpcomingNotice)");
        this.amountOfPreviousNotices = previousSkipNotices.length;
@@ -186,8 +187,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                idSuffix={this.idSuffix}
                fadeIn={this.props.fadeIn}
                fadeOut={!this.props.upcomingNotice}
-                startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll
-                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
+                startFaded={Config.config.noticeVisibilityMode >= NoticeVisibilityMode.FadedForAll
+                    || (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.FadedForAutoSkip && this.autoSkip)}
                timed={true}
                maxCountdownTime={this.state.maxCountdownTime}
                style={noticeStyle}
@@ -242,15 +243,18 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                        </div>

                        {/* Copy and Downvote Button */}
-                        <div id={"sponsorTimesDownvoteButtonsContainerCopyDownvote" + this.idSuffix}
-                                className="voteButton"
-                                style={{marginLeft: "5px"}}
-                                onClick={() => this.openEditingOptions()}>
-                            <PencilSvg fill={this.state.editing === true
-                                            || this.state.actionState === SkipNoticeAction.CopyDownvote
-                                            || this.state.choosingCategory === true
-                                            ? this.selectedColor : this.unselectedColor} />
-                        </div>
+                        {
+                            !this.props.voteNotice &&
+                            <div id={"sponsorTimesDownvoteButtonsContainerCopyDownvote" + this.idSuffix}
+                                    className="voteButton"
+                                    style={{marginLeft: "5px"}}
+                                    onClick={() => this.openEditingOptions()}>
+                                <PencilSvg fill={this.state.editing === true
+                                                || this.state.actionState === SkipNoticeAction.CopyDownvote
+                                                || this.state.choosingCategory === true
+                                                ? this.selectedColor : this.unselectedColor} />
+                            </div>
+                        }
                    </td>

                    :
@@ -278,11 +282,11 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                }

                {/* Unskip/Skip Button */}
-                {!this.props.smaller || this.segments[0].actionType === ActionType.Mute
+                {!this.props.voteNotice && (!this.props.smaller || this.segments[0].actionType === ActionType.Mute)
                    ? this.getSkipButton(1) : null}

                {/* Never show button */}
-                {!this.autoSkip || this.props.startReskip ? "" :
+                {!this.autoSkip || this.props.startReskip || this.props.voteNotice ? "" :
                    <td className="sponsorSkipNoticeRightSection"
                        key={1}>
                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
@@ -374,7 +378,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                style.minWidth = "100px";
            }

-            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;
+            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || !this.props.voteNotice || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;

            return (
                <span className="sponsorSkipNoticeUnskipSection" style={{ visibility: !showSkipButton ? "hidden" : null }}>
@@ -624,14 +628,17 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    }

    unskip(buttonIndex: number, index: number, forceSeek: boolean): void {
-        this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime, forceSeek);
+        this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime, forceSeek, this.props.voteNotice);

-        this.unskippedMode(buttonIndex, index, SkipButtonState.Redo);
+        this.unskippedMode(buttonIndex, index, this.segments[0].actionType === ActionType.Poi ? SkipButtonState.Undo : SkipButtonState.Redo);
    }

    reskip(buttonIndex: number, index: number, forceSeek: boolean): void {
        this.contentContainer().reskipSponsorTime(this.segments[index], forceSeek);
+        this.reskippedMode(buttonIndex);
+    }

+    reskippedMode(buttonIndex: number): void {
        const skipButtonStates = this.state.skipButtonStates;
        skipButtonStates[buttonIndex] = SkipButtonState.Undo;

@@ -661,7 +668,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    }

    getUnskippedModeInfo(buttonIndex: number, index: number, skipButtonState: SkipButtonState): SkipNoticeState {
-        const changeCountdown = this.segments[index].actionType !== ActionType.Poi;
+        const changeCountdown = !this.props.voteNotice && this.segments[index].actionType !== ActionType.Poi;

        const maxCountdownTime = changeCountdown ?
            this.getFullDurationCountdown(index) : this.state.maxCountdownTime;
@@ -669,7 +676,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        const skipButtonStates = this.state.skipButtonStates;
        const skipButtonCallbacks = this.state.skipButtonCallbacks;
        if (buttonIndex === null) {
-            for (let i = 0; i < this.segments.length; i++) {
+            for (let i = 0; i < skipButtonStates.length; i++) {
                skipButtonStates[i] = skipButtonState;
                skipButtonCallbacks[i] = this.reskip.bind(this);
            }
@@ -697,7 +704,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    getFullDurationCountdown(index: number): () => number {
        return () => {
            const sponsorTime = this.segments[index];
-            const duration = Math.round((sponsorTime.segment[1] - getCurrentTime()) * (1 / getVideo().playbackRate));
+            const duration = Math.round((sponsorTime.segment[1] - (getCurrentTime() ?? 0)) * (1 / (getVideo()?.playbackRate ?? 1)));

            return Math.max(duration, Config.config.skipNoticeDuration);
        };
--- a/src/components/options/AdvancedSkipOptionsComponent.tsx
+++ b/src/components/options/AdvancedSkipOptionsComponent.tsx
@@ -0,0 +1,273 @@
+import * as React from "react";
+import * as CompileConfig from "../../../config.json";
+
+import Config from "../../config";
+import { AdvancedSkipRuleSet, SkipRuleAttribute, SkipRuleOperator } from "../../utils/skipRule";
+import { ActionType, ActionTypes, CategorySkipOption } from "../../types";
+
+let configSaveTimeout: NodeJS.Timeout | null = null;
+
+export function AdvancedSkipOptionsComponent() {
+    const [optionsOpen, setOptionsOpen] = React.useState(false);
+    const [config, setConfig] = React.useState(configToText(Config.local.skipRules));
+    const [configValid, setConfigValid] = React.useState(true);
+
+    return (
+        <div>
+            <div className="option-button" onClick={() => {
+                setOptionsOpen(!optionsOpen);
+            }}>
+                {chrome.i18n.getMessage("openAdvancedSkipOptions")}
+            </div>
+
+            {
+                optionsOpen &&
+                <div className="advanced-skip-options-menu">
+                    <div className={"advanced-config-help-message"}>
+                        <a target="_blank"
+                                rel="noopener noreferrer"
+                                href="https://wiki.sponsor.ajay.app/w/Advanced_Skip_Options">
+                            {chrome.i18n.getMessage("advancedSkipSettingsHelp")}
+                        </a>
+
+                        <span className={configValid ? "hidden" : "invalid-advanced-config"}>
+                            {" - "}
+                            {chrome.i18n.getMessage("advancedSkipNotSaved")}
+                        </span>
+                    </div>
+
+                    <textarea className={"option-text-box " + (configValid ? "" : "invalid-advanced-config")}
+                        rows={10}
+                        style={{ width: "80%" }}
+                        value={config}
+                        spellCheck={false}
+                        onChange={(e) => {
+                            setConfig(e.target.value);
+
+                            const compiled = compileConfig(e.target.value);
+                            setConfigValid(!!compiled && !(e.target.value.length > 0 && compiled.length === 0));
+
+                            if (compiled) {
+                                if (configSaveTimeout) {
+                                    clearTimeout(configSaveTimeout);
+                                }
+
+                                configSaveTimeout = setTimeout(() => {
+                                    Config.local.skipRules = compiled;
+                                }, 200);
+                            }
+                        }}
+                    />
+                </div>
+            }
+        </div>
+    );
+}
+
+function compileConfig(config: string): AdvancedSkipRuleSet[] | null {
+    const ruleSets: AdvancedSkipRuleSet[] = [];
+
+    let ruleSet: AdvancedSkipRuleSet = {
+        rules: [],
+        skipOption: null,
+        comment: ""
+    };
+
+    for (const line of config.split("\n")) {
+        if (line.trim().length === 0) {
+            // Skip empty lines
+            continue;
+        }
+
+        const comment = line.match(/^\s*\/\/(.+)$/);
+        if (comment) {
+            if (ruleSet.rules.length > 0) {
+                // Rule has already been created, add it to list if valid
+                if (ruleSet.skipOption !== null && ruleSet.rules.length > 0) {
+                    ruleSets.push(ruleSet);
+
+                    ruleSet = {
+                        rules: [],
+                        skipOption: null,
+                        comment: ""
+                    };
+                } else {
+                    return null;
+                }
+            }
+
+            if (ruleSet.comment.length > 0) {
+                ruleSet.comment += "; ";
+            }
+
+            ruleSet.comment += comment[1].trim();
+
+            // Skip comment lines
+            continue;
+        } else if (line.startsWith("if ")) {
+            if (ruleSet.rules.length > 0) {
+                // Rule has already been created, add it to list if valid
+                if (ruleSet.skipOption !== null && ruleSet.rules.length > 0) {
+                    ruleSets.push(ruleSet);
+
+                    ruleSet = {
+                        rules: [],
+                        skipOption: null,
+                        comment: ""
+                    };
+                } else {
+                    return null;
+                }
+            }
+
+            const ruleTexts = [...line.matchAll(/\S+ \S+ (?:"[^"\\]*(?:\\.[^"\\]*)*"|\d+)(?= and |$)/g)];
+            for (const ruleText of ruleTexts) {
+                if (!ruleText[0]) return null;
+
+                const ruleParts = ruleText[0].match(/(\S+) (\S+) ("[^"\\]*(?:\\.[^"\\]*)*"|\d+)/);
+                if (ruleParts.length !== 4) {
+                    return null; // Invalid rule format
+                }
+
+                const attribute = getSkipRuleAttribute(ruleParts[1]);
+                const operator = getSkipRuleOperator(ruleParts[2]);
+                const value = getSkipRuleValue(ruleParts[3]);
+                if (attribute === null || operator === null || value === null) {
+                    return null; // Invalid attribute or operator
+                }
+
+                if ([SkipRuleOperator.Equal, SkipRuleOperator.NotEqual].includes(operator)) {
+                    if (attribute === SkipRuleAttribute.Category
+                            && !CompileConfig.categoryList.includes(value as string)) {
+                        return null; // Invalid category value
+                    } else if (attribute === SkipRuleAttribute.ActionType
+                            && !ActionTypes.includes(value as ActionType)) {
+                        return null; // Invalid category value
+                    } else if (attribute === SkipRuleAttribute.Source
+                            && !["local", "youtube", "autogenerated", "server"].includes(value as string)) {
+                        return null; // Invalid category value
+                    }
+                }
+
+                ruleSet.rules.push({
+                    attribute,
+                    operator,
+                    value
+                });
+            }
+
+            // Make sure all rules were parsed
+            if (ruleTexts.length === 0 || !line.endsWith(ruleTexts[ruleTexts.length - 1][0])) {
+                return null;
+            }
+        } else {
+            // Only continue if a rule has been defined
+            if (ruleSet.rules.length === 0) {
+                return null; // No rules defined yet
+            }
+
+            switch (line.trim().toLowerCase()) {
+                case "disabled":
+                    ruleSet.skipOption = CategorySkipOption.Disabled;
+                    break;
+                case "show overlay":
+                    ruleSet.skipOption = CategorySkipOption.ShowOverlay;
+                    break;
+                case "manual skip":
+                    ruleSet.skipOption = CategorySkipOption.ManualSkip;
+                    break;
+                case "auto skip":
+                    ruleSet.skipOption = CategorySkipOption.AutoSkip;
+                    break;
+                default:
+                    return null; // Invalid skip option
+            }
+        }
+    }
+
+    if (ruleSet.rules.length > 0 && ruleSet.skipOption !== null) {
+        ruleSets.push(ruleSet);
+    } else if (ruleSet.rules.length > 0 || ruleSet.skipOption !== null) {
+        // Incomplete rule set
+        return null;
+    }
+
+    return ruleSets;
+}
+
+function getSkipRuleAttribute(attribute: string): SkipRuleAttribute | null {
+    if (attribute && Object.values(SkipRuleAttribute).includes(attribute as SkipRuleAttribute)) {
+        return attribute as SkipRuleAttribute;
+    }
+
+    return null;
+}
+
+function getSkipRuleOperator(operator: string): SkipRuleOperator | null {
+    if (operator && Object.values(SkipRuleOperator).includes(operator as SkipRuleOperator)) {
+        return operator as SkipRuleOperator;
+    }
+
+    return null;
+}
+
+function getSkipRuleValue(value: string): string | number | null {
+    if (!value) return null;
+
+    if (value.startsWith('"')) {
+        try {
+            return JSON.parse(value);
+        } catch (e) {
+            return null; // Invalid JSON string
+        }
+    } else {
+        const numValue = Number(value);
+        if (!isNaN(numValue)) {
+            return numValue;
+        }
+
+        return null;
+    }
+}
+
+function configToText(config: AdvancedSkipRuleSet[]): string {
+    let result = "";
+
+    for (const ruleSet of config) {
+        if (ruleSet.comment) {
+            result += "// " + ruleSet.comment + "\n";
+        }
+
+        result += "if ";
+        let firstRule = true;
+        for (const rule of ruleSet.rules) {
+            if (!firstRule) {
+                result += " and ";
+            }
+
+            result += `${rule.attribute} ${rule.operator} ${JSON.stringify(rule.value)}`;
+            firstRule = false;
+        }
+
+        switch (ruleSet.skipOption) {
+            case CategorySkipOption.Disabled:
+                result += "\nDisabled";
+                break;
+            case CategorySkipOption.ShowOverlay:
+                result += "\nShow Overlay";
+                break;
+            case CategorySkipOption.ManualSkip:
+                result += "\nManual Skip";
+                break;
+            case CategorySkipOption.AutoSkip:
+                result += "\nAuto Skip";
+                break;
+            default:
+                return null; // Invalid skip option
+        }
+
+        result += "\n\n";
+    }
+
+    return result.trim();
+}
--- a/src/components/options/CategorySkipOptionsComponent.tsx
+++ b/src/components/options/CategorySkipOptionsComponent.tsx
@@ -243,6 +243,9 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                return [{
                    configKey: "autoSkipOnMusicVideos",
                    label: chrome.i18n.getMessage("autoSkipOnMusicVideos"),
+                }, {
+                    configKey: "skipNonMusicOnlyOnYoutubeMusic",
+                    label: chrome.i18n.getMessage("skipNonMusicOnlyOnYoutubeMusic"),
                }];
            default:
                return [];
--- a/src/components/options/KeybindDialogComponent.tsx
+++ b/src/components/options/KeybindDialogComponent.tsx
@@ -146,7 +146,9 @@ class KeybindDialogComponent extends React.Component<KeybindDialogProps, Keybind
                this.props.option !== "actuallySubmitKeybind" && this.equals(Config.config['actuallySubmitKeybind']) ||
                this.props.option !== "previewKeybind" && this.equals(Config.config['previewKeybind']) ||
                this.props.option !== "closeSkipNoticeKeybind" && this.equals(Config.config['closeSkipNoticeKeybind']) ||
-                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
+                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']) ||
+                this.props.option !== "downvoteKeybind" && this.equals(Config.config['downvoteKeybind']) ||
+                this.props.option !== "upvoteKeybind" && this.equals(Config.config['upvoteKeybind']))
            return {message: chrome.i18n.getMessage("keyAlreadyUsed"), blocking: true};

        return null;
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,12 +1,9 @@
 import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
-import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
+import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
 import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
 import { HashedValue } from "../maze-utils/src/hash";
-
-export interface Permission {
-    canSubmit: boolean;
-}
+import { Permission, AdvancedSkipRuleSet } from "./utils/skipRule";

 interface SBConfig {
    userID: string;
@@ -32,7 +29,7 @@ interface SBConfig {
    trackDownvotesInPrivate: boolean;
    dontShowNotice: boolean;
    showUpcomingNotice: boolean;
-    noticeVisibilityMode: NoticeVisbilityMode;
+    noticeVisibilityMode: NoticeVisibilityMode;
    hideVideoPlayerControls: boolean;
    hideInfoButtonPlayerControls: boolean;
    hideDeleteButtonPlayerControls: boolean;
@@ -48,7 +45,6 @@ interface SBConfig {
    audioNotificationOnSkip: boolean;
    checkForUnlistedVideos: boolean;
    testingServer: boolean;
-    refetchWhenNotFound: boolean;
    ytInfoPermissionGranted: boolean;
    allowExpirements: boolean;
    showDonationLink: boolean;
@@ -58,6 +54,7 @@ interface SBConfig {
    donateClicked: number;
    autoHideInfoButton: boolean;
    autoSkipOnMusicVideos: boolean;
+    skipNonMusicOnlyOnYoutubeMusic: boolean;
    colorPalette: {
        red: string;
        white: string;
@@ -98,6 +95,8 @@ interface SBConfig {
    nextChapterKeybind: Keybind;
    previousChapterKeybind: Keybind;
    closeSkipNoticeKeybind: Keybind;
+    upvoteKeybind: Keybind;
+    downvoteKeybind: Keybind;

    // What categories should be skipped
    categorySelections: CategorySelection[];
@@ -147,6 +146,8 @@ interface SBStorage {

    /* Contains unsubmitted segments that the user has created. */
    unsubmittedSegments: Record<string, SponsorTime[]>;
+
+    skipRules: AdvancedSkipRuleSet[];
 }

 class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
@@ -166,6 +167,15 @@ class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
 }

 function migrateOldSyncFormats(config: SBConfig) {
+    if (!config["changeChapterColor"]) {
+        config.barTypes["chapter"].color = "#ffd983";
+        config["changeChapterColor"] = true;
+        chrome.storage.sync.set({
+            "changeChapterColor": true,
+            "barTypes": config.barTypes
+        });
+    }
+
    if (config["showZoomToFillError"]) {
        chrome.storage.sync.remove("showZoomToFillError");
    }
@@ -296,7 +306,7 @@ const syncDefaults = {
    trackDownvotesInPrivate: false,
    dontShowNotice: false,
    showUpcomingNotice: false,
-    noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
+    noticeVisibilityMode: NoticeVisibilityMode.FadedForAutoSkip,
    hideVideoPlayerControls: false,
    hideInfoButtonPlayerControls: false,
    hideDeleteButtonPlayerControls: false,
@@ -312,7 +322,6 @@ const syncDefaults = {
    audioNotificationOnSkip: false,
    checkForUnlistedVideos: false,
    testingServer: false,
-    refetchWhenNotFound: true,
    ytInfoPermissionGranted: false,
    allowExpirements: true,
    showDonationLink: true,
@@ -322,6 +331,7 @@ const syncDefaults = {
    donateClicked: 0,
    autoHideInfoButton: true,
    autoSkipOnMusicVideos: false,
+    skipNonMusicOnlyOnYoutubeMusic: false,
    scrollToEditTimeUpdate: false, // false means the tooltip will be shown
    categoryPillUpdate: false,
    showChapterInfoMessage: true,
@@ -358,6 +368,8 @@ const syncDefaults = {
    nextChapterKeybind: { key: "ArrowRight", ctrl: true },
    previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
    closeSkipNoticeKeybind: { key: "Backspace" },
+    downvoteKeybind: { key: "h", shift: true },
+    upvoteKeybind: { key: "g", shift: true },

    categorySelections: [{
        name: "sponsor" as Category,
@@ -468,7 +480,11 @@ const syncDefaults = {
        "preview-filler": {
            color: "#2E0066",
            opacity: "0.7"
-        }
+        },
+        "chapter": {
+            color: "#ffd983",
+            opacity: "0"
+        },
    }
 };

@@ -477,7 +493,8 @@ const localDefaults = {
    navigationApiAvailable: null,
    alreadyInstalled: false,

-    unsubmittedSegments: {}
+    unsubmittedSegments: {},
+    skipRules: []
 };

 const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);
--- a/src/content.ts
+++ b/src/content.ts
@@ -33,9 +33,9 @@ import { logDebug, logWarn } from "./utils/logger";
 import { importTimes } from "./utils/exporter";
 import { ChapterVote } from "./render/ChapterVote";
 import { openWarningDialog } from "./utils/warnings";
-import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
+import { extensionUserAgent, isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { getErrorMessage, getFormattedTime } from "../maze-utils/src/formating";
-import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube, getLastNonInlineVideoID, triggerVideoIDChange, triggerVideoElementChange, getIsInline, getCurrentTime, setCurrentTime, getVideoDuration, verifyCurrentTime, waitForVideo } from "../maze-utils/src/video";
+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"
 import { getHash, HashedValue } from "../maze-utils/src/hash";
@@ -52,6 +52,7 @@ import { isMobileControlsOpen } from "./utils/mobileUtils";
 import { defaultPreviewTime } from "./utils/constants";
 import { onVideoPage } from "../maze-utils/src/pageInfo";
 import { getSegmentsForVideo } from "./utils/segmentData";
+import { getCategoryDefaultSelection, getCategorySelection } from "./utils/skipRule";

 cleanPage();

@@ -76,11 +77,11 @@ let sponsorTimes: SponsorTime[] = [];
 let existingChaptersImported = false;
 let importingChaptersWaitingForFocus = false;
 let importingChaptersWaiting = false;
+let loopedChapter :SponsorTime = null;
 // List of open skip notices
 const skipNotices: SkipNotice[] = [];
 let upcomingNotice: UpcomingNotice | null = null;
 let activeSkipKeybindElement: ToggleSkippable = null;
-let retryFetchTimeout: NodeJS.Timeout = null;
 let shownSegmentFailedToFetchWarning = false;
 let selectedSegment: SegmentUUID | null = null;
 let previewedSegment = false;
@@ -173,7 +174,6 @@ let popupInitialised = false;
 let submissionNotice: SubmissionNotice = null;

 let lastResponseStatus: number;
-let retryCount = 0;

 // Contains all of the functions and variables needed by the skip notice
 const skipNoticeContentContainer: ContentContainer = () => ({
@@ -222,9 +222,12 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
            sendResponse({
                found: sponsorDataFound,
                status: lastResponseStatus,
-                sponsorTimes: sponsorTimes,
+                sponsorTimes: sponsorTimes.filter((segment) => getCategorySelection(segment).option !== CategorySkipOption.Disabled),
                time: getCurrentTime() ?? 0,
-                onMobileYouTube: isOnMobileYouTube()
+                onMobileYouTube: isOnMobileYouTube(),
+                videoID: getVideoID(),
+                loopedChapter: loopedChapter?.UUID,
+                channelWhitelisted
            });

            if (!request.updating && popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
@@ -233,22 +236,11 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
            }

            popupInitialised = true;
-            break;
-        case "getVideoID":
-            sendResponse({
-                videoID: getVideoID(),
-            });
-
            break;
        case "getChannelID":
            sendResponse({
-                channelID: getChannelIDInfo().id
-            });
-
-            break;
-        case "isChannelWhitelisted":
-            sendResponse({
-                value: channelWhitelisted
+                channelID: getChannelIDInfo().id,
+                isYTTV: (document.location.host === "tv.youtube.com")
            });

            break;
@@ -302,16 +294,25 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
        case "copyToClipboard":
            navigator.clipboard.writeText(request.text);
            break;
+        case "loopChapter":
+            if (!request.UUID){
+                loopedChapter = null;
+                break;
+            }
+            loopedChapter = {...utils.getSponsorTimeFromUUID(sponsorTimes, request.UUID)};
+            loopedChapter.segment = [loopedChapter.segment[1], loopedChapter.segment[0]];
+            break;
        case "importSegments": {
            const importedSegments = importTimes(request.data, getVideoDuration());
            let addedSegments = false;
            for (const segment of importedSegments) {
                if (!sponsorTimesSubmitting.some(
                        (s) => Math.abs(s.segment[0] - segment.segment[0]) < 1
-                            && Math.abs(s.segment[1] - segment.segment[1]) < 1)) {
+                            && Math.abs(s.segment[1] - segment.segment[1]) < 1
+                            && s.description === segment.description)) {
                    const hasChaptersPermission = (Config.config.showCategoryWithoutPermission
                        || Config.config.permissions["chapter"]);
-                    if (segment.category === "chapter" && (!utils.getCategorySelection("chapter") || !hasChaptersPermission)) {
+                    if (segment.category === "chapter" && (!getCategoryDefaultSelection("chapter") || !hasChaptersPermission)) {
                        segment.category = "chooseACategory" as Category;
                        segment.actionType = ActionType.Skip;
                        segment.description = "";
@@ -391,13 +392,13 @@ if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
 function resetValues() {
    lastCheckTime = 0;
    lastCheckVideoTime = -1;
-    retryCount = 0;
    previewedSegment = false;
    firstPlay = true;

    sponsorTimes = [];
    existingChaptersImported = false;
    sponsorSkipped = [];
+    loopedChapter = null;
    lastResponseStatus = 0;
    shownSegmentFailedToFetchWarning = false;

@@ -519,7 +520,7 @@ function handleMobileControlsMutations(): void {
 function getPreviewBarAttachElement(): HTMLElement | null {
    const progressElementOptions = [{
            // For newer mobile YouTube (Sept 2024)
-            selector: ".YtProgressBarLineHost, .YtChapteredProgressBarHost",
+            selector: ".ytChapteredProgressBarHost, .ytProgressBarLineHost, .YtProgressBarLineHost, .YtChapteredProgressBarHost",
            isVisibleCheck: true
        }, {
            // For newer mobile YouTube (May 2024)
@@ -555,6 +556,10 @@ function getPreviewBarAttachElement(): HTMLElement | null {
        }, {
            // For Vorapis v3
            selector: ".ytp-progress-bar-container > .html5-progress-bar > .ytp-progress-list"
+        }, {
+            // For YTTV
+            selector: ".yssi-slider > div.ytu-ss-timeline-container",
+            isVisibleCheck: false
        }
    ];

@@ -580,7 +585,7 @@ function createPreviewBar(): void {

    if (el) {
        const chapterVote = new ChapterVote(voteAsync);
-        previewBar = new PreviewBar(el, isOnMobileYouTube(), isOnInvidious(), chapterVote, () => importExistingChapters(true));
+        previewBar = new PreviewBar(el, isOnMobileYouTube(), isOnInvidious(), isOnYTTV(), chapterVote, () => importExistingChapters(true));

        updatePreviewBar();
    }
@@ -691,7 +696,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
        for (const segment of skipInfo.array) {
            if (shouldAutoSkip(segment) &&
                    segment.segment[0] >= skipTime[0] && segment.segment[1] <= skipTime[1]
-                    && segment.segment[0] === segment.scheduledTime) { // Don't include artifical scheduled segments (end times for mutes)
+                    && segment.segment[0] === segment.scheduledTime) { // Don't include artificial scheduled segments (end times for mutes)
                skippingSegments.push(segment);
            }
        }
@@ -708,7 +713,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
        forceVideoTime ||= Math.max(getCurrentTime(), getVirtualTime());

        if ((shouldSkip(currentSkip) || sponsorTimesSubmitting?.some((segment) => segment.segment === currentSkip.segment))) {
-            if (forceVideoTime >= skipTime[0] - skipBuffer && forceVideoTime < skipTime[1]) {
+            if (forceVideoTime >= skipTime[0] - skipBuffer && (forceVideoTime < skipTime[1] || skipTime[1] < skipTime[0])) {
                skipToTime({
                    v: getVideo(),
                    skipTime,
@@ -716,7 +721,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                    openNotice: skipInfo.openNotice
                });

-                // These are segments that start at the exact same time but need seperate notices
+                // These are segments that start at the exact same time but need separate notices
                for (const extra of skipInfo.extraIndexes) {
                    const extraSkip = skipInfo.array[extra];
                    if (shouldSkip(extraSkip)) {
@@ -729,7 +734,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                    }
                }

-                if (utils.getCategorySelection(currentSkip.category)?.option === CategorySkipOption.ManualSkip
+                if (getCategorySelection(currentSkip)?.option === CategorySkipOption.ManualSkip
                        || currentSkip.actionType === ActionType.Mute) {
                    forcedSkipTime = skipTime[0] + 0.001;
                } else {
@@ -749,7 +754,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
        }

        // Don't pretend to be earlier than we are, could result in loops
-        if (forcedSkipTime !== null && forceVideoTime > forcedSkipTime) {
+        if (forcedSkipTime !== null && forceVideoTime > forcedSkipTime && skipTime[1] > skipTime[0]) {
            forcedSkipTime = forceVideoTime;
        }

@@ -760,7 +765,8 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
        skippingFunction(currentTime);
    } else {
        let delayTime = timeUntilSponsor * 1000 * (1 / getVideo().playbackRate);
-        if (delayTime < (isFirefoxOrSafari() && !isSafari() ? 750 : 300)) {
+        if (delayTime < (isFirefoxOrSafari() && !isSafari() ? 750 : 300)
+                && shouldAutoSkip(skippingSegments[0])) {
            let forceStartIntervalTime: number | null = null;
            if (isFirefoxOrSafari() && !isSafari() && delayTime > 300) {
                forceStartIntervalTime = await waitForNextTimeChange();
@@ -768,7 +774,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current

            // Use interval instead of timeout near the end to combat imprecise video time
            const startIntervalTime = forceStartIntervalTime || performance.now();
-            const startVideoTime = Math.max(currentTime, getCurrentTime());
+            const startVideoTime = Math.max(currentTime, getVirtualTime());
            delayTime = (skipTime?.[0] - startVideoTime) * 1000 * (1 / getVideo().playbackRate);

            let startWaitingForReportedTimeToChange = true;
@@ -787,7 +793,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                }

                const intervalDuration = performance.now() - startIntervalTime;
-                if (intervalDuration + skipBuffer * 1000 >= delayTime || getCurrentTime() >= skipTime[0]) {
+                if (intervalDuration + skipBuffer * 1000 >= delayTime || getVirtualTime() + skipBuffer >= skipTime[0]) {
                    clearInterval(currentSkipInterval);
                    if (!isFirefoxOrSafari() && !getVideo().muted && !inMuteSegment(getCurrentTime(), true)) {
                        // Workaround for more accurate skipping on Chromium
@@ -795,7 +801,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                        getVideo().muted = false;
                    }

-                    skippingFunction(Math.max(getCurrentTime(), startVideoTime + getVideo().playbackRate * Math.max(delayTime, intervalDuration) / 1000));
+                    skippingFunction(Math.max(getVirtualTime(), startVideoTime + getVideo().playbackRate * Math.max(delayTime, intervalDuration) / 1000));
                }
            }, 0);
        } else {
@@ -838,7 +844,7 @@ function getVirtualTime(): number {
        (performance.now() - lastKnownVideoTime.preciseTime) * (getVideo()?.playbackRate || 1) / 1000 + lastKnownVideoTime.videoTime : null);

    if (Config.config.useVirtualTime && !isSafari() && virtualTime
-            && Math.abs(virtualTime - getCurrentTime()) < 0.2 && getCurrentTime() !== 0) {
+            && virtualTime > getCurrentTime() && virtualTime - getCurrentTime() < 0.8 && getCurrentTime() !== 0) {
        return Math.max(virtualTime, getCurrentTime());
    } else {
        return getCurrentTime();
@@ -863,7 +869,8 @@ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boole
    const recordedVideoID = videoID || getVideoID();
    if (currentVideoID !== recordedVideoID || (sponsorTime
            && (!sponsorTimes || !sponsorTimes?.some((time) => time.segment[0] === sponsorTime.segment[0] && time.segment[1] === sponsorTime.segment[1]))
-            && !sponsorTimesSubmitting.some((time) => time.segment[0] === sponsorTime.segment[0] && time.segment[1] === sponsorTime.segment[1]))) {
+            && !sponsorTimesSubmitting.some((time) => time.segment[0] === sponsorTime.segment[0] && time.segment[1] === sponsorTime.segment[1])
+            && (!isLoopedChapter(sponsorTime)))) {
        // Something has really gone wrong
        console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
        console.error("[SponsorBlock] VideoID recorded: " + recordedVideoID + ". Actual VideoID: " + currentVideoID);
@@ -1148,7 +1155,8 @@ function setupSkipButtonControlBar() {
                forceAutoSkip: true
            }),
            selectSegment,
-            onMobileYouTube: isOnMobileYouTube()
+            onMobileYouTube: isOnMobileYouTube(),
+            onYTTV: isOnYTTV(),
        });
    }

@@ -1241,28 +1249,30 @@ async function sponsorsLookup(keepOldSubmissions = true, ignoreCache = false) {
            if (!isNaN(getVideoDuration())) {
                updatePreviewBar();
            }
-        } else {
-            retryFetch(404);
        }
-    } else {
-        retryFetch(lastResponseStatus);
    }

+    notifyPopupOfSegments();
    importExistingChapters(true);

+    if (Config.config.isVip) {
+        lockedCategoriesLookup();
+    }
+}
+
+function notifyPopupOfSegments(): void {
    // notify popup of segment changes
    chrome.runtime.sendMessage({
        message: "infoUpdated",
        found: sponsorDataFound,
        status: lastResponseStatus,
-        sponsorTimes: sponsorTimes,
+        sponsorTimes: sponsorTimes.filter((segment) => getCategorySelection(segment).option !== CategorySkipOption.Disabled),
        time: getCurrentTime() ?? 0,
-        onMobileYouTube: isOnMobileYouTube()
+        onMobileYouTube: isOnMobileYouTube(),
+        videoID: getVideoID(),
+        loopedChapter: loopedChapter?.UUID,
+        channelWhitelisted
    });
-
-    if (Config.config.isVip) {
-        lockedCategoriesLookup();
-    }
 }

 function importExistingChapters(wait: boolean) {
@@ -1312,27 +1322,6 @@ async function lockedCategoriesLookup(): Promise<void> {
    }
 }

-function retryFetch(errorCode: number): void {
-    sponsorDataFound = false;
-    if (!Config.config.refetchWhenNotFound) return;
-
-    if (retryFetchTimeout) clearTimeout(retryFetchTimeout);
-    if ((errorCode !== 404 && retryCount > 1) || (errorCode !== 404 && retryCount > 10)) {
-        // Too many errors (50x), give up
-        return;
-    }
-
-    retryCount++;
-
-    const delay = errorCode === 404 ? (30000 + Math.random() * 30000) : (2000 + Math.random() * 10000);
-    retryFetchTimeout = setTimeout(() => {
-        if (getVideoID() && sponsorTimes?.length === 0
-                || sponsorTimes.every((segment) => segment.source !== SponsorSourceType.Server)) {
-            // sponsorsLookup();
-        }
-    }, delay);
-}
-
 /**
 * Only should be used when it is okay to skip a sponsor when in the middle of it
 *
@@ -1369,7 +1358,7 @@ function startSkipScheduleCheckingForStartSponsors() {
                && time.actionType === ActionType.Poi && time.hidden === SponsorHideType.Visible)
            .sort((a, b) => b.segment[0] - a.segment[0]);
        for (const time of poiSegments) {
-            const skipOption = utils.getCategorySelection(time.category)?.option;
+            const skipOption = getCategorySelection(time)?.option;
            if (skipOption !== CategorySkipOption.ShowOverlay) {
                skipToTime({
                    v: getVideo(),
@@ -1417,7 +1406,7 @@ function updatePreviewBar(): void {
    const previewBarSegments: PreviewBarSegment[] = [];
    if (sponsorTimes) {
        sponsorTimes.forEach((segment) => {
-            if (segment.hidden !== SponsorHideType.Visible) return;
+            if (segment.hidden !== SponsorHideType.Visible || getCategorySelection(segment).option === CategorySkipOption.Disabled) return;

            previewBarSegments.push({
                segment: segment.segment as [number, number],
@@ -1427,22 +1416,24 @@ function updatePreviewBar(): void {
                showLarger: segment.actionType === ActionType.Poi,
                description: segment.description,
                source: segment.source,
-                requiredSegment: requiredSegment && (segment.UUID === requiredSegment || segment.UUID?.startsWith(requiredSegment)),
+                requiredSegment: requiredSegment && (segment.UUID === requiredSegment || segment.UUID?.startsWith(requiredSegment) || requiredSegment.startsWith(segment.UUID)),
                selectedSegment: selectedSegment && segment.UUID === selectedSegment
            });
        });
    }

    sponsorTimesSubmitting.forEach((segment) => {
-        previewBarSegments.push({
-            segment: segment.segment as [number, number],
-            category: segment.category,
-            actionType: segment.actionType,
-            unsubmitted: true,
-            showLarger: segment.actionType === ActionType.Poi,
-            description: segment.description,
-            source: segment.source
-        });
+        if (segment.actionType !== ActionType.Chapter || segment.segment.length > 1) {
+            previewBarSegments.push({
+                segment: segment.segment as [number, number],
+                category: segment.category,
+                actionType: segment.actionType,
+                unsubmitted: true,
+                showLarger: segment.actionType === ActionType.Poi,
+                description: segment.description,
+                source: segment.source
+            });
+        }
    });

    previewBar.set(previewBarSegments.filter((segment) => segment.actionType !== ActionType.Full), getVideoDuration())
@@ -1469,6 +1460,9 @@ async function channelIDChange(channelIDInfo: ChannelIDInfo) {

    // check if the start of segments were missed
    if (Config.config.forceChannelCheck && sponsorTimes?.length > 0) startSkipScheduleCheckingForStartSponsors();
+
+    updatePreviewBar();
+    notifyPopupOfSegments();
 }

 function videoElementChange(newVideo: boolean, video: HTMLVideoElement): void {
@@ -1516,9 +1510,12 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool
        {array: ScheduledTime[]; index: number; endIndex: number; extraIndexes: number[]; openNotice: boolean} {

    const autoSkipSorter = (segment: ScheduledTime) => {
-        const skipOption = utils.getCategorySelection(segment.category)?.option;
-        if ((skipOption === CategorySkipOption.AutoSkip || shouldAutoSkip(segment))
-                && segment.actionType === ActionType.Skip) {
+        const skipOption = getCategorySelection(segment)?.option;
+        if (segment.hidden !== SponsorHideType.Visible) {
+            // Hidden segments sometimes end up here if another segment is at the same time, use them last
+            return 3;
+        } else if ((skipOption === CategorySkipOption.AutoSkip || shouldAutoSkip(segment))
+                && (segment.actionType === ActionType.Skip || segment.actionType === ActionType.Chapter)) {
            return 0;
        } else if (skipOption !== CategorySkipOption.ShowOverlay) {
            return 1;
@@ -1555,7 +1552,7 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool
            array: submittedArray,
            index: minSponsorTimeIndex,
            endIndex: endTimeIndex,
-            extraIndexes, // Segments at same time that need seperate notices
+            extraIndexes, // Segments at same time that need separate notices
            openNotice: true
        };
    } else {
@@ -1590,8 +1587,16 @@ function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideH
        return index;
    }

-    // Default to the normal endTime
-    let latestEndTimeIndex = index;
+    let latestEndTimeIndex = -1;
+    // Default to looped chapter if its end would have been skipped
+    if (loopedChapter
+        && (loopedChapter.segment[0] > sponsorTimes[index].segment[0]
+                && loopedChapter.segment[0] <= sponsorTimes[index]?.segment[1])){
+        latestEndTimeIndex = sponsorTimes.length - 1;
+    } else {
+        // or the normal end time otherwise 
+        latestEndTimeIndex = index;
+    }

    for (let i = 0; i < sponsorTimes?.length; i++) {
        const currentSegment = sponsorTimes[i].segment;
@@ -1634,7 +1639,8 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
    const shouldIncludeTime = (segment: ScheduledTime ) => (minimum === undefined
        || ((includeNonIntersectingSegments && segment.scheduledTime >= minimum)
            || (includeIntersectingSegments && segment.scheduledTime < minimum
-                    && segment.segment[1] > minimum && shouldSkip(segment)))) // Only include intersecting skippable segments
+                    && ((segment.segment[1] > minimum && shouldSkip(segment)) // Only include intersecting skippable segments
+                        || isLoopedChapter(segment)))))
        && (!hideHiddenSponsors || segment.hidden === SponsorHideType.Visible)
        && segment.segment.length === 2
        && segment.actionType !== ActionType.Poi
@@ -1656,6 +1662,12 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
        }
    });

+    if (loopedChapter){
+        possibleTimes.push({
+            ...loopedChapter,
+            scheduledTime: loopedChapter.segment[0]})
+    }
+
    for (let i = 0; i < possibleTimes.length; i++) {
        if (shouldIncludeTime(possibleTimes[i])) {
            scheduledTimes.push(possibleTimes[i].scheduledTime);
@@ -1705,7 +1717,7 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped:
                counted = true;
            }

-            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID);
+            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID + "&videoID=" + getVideoID());
        }
    }
 }
@@ -1722,6 +1734,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
            && getCurrentTime() !== skipTime[1]) {
        switch(skippingSegments[0].actionType) {
            case ActionType.Poi:
+            case ActionType.Chapter:
            case ActionType.Skip: {
                // Fix for looped videos not working when skipping to the end #426
                // for some reason you also can't skip to 1 second before the end
@@ -1805,7 +1818,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
    if (autoSkip || isSubmittingSegment) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true);
 }

-function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, unskipTime: number, startReskip: boolean) {
+function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, unskipTime: number, startReskip: boolean, voteNotice = false) {
    for (const skipNotice of skipNotices) {
        if (skippingSegments.length === skipNotice.segments.length
                && skippingSegments.every((segment) => skipNotice.segments.some((s) => s.UUID === segment.UUID))) {
@@ -1819,7 +1832,7 @@ function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, un
    const newSkipNotice = new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer, () => {
        upcomingNotice?.close();
        upcomingNotice = null;
-    }, unskipTime, startReskip, upcomingNoticeShown);
+    }, unskipTime, startReskip, upcomingNoticeShown, voteNotice);
    if (isOnMobileYouTube() || Config.config.skipKeybind == null) newSkipNotice.setShowKeybindHint(false);
    skipNotices.push(newSkipNotice);

@@ -1838,13 +1851,13 @@ function createUpcomingNotice(skippingSegments: SponsorTime[], timeLeft: number,
    upcomingNotice = new UpcomingNotice(skippingSegments, skipNoticeContentContainer, timeLeft / 1000, autoSkip);
 }

-function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null, forceSeek = false) {
+function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null, forceSeek = false, voteNotice = false) {
    if (segment.actionType === ActionType.Mute) {
        getVideo().muted = false;
        videoMuted = false;
    }

-    if (forceSeek || segment.actionType === ActionType.Skip) {
+    if (forceSeek || segment.actionType === ActionType.Skip || segment.actionType === ActionType.Chapter || voteNotice) {
        //add a tiny bit of time to make sure it is not skipped again
        setCurrentTime(unskipTime ?? segment.segment[0] + 0.001);
    }
@@ -1876,6 +1889,10 @@ function createButton(baseID: string, title: string, callback: () => void, image
    newButton.id = baseID + "Button";
    newButton.classList.add("playerButton");
    newButton.classList.add("ytp-button");
+    if (isOnYTTV()) {
+        // Some style needs to be set here, but the numbers don't matter 
+        newButton.setAttribute("style", "width: 40px; height: 40px");
+    }
    newButton.setAttribute("title", chrome.i18n.getMessage(title));
    newButton.addEventListener("click", () => {
        callback();
@@ -1905,19 +1922,30 @@ function createButton(baseID: string, title: string, callback: () => void, image
 }

 function shouldAutoSkip(segment: SponsorTime): boolean {
+    const canSkipNonMusic = !Config.config.skipNonMusicOnlyOnYoutubeMusic || isOnYouTubeMusic();
+    if (segment.category === "music_offtopic" && !canSkipNonMusic) {
+        return false;
+    }
+
    return (!Config.config.manualSkipOnFullVideo || !sponsorTimes?.some((s) => s.category === segment.category && s.actionType === ActionType.Full))
-        && (utils.getCategorySelection(segment.category)?.option === CategorySkipOption.AutoSkip ||
-            (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic")
+        && (getCategorySelection(segment)?.option === CategorySkipOption.AutoSkip ||
+            (Config.config.autoSkipOnMusicVideos && canSkipNonMusic && sponsorTimes?.some((s) => s.category === "music_offtopic")
                && segment.actionType === ActionType.Skip)
-            || sponsorTimesSubmitting.some((s) => s.segment === segment.segment));
+            || sponsorTimesSubmitting.some((s) => s.segment === segment.segment))
+        || isLoopedChapter(segment);
 }

 function shouldSkip(segment: SponsorTime): boolean {
    return (segment.actionType !== ActionType.Full
-            && segment.source !== SponsorSourceType.YouTube
-            && utils.getCategorySelection(segment.category)?.option !== CategorySkipOption.ShowOverlay)
+            && getCategorySelection(segment)?.option > CategorySkipOption.ShowOverlay)
            || (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic")
-                && segment.actionType === ActionType.Skip);
+                && segment.actionType === ActionType.Skip)
+            || isLoopedChapter(segment);
+}
+
+function isLoopedChapter(segment: SponsorTime): boolean{
+    return !!segment && !!loopedChapter && segment.segment[1] != undefined
+        && segment.segment[0] === loopedChapter.segment[0] && segment.segment[1] === loopedChapter.segment[1];
 }

 /** Creates any missing buttons on the YouTube player if possible. */
@@ -1950,7 +1978,7 @@ async function updateVisibilityOfPlayerControlsButton(): Promise<void> {
    updateEditButtonsOnPlayer();

    // Don't show the info button on embeds
-    if (Config.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || isOnInvidious()
+    if (Config.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || isOnInvidious() || isOnYTTV()
        || document.getElementById("sponsorBlockPopupContainer") != null) {
        playerButtons.info.button.style.display = "none";
    } else {
@@ -2017,7 +2045,12 @@ function getRealCurrentTime(): number {
 }

 function startOrEndTimingNewSegment() {
-    verifyCurrentTime();
+    if (isOnYTTV() && getIsLivePremiere()) {
+        alert(chrome.i18n.getMessage("yttvLiveContentWarning"));
+        return;
+    }
+
+    verifyCurrentTime(getRealCurrentTime());
    const roundedTime = Math.round((getRealCurrentTime() + Number.EPSILON) * 1000) / 1000;
    if (!isSegmentCreationInProgress()) {
        sponsorTimesSubmitting.push({
@@ -2295,7 +2328,8 @@ async function voteAsync(type: number, UUID: SegmentUUID, category?: Category):
            message: "submitVote",
            type: type,
            UUID: UUID,
-            category: category
+            category: category,
+            videoID: getVideoID()
        }, (response) => {
            if (response.successType === 1) {
                // Change the sponsor locally
@@ -2431,7 +2465,7 @@ async function sendSubmitMessage(): Promise<boolean> {
        userID: Config.config.userID,
        segments: sponsorTimesSubmitting,
        videoDuration: getVideoDuration(),
-        userAgent: `${chrome.runtime.id}/v${chrome.runtime.getManifest().version}`
+        userAgent: extensionUserAgent(),
    });

    if (response.status === 200) {
@@ -2511,6 +2545,8 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
 }

 function updateActiveSegment(currentTime: number): void {
+    if (!chrome.runtime?.id) return;
+
    previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, currentTime);

    chrome.runtime.sendMessage({
@@ -2558,24 +2594,31 @@ function previousChapter(): void {
    }
 }

-function addHotkeyListener(): void {
-    document.addEventListener("keydown", hotkeyListener);
+async function handleKeybindVote(type: number): Promise<void>{
+    let lastSkipNotice = skipNotices[0]?.skipNoticeRef.current;
+    lastSkipNotice?.onMouseEnter();

-    const onLoad = () => {
-        // Allow us to stop propagation to YouTube by being deeper
-        document.removeEventListener("keydown", hotkeyListener);
-        document.body.addEventListener("keydown", hotkeyListener);
+    if (!lastSkipNotice) {
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.source == SponsorSourceType.Server && (s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration));
+        if (!lastSegment) return;

-        addCleanupListener(() => {
-            document.body.removeEventListener("keydown", hotkeyListener);
-        });
-    };
-
-    if (document.readyState === "complete") {
-        onLoad();
-    } else {
-        document.addEventListener("DOMContentLoaded", onLoad);
+        createSkipNotice([lastSegment], shouldAutoSkip(lastSegment), lastSegment?.segment[0] + 0.001,false, true);
+        lastSkipNotice = await skipNotices[0].waitForSkipNoticeRef();
+        lastSkipNotice?.reskippedMode(0);
    }
+
+    vote(type,lastSkipNotice?.segments[0]?.UUID, undefined, lastSkipNotice);
+    return;
+}
+
+function addHotkeyListener(): void {
+    document.addEventListener("keydown", hotkeyListener, true);
+    document.addEventListener("keyup", hotkeyPropagationListener, true);
+
+    addCleanupListener(() => {
+        document.body.removeEventListener("keydown", hotkeyListener, true);
+        document.body.removeEventListener("keyup", hotkeyPropagationListener, true);
+    });
 }

 function hotkeyListener(e: KeyboardEvent): void {
@@ -2601,9 +2644,11 @@ function hotkeyListener(e: KeyboardEvent): void {
    const openSubmissionMenuKey = Config.config.submitKeybind;
    const nextChapterKey = Config.config.nextChapterKeybind;
    const previousChapterKey = Config.config.previousChapterKeybind;
+    const upvoteKey = Config.config.upvoteKeybind;
+    const downvoteKey = Config.config.downvoteKeybind;

    if (keybindEquals(key, skipKey)) {
-        if (activeSkipKeybindElement) {
+        if (activeSkipKeybindElement && !(activeSkipKeybindElement instanceof SkipButtonControlBar)) {
            activeSkipKeybindElement.toggleSkip.call(activeSkipKeybindElement);
        }

@@ -2644,6 +2689,38 @@ function hotkeyListener(e: KeyboardEvent): void {
        if (sponsorTimes.length > 0) e.stopPropagation();
        previousChapter();
        return;
+    } else if (keybindEquals(key, upvoteKey)) {
+        handleKeybindVote(1);
+        return;
+    } else if (keybindEquals(key, downvoteKey)) {
+        handleKeybindVote(0);
+        return;
+    }
+}
+
+function hotkeyPropagationListener(e: KeyboardEvent): void {
+    if ((["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
+        || (document.activeElement as HTMLElement)?.isContentEditable
+        || document.activeElement?.id?.toLowerCase()?.match(/editable|input/))
+            && document.hasFocus()) return;
+
+    const key: Keybind = {
+        key: e.key,
+        code: e.code,
+        alt: e.altKey,
+        ctrl: e.ctrlKey,
+        shift: e.shiftKey
+    };
+
+    const nextChapterKey = Config.config.nextChapterKeybind;
+    const previousChapterKey = Config.config.previousChapterKeybind;
+
+    if (keybindEquals(key, nextChapterKey)) {
+        if (sponsorTimes.length > 0) e.stopPropagation();
+        return;
+    } else if (keybindEquals(key, previousChapterKey)) {
+        if (sponsorTimes.length > 0) e.stopPropagation();
+        return;
    }
 }

@@ -2694,8 +2771,9 @@ function showTimeWithoutSkips(skippedDuration: number): void {
    // YouTube player time display
    const selector =
        isOnInvidious()     ? ".vjs-duration" :
-        isOnMobileYouTube() ? ".YtwPlayerTimeDisplayContent" :
-                              ".ytp-time-display.notranslate .ytp-time-wrapper";
+        isOnYTTV()          ? ".ypl-full-controls .ypmcs-control .time-info-bar" :
+        isOnMobileYouTube() ? ".ytwPlayerTimeDisplayContent" :
+                              ".ytp-time-display.notranslate .ytp-time-wrapper .ytp-time-contents";
    const display = document.querySelector(selector);
    if (!display) return;

--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -3,8 +3,6 @@ Based on code from
 https://github.com/videosegments/videosegments/commits/f1e111bdfe231947800c6efdd51f62a4e7fef4d4/segmentsbar/segmentsbar.js
 */

-'use strict';
-
 import Config from "../config";
 import { ChapterVote } from "../render/ChapterVote";
 import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceType, SponsorTime } from "../types";
@@ -15,6 +13,7 @@ import { findValidElement } from "../../maze-utils/src/dom";
 import { addCleanupListener } from "../../maze-utils/src/cleanup";
 import { hasAutogeneratedChapters, isVisible } from "../utils/pageUtils";
 import { isVorapisInstalled } from "../utils/compatibility";
+import { isOnYTTV } from "../../maze-utils/src/video";

 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -41,6 +40,12 @@ class PreviewBar {
    categoryTooltip?: HTMLDivElement;
    categoryTooltipContainer?: HTMLElement;
    chapterTooltip?: HTMLDivElement;
+
+    // ScrubTooltips for YTTV only
+    categoryScrubTooltip?: HTMLDivElement;
+    categoryScrubTooltipContainer?: HTMLElement;
+    chapterScrubTooltip?: HTMLDivElement;
+
    lastSmallestSegment: Record<string, {
        index: number;
        segment: PreviewBarSegment;
@@ -49,9 +54,11 @@ class PreviewBar {
    parent: HTMLElement;
    onMobileYouTube: boolean;
    onInvidious: boolean;
+    onYTTV: boolean;
    progressBar: HTMLElement;

    segments: PreviewBarSegment[] = [];
+    hasYouTubeChapters = false;
    existingChapters: PreviewBarSegment[] = [];
    videoDuration = 0;
    updateExistingChapters: () => void;
@@ -69,14 +76,19 @@ class PreviewBar {
    unfilteredChapterGroups: ChapterGroup[];
    chapterGroups: ChapterGroup[];

-    constructor(parent: HTMLElement, onMobileYouTube: boolean, onInvidious: boolean, chapterVote: ChapterVote, updateExistingChapters: () => void, test=false) {
+    constructor(parent: HTMLElement, onMobileYouTube: boolean, onInvidious: boolean, onYTTV: boolean, chapterVote: ChapterVote, updateExistingChapters: () => void, test=false) {
        if (test) return;
        this.container = document.createElement('ul');
        this.container.id = 'previewbar';

+        if (onYTTV) {
+            this.container.classList.add("sponsorblock-yttv-container");
+        }
+
        this.parent = parent;
        this.onMobileYouTube = onMobileYouTube;
        this.onInvidious = onInvidious;
+        this.onYTTV = onYTTV;
        this.chapterVote = chapterVote;
        this.updateExistingChapters = updateExistingChapters;

@@ -96,26 +108,49 @@ class PreviewBar {

        // Create label placeholder
        this.categoryTooltip = document.createElement("div");
-        this.categoryTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
+        if (isOnYTTV()) {
+            this.categoryTooltip.className = "sponsorCategoryTooltip";
+        } else {
+            this.categoryTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
+        }
        this.chapterTooltip = document.createElement("div");
-        this.chapterTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
+        if (isOnYTTV()) {
+            this.chapterTooltip.className = "sponsorCategoryTooltip";
+        } else {
+            this.chapterTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
+        }

-        // global chaper tooltip or duration tooltip
-        // YT, Vorapis, unknown
-        const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper, .ytp-progress-tooltip-text-container") ?? document.querySelector("#progress-bar-container.ytk-player > #hover-time-info");
-        const originalTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title:not(.sponsorCategoryTooltip), .ytp-progress-tooltip-text:not(.sponsorCategoryTooltip)") as HTMLElement;
+        if (isOnYTTV()) {
+            this.categoryScrubTooltip = document.createElement("div");
+            this.categoryScrubTooltip.className = "sponsorCategoryTooltip";
+            this.chapterScrubTooltip = document.createElement("div");
+            this.chapterScrubTooltip.className = "sponsorCategoryTooltip";
+        }
+
+        // global chapter tooltip or duration tooltip
+        // YT, Vorapis, unknown, YTTV
+        const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper, .ytp-progress-tooltip-text-container, .yssi-slider .ys-seek-details .time-info-bar") ?? document.querySelector("#progress-bar-container.ytk-player > #hover-time-info");
+        const originalTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title:not(.sponsorCategoryTooltip), .ytp-progress-tooltip-text:not(.sponsorCategoryTooltip), .current-time:not(.sponsorCategoryTooltip)") as HTMLElement;
        if (!tooltipTextWrapper || !tooltipTextWrapper.parentElement) return;

        // Grab the tooltip from the text wrapper as the tooltip doesn't have its classes on init
        this.categoryTooltipContainer = tooltipTextWrapper.parentElement;
-        // YT, Vorapis
-        const titleTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title, .ytp-progress-tooltip-text") as HTMLElement;
+        // YT, Vorapis, YTTV
+        const titleTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title, .ytp-progress-tooltip-text, .current-time") as HTMLElement;
        if (!this.categoryTooltipContainer || !titleTooltip) return;

        tooltipTextWrapper.insertBefore(this.categoryTooltip, titleTooltip.nextSibling);
        tooltipTextWrapper.insertBefore(this.chapterTooltip, titleTooltip.nextSibling);

-        const seekBar = document.querySelector(".ytp-progress-bar-container");
+        if (isOnYTTV()) {
+            const scrubTooltipTextWrapper = document.querySelector(".yssi-slider .ysl-filmstrip-lens .time-info-bar")
+            if (!this.categoryTooltipContainer) return;
+    
+            scrubTooltipTextWrapper.appendChild(this.categoryScrubTooltip);
+            scrubTooltipTextWrapper.appendChild(this.chapterScrubTooltip);
+        }
+
+        const seekBar = (document.querySelector(".ytp-progress-bar-container, .ypcs-scrub-slider-slot.ytu-player-controls"));
        if (!seekBar) return;

        let mouseOnSeekBar = false;
@@ -136,7 +171,7 @@ class PreviewBar {

            // Find the segment at that location, using the shortest if multiple found
            const [normalSegments, chapterSegments] =
-                partition(this.segments.filter((s) => s.source !== SponsorSourceType.YouTube),
+                partition(this.segments,
                    (segment) => segment.actionType !== ActionType.Chapter);
            let mainSegment = this.getSmallestSegment(timeInSeconds, normalSegments, "normal");
            let secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments, "chapter");
@@ -145,19 +180,47 @@ class PreviewBar {
                secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments.filter((s) => s !== secondarySegment));
            }

+            const hasAYouTubeChapterRemoved = this.hasYouTubeChapters
+                || (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters());
+            if (hasAYouTubeChapterRemoved) {
+                // Hide original tooltip if some chapter has been filtered out
+                originalTooltip.style.display = "none";
+                noYoutubeChapters = true;
+
+                originalTooltip.classList.add("sponsorTooltipHasYTChapters");
+            } else {
+                originalTooltip.classList.remove("sponsorTooltipHasYTChapters");
+            }
+
            if (mainSegment === null && secondarySegment === null) {
-                this.categoryTooltipContainer.classList.remove(TOOLTIP_VISIBLE_CLASS);
-                originalTooltip.style.removeProperty("display");
+                if (!hasAYouTubeChapterRemoved) {
+                    this.categoryTooltipContainer.classList.remove(TOOLTIP_VISIBLE_CLASS);
+                    originalTooltip.style.removeProperty("display");
+                }
+                if (this.onYTTV) {
+                    this.setTooltipTitle(mainSegment, this.categoryTooltip);
+                    this.setTooltipTitle(secondarySegment, this.chapterTooltip);
+                    this.setTooltipTitle(mainSegment, this.categoryScrubTooltip);
+                    this.setTooltipTitle(secondarySegment, this.chapterScrubTooltip);
+                }
+
+                this.categoryTooltipContainer.classList.remove("sponsorHasOriginalTooltip");
            } else {
                this.categoryTooltipContainer.classList.add(TOOLTIP_VISIBLE_CLASS);
-                if (mainSegment !== null && secondarySegment !== null) {
+                const hasTwoTooltips = mainSegment !== null && secondarySegment !== null;
+                if (hasTwoTooltips) {
                    this.categoryTooltipContainer.classList.add("sponsorTwoTooltips");
+                    originalTooltip.classList.remove("sponsorTooltipHasYTChapters");
                } else {
                    this.categoryTooltipContainer.classList.remove("sponsorTwoTooltips");
                }

                this.setTooltipTitle(mainSegment, this.categoryTooltip);
                this.setTooltipTitle(secondarySegment, this.chapterTooltip);
+                if (this.onYTTV) {
+                    this.setTooltipTitle(mainSegment, this.categoryScrubTooltip);
+                    this.setTooltipTitle(secondarySegment, this.chapterScrubTooltip);
+                }

                if (isVorapisInstalled()) {
                    const tooltipParent = tooltipTextWrapper.parentElement!;
@@ -165,23 +228,27 @@ class PreviewBar {
                }

                if (normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.categoryTooltip.textContent)
-                        || normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.chapterTooltip.textContent)) {
+                        || normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.chapterTooltip.textContent)
+                        || !originalTooltip.textContent) {
                    if (originalTooltip.style.display !== "none") originalTooltip.style.display = "none";
+                    this.categoryTooltipContainer.classList.remove("sponsorHasOriginalTooltip");
                    noYoutubeChapters = true;
                } else if (originalTooltip.style.display === "none") {
                    originalTooltip.style.removeProperty("display");
+                    this.categoryTooltipContainer.classList.add("sponsorHasOriginalTooltip");
+                    noYoutubeChapters = false;
                }

-                // Used to prevent overlapping
-                this.categoryTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
-                this.chapterTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
-
                // To prevent offset issue
                this.categoryTooltip.style.right = titleTooltip.style.right;
                this.chapterTooltip.style.right = titleTooltip.style.right;
                this.categoryTooltip.style.textAlign = titleTooltip.style.textAlign;
                this.chapterTooltip.style.textAlign = titleTooltip.style.textAlign;
            }
+
+            // Used to prevent overlapping
+            this.categoryTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
+            this.chapterTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
        });
    }

@@ -210,7 +277,12 @@ class PreviewBar {
        }

        // On the seek bar
-        this.parent.prepend(this.container);
+        if (this.onYTTV) {
+            // order of sibling elements matters on YTTV
+            this.parent.insertBefore(this.container, this.parent.firstChild.nextSibling.nextSibling);
+        } else {
+            this.parent.prepend(this.container);
+        }
    }

    clear(): void {
@@ -232,13 +304,14 @@ class PreviewBar {
    set(segments: PreviewBarSegment[], videoDuration: number): void {
        this.segments = segments ?? [];
        this.videoDuration = videoDuration ?? 0;
+        this.hasYouTubeChapters = segments.some((segment) => [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source));

        // Remove unnecessary original chapters if submitted replacements exist
        for (const chapter of this.segments.filter((s) => s.actionType === ActionType.Chapter && s.source === SponsorSourceType.Server)) {
            const segmentDuration = chapter.segment[1] - chapter.segment[0];
            
            const duplicate = this.segments.find((s) => s.actionType === ActionType.Chapter 
-                && s.source === SponsorSourceType.YouTube
+                && [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(s.source) 
                && Math.abs(s.segment[0] - chapter.segment[0]) < Math.min(3, segmentDuration / 3)
                && Math.abs(s.segment[1] - chapter.segment[1]) < Math.min(3, segmentDuration / 3));
            
@@ -286,7 +359,7 @@ class PreviewBar {
        this.chapterMargin = 2;
        if (this.originalChapterBar) {
            this.originalChapterBarBlocks = this.originalChapterBar.querySelectorAll(":scope > div") as NodeListOf<HTMLElement>
-            this.existingChapters = this.segments.filter((s) => s.source === SponsorSourceType.YouTube).sort((a, b) => a.segment[0] - b.segment[0]);
+            this.existingChapters = this.segments.filter((s) => [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(s.source)).sort((a, b) => a.segment[0] - b.segment[0]);

            if (this.existingChapters?.length > 0) {
                const margin = parseFloat(this.originalChapterBarBlocks?.[0]?.style?.marginRight?.replace("px", ""));
@@ -308,7 +381,7 @@ class PreviewBar {
        this.createChaptersBar(this.segments.sort((a, b) => a.segment[0] - b.segment[0]));

        if (chapterChevron) {
-            if (this.segments.some((segment) => segment.source === SponsorSourceType.YouTube)) {
+            if (this.segments.some((segment) => [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source))) {
                chapterChevron.style.removeProperty("display");
            } else if (this.segments) {
                chapterChevron.style.display = "none";
@@ -345,6 +418,10 @@ class PreviewBar {
            bar.style.marginRight = `${this.chapterMargin}px`;
        }

+        if (this.onYTTV) {
+            bar.classList.add("previewbar-yttv");
+        }
+
        return bar;
    }

@@ -366,10 +443,10 @@ class PreviewBar {
            this.unfilteredChapterGroups = this.createChapterRenderGroups(segments);
        }
        
-        if ((segments.every((segments) => segments.source === SponsorSourceType.YouTube)
+        if ((segments.every((segment) => [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source))
            || (!Config.config.renderSegmentsAsChapters
                && segments.every((segment) => segment.actionType !== ActionType.Chapter
-                    || segment.source === SponsorSourceType.YouTube)))
+                    || [SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source))))
            && !(hasAutogeneratedChapters() && !Config.config.showAutogeneratedChapters)) {

            if (this.customChaptersBar) this.customChaptersBar.style.display = "none";
@@ -851,8 +928,10 @@ class PreviewBar {
                })[0];

                const chapterButton = this.getChapterButton(chaptersContainer);
-                chapterButton.classList.remove("ytp-chapter-container-disabled");
-                chapterButton.disabled = false;
+                if (chapterButton) {
+                    chapterButton.classList.remove("ytp-chapter-container-disabled");
+                    chapterButton.disabled = false;
+                }

                const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;
                chapterTitle.style.display = "none";
@@ -861,6 +940,9 @@ class PreviewBar {
                    const elem = document.createElement("div");
                    chapterTitle.parentElement.insertBefore(elem, chapterTitle);
                    elem.classList.add("sponsorChapterText");
+                    if (document.location.host === "tv.youtube.com") {
+                        elem.style.lineHeight = "initial";
+                    }
                    return elem;
                })()) as HTMLDivElement;
                chapterCustomText.innerText = chosenSegment.description || shortCategoryName(chosenSegment.category);
@@ -873,7 +955,15 @@ class PreviewBar {

                if (chosenSegment.source === SponsorSourceType.Server) {
                    const chapterVoteContainer = this.chapterVote.getContainer();
-                    if (!chapterButton.contains(chapterVoteContainer)) {
+                    if (document.location.host === "tv.youtube.com") {
+                        if (!chaptersContainer.contains(chapterVoteContainer)) {
+                            const oldVoteContainers = document.querySelectorAll("#chapterVote");
+                            if (oldVoteContainers.length > 0) {
+                                oldVoteContainers.forEach((oldVoteContainer) => oldVoteContainer.remove());
+                            }
+                            chaptersContainer.appendChild(chapterVoteContainer);
+                        }
+                    } else if (!chapterButton.contains(chapterVoteContainer)) {
                        const oldVoteContainers = document.querySelectorAll("#chapterVote");
                        if (oldVoteContainers.length > 0) {
                            oldVoteContainers.forEach((oldVoteContainer) => oldVoteContainer.remove());
@@ -912,6 +1002,18 @@ class PreviewBar {
    }

    private getChaptersContainer(): HTMLElement {
+        if (document.location.host === "tv.youtube.com") {
+            if (!document.querySelector(".ytp-chapter-container")) {
+                const dest = document.querySelector(".ypcs-control-buttons-left");
+                if (!dest) return null;
+                const sbChapterContainer = document.createElement("div");
+                sbChapterContainer.className = "ytp-chapter-container";
+                const sbChapterTitleContent = document.createElement("div");
+                sbChapterTitleContent.className = "ytp-chapter-title-content";
+                sbChapterContainer.appendChild(sbChapterTitleContent);
+                dest.appendChild(sbChapterContainer);
+            }
+        }
        return document.querySelector(".ytp-chapter-container") as HTMLElement;
    }

--- a/src/js-components/skipButtonControlBar.ts
+++ b/src/js-components/skipButtonControlBar.ts
@@ -9,6 +9,7 @@ export interface SkipButtonControlBarProps {
    skip: (segment: SponsorTime) => void;
    selectSegment: (UUID: SegmentUUID) => void;
    onMobileYouTube: boolean;
+    onYTTV: boolean;
 }

 export class SkipButtonControlBar {
@@ -21,6 +22,7 @@ export class SkipButtonControlBar {

    showKeybindHint = true;
    onMobileYouTube: boolean;
+    onYTTV: boolean;

    enabled = false;

@@ -40,6 +42,7 @@ export class SkipButtonControlBar {
    constructor(props: SkipButtonControlBarProps) {
        this.skip = props.skip;
        this.onMobileYouTube = props.onMobileYouTube;
+        this.onYTTV = props.onYTTV;

        this.container = document.createElement("div");
        this.container.classList.add("skipButtonControlBarContainer");
@@ -50,6 +53,10 @@ export class SkipButtonControlBar {
        this.skipIcon.src = chrome.runtime.getURL("icons/skipIcon.svg");
        this.skipIcon.classList.add("ytp-button");
        this.skipIcon.id = "sbSkipIconControlBarImage";
+        if (this.onYTTV) {
+            this.skipIcon.style.width = "24px";
+            this.skipIcon.style.height = "24px";
+        }

        this.textContainer = document.createElement("div");

@@ -84,7 +91,7 @@ export class SkipButtonControlBar {
        this.chapterText = document.querySelector(".ytp-chapter-container");

        if (mountingContainer && !mountingContainer.contains(this.container)) {
-            if (this.onMobileYouTube) {
+            if (this.onMobileYouTube || this.onYTTV) {
                mountingContainer.appendChild(this.container);
            } else {
                mountingContainer.insertBefore(this.container, this.chapterText);
@@ -101,8 +108,10 @@ export class SkipButtonControlBar {
    }

    private getMountingContainer(): HTMLElement {
-        if (!this.onMobileYouTube) {
+        if (!this.onMobileYouTube && !this.onYTTV) {
            return document.querySelector(".ytp-left-controls");
+        } else if (this.onYTTV) {
+            return document.querySelector(".ypcs-control-buttons-left");
        } else {
            return document.getElementById("player-container-id");
        }
--- a/src/messageTypes.ts
+++ b/src/messageTypes.ts
@@ -2,7 +2,7 @@
 // Message and Response Types
 //

-import { SegmentUUID, SponsorHideType, SponsorTime } from "./types";
+import { SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "./types";

 interface BaseMessage {
    from?: string;
@@ -12,9 +12,7 @@ interface DefaultMessage {
    message:
        "update"
        | "sponsorStart"
-        | "getVideoID"
        | "getChannelID"
-        | "isChannelWhitelisted"
        | "submitTimes"
        | "refreshSegments"
        | "closePopup"
@@ -58,6 +56,11 @@ interface ImportSegmentsMessage {
    data: string;
 }

+interface LoopChapterMessage {
+    message: "loopChapter";
+    UUID: SegmentUUID;
+}
+
 interface KeyDownMessage {
    message: "keydown";
    key: string;
@@ -70,7 +73,7 @@ interface KeyDownMessage {
    metaKey: boolean;
 }

-export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage);
+export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage | LoopChapterMessage);

 export interface IsInfoFoundMessageResponse {
    found: boolean;
@@ -78,6 +81,9 @@ export interface IsInfoFoundMessageResponse {
    sponsorTimes: SponsorTime[];
    time: number;
    onMobileYouTube: boolean;
+    videoID: VideoID;
+    loopedChapter: SegmentUUID | null;
+    channelWhitelisted: boolean;
 }

 interface GetVideoIdResponse {
@@ -86,6 +92,7 @@ interface GetVideoIdResponse {

 export interface GetChannelIDResponse {
    channelID: string;
+    isYTTV: boolean;
 }

 export interface SponsorStartResponse {
@@ -96,6 +103,10 @@ export interface IsChannelWhitelistedResponse {
    value: boolean;
 }

+export interface LoopedChapterResponse {
+    UUID: SegmentUUID;
+}
+
 export type MessageResponse =
    IsInfoFoundMessageResponse
    | GetVideoIdResponse
@@ -106,7 +117,8 @@ export type MessageResponse =
    | VoteResponse
    | ImportSegmentsResponse
    | RefreshSegmentsResponse
-    | LogResponse;
+    | LogResponse
+    | LoopedChapterResponse;

 export interface VoteResponse {
    successType: number;
--- a/src/options.ts
+++ b/src/options.ts
@@ -18,6 +18,7 @@ import { getHash } from "../maze-utils/src/hash";
 import { isFirefoxOrSafari } from "../maze-utils/src";
 import { isDeArrowInstalled } from "./utils/crossExtension";
 import { asyncRequestToServer } from "./utils/requests";
+import AdvancedSkipOptions from "./render/AdvancedSkipOptions";
 const utils = new Utils();
 let embed = false;

@@ -114,8 +115,25 @@ async function init() {

        if (await shouldHideOption(optionsElements[i]) || (dependentOn && (isDependentOnReversed ? Config.config[dependentOnName] : !Config.config[dependentOnName]))) {
            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;
+            }
        }

        const option = optionsElements[i].getAttribute("data-sync");
@@ -333,6 +351,9 @@ async function init() {
            case "react-CategoryChooserComponent":
                categoryChoosers.push(new CategoryChooser(optionsElements[i]));
                break;
+            case "react-AdvancedSkipOptionsComponent":
+                new AdvancedSkipOptions(optionsElements[i]);
+                break;
            case "react-UnsubmittedVideosComponent":
                unsubmittedVideos.push(new UnsubmittedVideos(optionsElements[i]));
                break;
--- a/src/popup.ts
+++ b/src/popup.ts
--- a/src/popup/PopupComponent.tsx
+++ b/src/popup/PopupComponent.tsx
@@ -0,0 +1,453 @@
+import * as React from "react";
+import { YourWorkComponent } from "./YourWorkComponent";
+// import { ToggleOptionComponent } from "./ToggleOptionComponent";
+// import { FormattingOptionsComponent } from "./FormattingOptionsComponent";
+import { isSafari } from "../../maze-utils/src/config";
+import { showDonationLink } from "../utils/configUtils";
+import Config, { generateDebugDetails } from "../config";
+import { GetChannelIDResponse, IsInfoFoundMessageResponse, LogResponse, Message, MessageResponse, PopupMessage } from "../messageTypes";
+import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { SegmentListComponent } from "./SegmentListComponent";
+import { ActionType, SegmentUUID, SponsorSourceType, SponsorTime } from "../types";
+import { SegmentSubmissionComponent } from "./SegmentSubmissionComponent";
+import { copyToClipboardPopup } from "./popupUtils";
+
+export enum LoadingStatus {
+    Loading,
+    SegmentsFound,
+    NoSegmentsFound,
+    ConnectionError,
+    StillLoading,
+    NoVideo
+}
+
+export interface LoadingData {
+    status: LoadingStatus;
+    code?: number;
+}
+
+let loadRetryCount = 0;
+
+export const PopupComponent = () => {
+    const [status, setStatus] = React.useState<LoadingData>({
+        status: LoadingStatus.Loading
+    });
+    const [extensionEnabled, setExtensionEnabled] = React.useState(!Config.config!.disableSkipping);
+    const [channelWhitelisted, setChannelWhitelisted] = React.useState<boolean | null>(null);
+    const [showForceChannelCheckWarning, setShowForceChannelCheckWarning] = React.useState(false);
+    const [showNoticeButton, setShowNoticeButton] = React.useState(Config.config!.dontShowNotice);
+
+    const [currentTime, setCurrentTime] = React.useState<number>(0);
+    const [segments, setSegments] = React.useState<SponsorTime[]>([]);
+    const [loopedChapter, setLoopedChapter] = React.useState<SegmentUUID | null>(null);
+
+    const [videoID, setVideoID] = React.useState<string | null>(null);
+
+    React.useEffect(() => {
+        loadSegments({
+            updating: false,
+            setStatus,
+            setChannelWhitelisted,
+            setVideoID,
+            setCurrentTime,
+            setSegments,
+            setLoopedChapter
+        });
+
+        setupComPort({
+            setStatus,
+            setChannelWhitelisted,
+            setVideoID,
+            setCurrentTime,
+            setSegments,
+            setLoopedChapter
+        });
+
+        forwardClickEvents(sendMessage);
+    }, []);
+
+    return (
+        <div id="sponsorblockPopup">
+            {
+                window !== window.top &&
+                <button id="sbCloseButton" title="__MSG_closePopup__" className="sbCloseButton" onClick={() => {
+                    sendMessage({ message: "closePopup" });
+                }}>
+                    <img src="icons/close.png" width="15" height="15" alt="Close icon"/>
+                </button>
+            }
+
+            {
+                Config.config!.testingServer &&
+                <div id="sbBetaServerWarning"
+                        title={chrome.i18n.getMessage("openOptionsPage")}
+                        onClick={() => {
+                            chrome.runtime.sendMessage({ "message": "openConfig", "hash": "advanced" });
+                        }}>
+                    {chrome.i18n.getMessage("betaServerWarning")}
+                </div>
+            }
+
+            <header className={"sbPopupLogo " + (Config.config.cleanPopup ? "hidden" : "")}>
+                <img src="icons/IconSponsorBlocker256px.png" alt="SponsorBlock Logo" width="40" height="40" id="sponsorBlockPopupLogo"/>
+                <p className="u-mZ">
+                    SponsorBlock
+                </p>
+            </header>
+
+            <p id="videoFound" 
+                    className={"u-mZ grey-text " + (Config.config.cleanPopup ? "cleanPopupMargin" : "")}>
+                {getVideoStatusText(status)}
+            </p>
+
+            <button id="refreshSegmentsButton" title={chrome.i18n.getMessage("refreshSegments")} onClick={(e) => {
+                const stopAnimation = AnimationUtils.applyLoadingAnimation(e.currentTarget, 0.3);
+
+                loadSegments({
+                    updating: true,
+                    setStatus,
+                    setChannelWhitelisted,
+                    setVideoID,
+                    setCurrentTime,
+                    setSegments,
+                    setLoopedChapter
+                }).then(() => stopAnimation());
+            }}>
+                <img src="/icons/refresh.svg" alt="Refresh icon" id="refreshSegments" />
+            </button>
+
+            <SegmentListComponent
+                videoID={videoID}
+                currentTime={currentTime}
+                status={status.status}
+                segments={segments}
+                loopedChapter={loopedChapter}
+                sendMessage={sendMessage} />
+
+            {/* Toggle Box */}
+            <div className="sbControlsMenu">
+                {/* github: mbledkowski/toggle-switch */}
+                {channelWhitelisted !== null && (
+                    <label id="whitelistButton" htmlFor="whitelistToggle" className="toggleSwitchContainer sbControlsMenu-item" role="button" tabIndex={0}>
+                        <input type="checkbox" 
+                            style={{ "display": "none" }} 
+                            id="whitelistToggle" 
+                            checked={channelWhitelisted}
+                            onChange={async (e) => {
+                                const response = await sendMessage({ message: 'getChannelID' }) as GetChannelIDResponse;
+                                if (!response.channelID) {
+                                    if (response.isYTTV) {
+                                        alert(chrome.i18n.getMessage("yttvNoChannelWhitelist"));
+                                    } else {
+                                        alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
+                                    }
+
+                                    return;
+                                }
+
+                                const whitelistedChannels = Config.config.whitelistedChannels ?? [];
+                                if (e.target.checked) {
+                                    whitelistedChannels.splice(whitelistedChannels.indexOf(response.channelID), 1);
+                                } else {
+                                    whitelistedChannels.push(response.channelID);
+                                }
+                                Config.config.whitelistedChannels = whitelistedChannels;
+
+                                setChannelWhitelisted(!e.target.checked);
+                                if (!Config.config.forceChannelCheck) setShowForceChannelCheckWarning(true);
+
+                                // Send a message to the client
+                                sendMessage({
+                                    message: 'whitelistChange',
+                                    value: !e.target.checked
+                                });
+
+                            }}/>
+                        <svg viewBox="0 0 24 24" width="23" height="23" className={"SBWhitelistIcon sbControlsMenu-itemIcon " + (channelWhitelisted ? " rotated" : "")}>
+                            <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
+                        </svg>
+                        <span id="whitelistChannel" className={channelWhitelisted ? " hidden" : ""}>
+                            {chrome.i18n.getMessage("whitelistChannel")}
+                        </span>
+                        <span id="unwhitelistChannel" className={!channelWhitelisted ? " hidden" : ""}>
+                            {chrome.i18n.getMessage("removeFromWhitelist")}
+                        </span>
+                    </label>
+                )}
+                <label id="disableExtension" htmlFor="toggleSwitch" className="toggleSwitchContainer sbControlsMenu-item" role="button" tabIndex={0}>
+                    <span className="toggleSwitchContainer-switch">
+                        <input type="checkbox" 
+                            style={{ "display": "none" }} 
+                            id="toggleSwitch" 
+                            checked={extensionEnabled}
+                            onChange={(e) => {
+                                Config.config!.disableSkipping = !e.target.checked;
+                                setExtensionEnabled(e.target.checked)
+                            }}/>
+                        <span className="switchBg shadow"></span>
+                        <span className="switchBg white"></span>
+                        <span className="switchBg green"></span>
+                        <span className="switchDot"></span>
+                    </span>
+                    <span id="disableSkipping" className={extensionEnabled ? " hidden" : ""}>
+                        {chrome.i18n.getMessage("enableSkipping")}
+                    </span>
+                    <span id="enableSkipping" className={!extensionEnabled ? " hidden" : ""}>
+                        {chrome.i18n.getMessage("disableSkipping")}
+                    </span>
+                </label>
+                <button id="optionsButton" 
+                    className="sbControlsMenu-item" 
+                    title={chrome.i18n.getMessage("Options")}
+                    onClick={() => {
+                        chrome.runtime.sendMessage({ "message": "openConfig" });
+                    }}>
+                <img src="/icons/settings.svg" alt="Settings icon" width="23" height="23" className="sbControlsMenu-itemIcon" id="sbPopupIconSettings" />
+                    {chrome.i18n.getMessage("Options")}
+                </button>
+            </div>
+
+            {
+                showForceChannelCheckWarning &&
+                <a id="whitelistForceCheck" onClick={() => {
+                    chrome.runtime.sendMessage({ "message": "openConfig", "hash": "behavior" });
+                }}>
+                    {chrome.i18n.getMessage("forceChannelCheckPopup")}
+                </a>
+            }
+
+            {
+                !Config.config.cleanPopup &&
+                <SegmentSubmissionComponent
+                    videoID={videoID || ""}
+                    status={status.status}
+                    sendMessage={sendMessage} />
+            }
+            
+
+            {/* Your Work box */}
+            {
+                !Config.config.cleanPopup &&
+                <YourWorkComponent/>
+            }
+
+            {/* Footer */}
+            {
+                !Config.config.cleanPopup &&
+                <footer id="sbFooter">
+                    <a id="helpButton"
+                        onClick={() => {
+                            chrome.runtime.sendMessage({ "message": "openHelp" });
+                        }}>
+                            {chrome.i18n.getMessage("help")}
+                    </a>
+                    <a href="https://sponsor.ajay.app" target="_blank" rel="noreferrer">
+                        {chrome.i18n.getMessage("website")}
+                    </a>
+                    <a href="https://sponsor.ajay.app/stats" target="_blank" rel="noreferrer" className={isSafari() ? " hidden" : ""}>
+                        {chrome.i18n.getMessage("viewLeaderboard")}
+                    </a>
+                    <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noreferrer" className={!showDonationLink() ? " hidden" : ""} onClick={() => {
+                        Config.config!.donateClicked = Config.config!.donateClicked + 1;
+                    }}>
+                        {chrome.i18n.getMessage("Donate")}
+                    </a>
+                    <br />
+                    <a href="https://github.com/ajayyy/SponsorBlock" target="_blank" rel="noreferrer">
+                        GitHub
+                    </a>
+                    <a href="https://discord.gg/SponsorBlock" target="_blank" rel="noreferrer">
+                        Discord
+                    </a>
+                    <a href="https://matrix.to/#/#sponsor:ajay.app?via=ajay.app&via=matrix.org&via=mozilla.org" target="_blank" rel="noreferrer">
+                        Matrix
+                    </a>
+                    <a id="debugLogs"
+                            onClick={async () => {
+                                const logs = await sendMessage({ message: "getLogs" }) as LogResponse;
+
+                                copyToClipboardPopup(`${generateDebugDetails()}\n\nWarn:\n${logs.warn.join("\n")}\n\nDebug:\n${logs.debug.join("\n")}`, sendMessage);
+                            }}>
+                        {chrome.i18n.getMessage("copyDebugLogs")}
+                    </a>
+                </footer>
+            }
+
+            {
+                showNoticeButton &&
+                <button id="showNoticeAgain" onClick={() => {
+                    Config.config!.dontShowNotice = false;
+                    setShowNoticeButton(false);
+                }}>
+                    { chrome.i18n.getMessage("showNotice") }
+                </button>
+            }
+        </div>
+    );
+};
+
+function getVideoStatusText(status: LoadingData): string {
+    switch (status.status) {
+        case LoadingStatus.Loading:
+            return chrome.i18n.getMessage("Loading");
+        case LoadingStatus.SegmentsFound:
+            return chrome.i18n.getMessage("sponsorFound");
+        case LoadingStatus.NoSegmentsFound:
+            return chrome.i18n.getMessage("sponsor404");
+        case LoadingStatus.ConnectionError:
+            return chrome.i18n.getMessage("connectionError") + status.code;
+        case LoadingStatus.StillLoading:
+            return chrome.i18n.getMessage("segmentsStillLoading");
+        case LoadingStatus.NoVideo:
+            return chrome.i18n.getMessage("noVideoID");
+    }
+}
+
+interface SegmentsLoadedProps {
+    setStatus: (status: LoadingData) => void;
+    setChannelWhitelisted: (whitelisted: boolean | null) => void;
+    setVideoID: (videoID: string | null) => void;
+    setCurrentTime: (time: number) => void;
+    setSegments: (segments: SponsorTime[]) => void;
+    setLoopedChapter: (loopedChapter: SegmentUUID | null) => void;
+}
+
+interface LoadSegmentsProps extends SegmentsLoadedProps {
+    updating: boolean;
+}
+
+async function loadSegments(props: LoadSegmentsProps): Promise<void> {
+    const response = await sendMessage({ message: "isInfoFound", updating: props.updating }) as IsInfoFoundMessageResponse;
+
+    if (response && response.videoID) {
+        segmentsLoaded(response, props);
+    } else {
+        // Handle error if it exists
+        chrome.runtime.lastError;
+
+        props.setStatus({
+            status: LoadingStatus.NoVideo,
+        });
+
+        if (!props.updating) {
+            loadRetryCount++;
+            if (loadRetryCount < 6) {
+                setTimeout(() => loadSegments(props), 100 * loadRetryCount);
+            }
+        }
+    }
+}
+
+function segmentsLoaded(response: IsInfoFoundMessageResponse, props: SegmentsLoadedProps): void {
+    if (response.found) {
+        props.setStatus({
+            status: LoadingStatus.SegmentsFound
+        });
+    } else if (response.status === 404 || response.status === 200) {
+        props.setStatus({
+            status: LoadingStatus.NoSegmentsFound
+        });
+    } else if (response.status) {
+        props.setStatus({
+            status: LoadingStatus.ConnectionError,
+            code: response.status
+        });
+    } else {
+        props.setStatus({
+            status: LoadingStatus.StillLoading
+        });
+    }
+
+    
+    props.setVideoID(response.videoID);
+    props.setCurrentTime(response.time);
+    props.setChannelWhitelisted(response.channelWhitelisted);
+    props.setSegments((response.sponsorTimes || [])
+        .filter((segment) => segment.source === SponsorSourceType.Server)
+        .sort((a, b) => b.segment[1] - a.segment[1])
+        .sort((a, b) => a.segment[0] - b.segment[0])
+        .sort((a, b) => a.actionType === ActionType.Full ? -1 : b.actionType === ActionType.Full ? 1 : 0));
+    props.setLoopedChapter(response.loopedChapter);
+}
+
+function sendMessage(request: Message): Promise<MessageResponse> {
+    return new Promise((resolve) => {
+        if (chrome.tabs) {
+            chrome.tabs.query({
+                active: true,
+                currentWindow: true
+            }, (tabs) => chrome.tabs.sendMessage(tabs[0].id, request, resolve));
+        } else {
+            chrome.runtime.sendMessage({ message: "tabs", data: request }, resolve);
+        }
+    });
+}
+
+interface ComPortProps extends SegmentsLoadedProps {
+}
+
+function setupComPort(props: ComPortProps): void {
+    const port = chrome.runtime.connect({ name: "popup" });
+    port.onDisconnect.addListener(() => setupComPort(props));
+    port.onMessage.addListener((msg) => onMessage(props, msg));
+}
+
+function onMessage(props: ComPortProps, msg: PopupMessage) {
+    switch (msg.message) {
+        case "time":
+            props.setCurrentTime(msg.time);
+            break;
+        case "infoUpdated":
+            segmentsLoaded(msg, props);
+            break;
+        case "videoChanged":
+            props.setStatus({
+                status: LoadingStatus.StillLoading
+            });
+            props.setVideoID(msg.videoID);
+            props.setChannelWhitelisted(msg.whitelisted);
+            props.setSegments([]);
+            break;
+    }
+}
+
+function forwardClickEvents(sendMessage: (request: Message) => Promise<MessageResponse>): void {
+    if (window !== window.top) {
+        document.addEventListener("keydown", (e) => {
+            const target = e.target as HTMLElement;
+            if (target.tagName === "INPUT"
+                || target.tagName === "TEXTAREA"
+                || e.key === "ArrowUp"
+                || e.key === "ArrowDown") {
+                return;
+            }
+
+            if (e.key === " ") {
+                // No scrolling
+                e.preventDefault();
+            }
+
+            sendMessage({
+                message: "keydown",
+                key: e.key,
+                keyCode: e.keyCode,
+                code: e.code,
+                which: e.which,
+                shiftKey: e.shiftKey,
+                ctrlKey: e.ctrlKey,
+                altKey: e.altKey,
+                metaKey: e.metaKey
+            });
+        });
+    }
+}
+
+// Copy over styles from parent window
+window.addEventListener("message", async (e): Promise<void> => {
+    if (e.source !== window.parent) return;
+    if (e.origin.endsWith(".youtube.com") && e.data && e.data?.type === "style") {
+        const style = document.createElement("style");
+        style.textContent = e.data.css;
+        document.head.appendChild(style);
+    }
+});
--- a/src/popup/SegmentListComponent.tsx
+++ b/src/popup/SegmentListComponent.tsx
@@ -0,0 +1,436 @@
+import * as React from "react";
+import { ActionType, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "../types";
+import Config from "../config";
+import { waitFor } from "../../maze-utils/src";
+import { shortCategoryName } from "../utils/categoryUtils";
+import { getErrorMessage, getFormattedTime } from "../../maze-utils/src/formating";
+import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { asyncRequestToServer } from "../utils/requests";
+import { Message, MessageResponse, VoteResponse } from "../messageTypes";
+import { LoadingStatus } from "./PopupComponent";
+import GenericNotice from "../render/GenericNotice";
+import { exportTimes } from "../utils/exporter";
+import { copyToClipboardPopup } from "./popupUtils";
+
+interface SegmentListComponentProps {
+    videoID: VideoID;
+    currentTime: number;
+    status: LoadingStatus;
+    segments: SponsorTime[];
+    loopedChapter: SegmentUUID | null;
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}
+
+enum SegmentListTab {
+    Segments,
+    Chapter
+}
+
+export const SegmentListComponent = (props: SegmentListComponentProps) => {
+    const [tab, setTab] = React.useState(SegmentListTab.Segments);
+    const [isVip, setIsVip] = React.useState(Config.config?.isVip ?? false);
+
+    React.useEffect(() => {
+        if (!Config.isReady()) {
+            waitFor(() => Config.isReady()).then(() => {
+                setIsVip(Config.config.isVip);
+            });
+        } else {
+            setIsVip(Config.config.isVip);
+        }
+    }, []);
+
+    React.useEffect(() => {
+        setTab(SegmentListTab.Segments);
+    }, [props.videoID]);
+
+    const tabFilter = (segment: SponsorTime) => {
+        if (tab === SegmentListTab.Chapter) {
+            return segment.actionType === ActionType.Chapter;
+        } else {
+            return segment.actionType !== ActionType.Chapter;
+        }
+    };
+
+    return (
+        <div id="issueReporterContainer">
+            <div id="issueReporterTabs" className={props.segments && props.segments.find(s => s.actionType === ActionType.Chapter) ? "" : "hidden"}>
+                <span id="issueReporterTabSegments" className={tab === SegmentListTab.Segments ? "sbSelected" : ""} onClick={() => {
+                    setTab(SegmentListTab.Segments);
+                }}>
+                    <span>{chrome.i18n.getMessage("SegmentsCap")}</span>
+                </span>
+                <span id="issueReporterTabChapters" className={tab === SegmentListTab.Chapter ? "sbSelected" : ""} onClick={() => {
+                    setTab(SegmentListTab.Chapter);
+                }}>
+                    <span>{chrome.i18n.getMessage("Chapters")}</span>
+                </span>
+            </div>
+            <div id="issueReporterTimeButtons"
+                    onMouseLeave={() => selectSegment({
+                        segment: null,
+                        sendMessage: props.sendMessage
+                    })}>
+                {
+                    props.segments.map((segment) => (
+                        <SegmentListItem
+                            key={segment.UUID}
+                            videoID={props.videoID}
+                            segment={segment}
+                            currentTime={props.currentTime}
+                            isVip={isVip}
+                            startingLooped={props.loopedChapter === segment.UUID}
+
+                            tabFilter={tabFilter}
+                            sendMessage={props.sendMessage}
+                        />
+                    ))
+                }
+            </div>
+            
+            <ImportSegments
+                status={props.status}
+                segments={props.segments}
+                sendMessage={props.sendMessage}
+            />
+        </div>
+    );
+};
+
+function SegmentListItem({ segment, videoID, currentTime, isVip, startingLooped, tabFilter, sendMessage }: {
+    segment: SponsorTime;
+    videoID: VideoID;
+    currentTime: number;
+    isVip: boolean;
+    startingLooped: boolean;
+    
+    tabFilter: (segment: SponsorTime) => boolean;
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}) {
+    const [voteMessage, setVoteMessage] = React.useState<string | null>(null);
+    const [hidden, setHidden] = React.useState(segment.hidden || SponsorHideType.Visible);
+    const [isLooped, setIsLooped] = React.useState(startingLooped);
+
+    let extraInfo = "";
+    if (segment.hidden === SponsorHideType.Downvoted) {
+        // This one is downvoted
+        extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDownvote") + ")";
+    } else if (segment.hidden === SponsorHideType.MinimumDuration) {
+        // This one is too short
+        extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
+    } else if (segment.hidden === SponsorHideType.Hidden) {
+        extraInfo = " (" + chrome.i18n.getMessage("manuallyHidden") + ")";
+    }
+
+    return (
+        <details data-uuid={segment.UUID}
+                onDoubleClick={() => skipSegment({
+                    segment,
+                    sendMessage
+                })}
+                onMouseEnter={() => {
+                    selectSegment({
+                        segment,
+                        sendMessage
+                    });
+                }}
+                className={"votingButtons " + (!tabFilter(segment) ? "hidden" : "")}>
+            <summary className={"segmentSummary " + (
+                currentTime >= segment.segment[0] ? (
+                    currentTime < segment.segment[1] ? "segmentActive" : "segmentPassed"
+                ) : ""
+            )}>
+                <div>
+                    {
+                        segment.actionType !== ActionType.Chapter &&
+                        <span className="sponsorTimesCategoryColorCircle dot" style={{ backgroundColor: Config.config.barTypes[segment.category]?.color }}></span>
+                    }
+                    <span className="summaryLabel">{(segment.description || shortCategoryName(segment.category)) + extraInfo}</span>
+                </div>
+
+                <div style={{ margin: "5px" }}>
+                    {
+                        segment.actionType === ActionType.Full ? chrome.i18n.getMessage("full") :
+                        (getFormattedTime(segment.segment[0], true) +
+                            (segment.actionType !== ActionType.Poi
+                                ? " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(segment.segment[1], true)
+                                : ""))
+                    }
+                </div>
+            </summary>
+
+            <div className={"sbVoteButtonsContainer " + (voteMessage ? "hidden" : "")}>
+                <img
+                    className="voteButton"
+                    title="Upvote"
+                    src={chrome.runtime.getURL("icons/thumbs_up.svg")}
+                    onClick={() => {
+                        vote({
+                            type: 1,
+                            UUID: segment.UUID,
+                            setVoteMessage: setVoteMessage,
+                            sendMessage
+                        });
+                    }}/>
+                <img
+                    className="voteButton"
+                    title="Downvote"
+                    src={segment.locked && isVip ? chrome.runtime.getURL("icons/thumbs_down_locked.svg") : chrome.runtime.getURL("icons/thumbs_down.svg")}
+                    onClick={() => {
+                        vote({
+                            type: 0,
+                            UUID: segment.UUID,
+                            setVoteMessage: setVoteMessage,
+                            sendMessage
+                        });
+                    }}/>
+                <img
+                    className="voteButton"
+                    title="Copy Segment ID"
+                    src={chrome.runtime.getURL("icons/clipboard.svg")}
+                    onClick={async (e) => {
+                        const stopAnimation = AnimationUtils.applyLoadingAnimation(e.currentTarget, 0.3);
+
+                        if (segment.UUID.length > 60) {
+                            copyToClipboardPopup(segment.UUID, sendMessage);
+                        } else {
+                            const segmentIDData = await asyncRequestToServer("GET", "/api/segmentID", {
+                                UUID: segment.UUID,
+                                videoID: videoID
+                            });
+                
+                            if (segmentIDData.ok && segmentIDData.responseText) {
+                                copyToClipboardPopup(segmentIDData.responseText, sendMessage);
+                            }
+                        }
+
+                        stopAnimation();
+                    }}/>
+                {
+                    segment.actionType === ActionType.Chapter &&
+                    <img
+                        className="voteButton"
+                        title={isLooped ? chrome.i18n.getMessage("unloopChapter") : chrome.i18n.getMessage("loopChapter")}
+                        src={isLooped ? chrome.runtime.getURL("icons/looped.svg") : chrome.runtime.getURL("icons/loop.svg")}
+                        onClick={(e) => {
+                            if (isLooped) {
+                                loopChapter({
+                                    segment: null,
+                                    element: e.currentTarget,
+                                    sendMessage
+                                });
+                            } else {
+                                loopChapter({
+                                    segment,
+                                    element: e.currentTarget,
+                                    sendMessage
+                                });
+                            }
+
+                            setIsLooped(!isLooped);
+                        }}/>
+                }
+                {
+                    (segment.actionType === ActionType.Skip || segment.actionType === ActionType.Mute
+                        || segment.actionType === ActionType.Poi
+                        && [SponsorHideType.Visible, SponsorHideType.Hidden].includes(segment.hidden)) &&
+                    <img
+                        className="voteButton"
+                        title="Hide Segment"
+                        src={hidden === SponsorHideType.Hidden ? chrome.runtime.getURL("icons/not_visible.svg") : chrome.runtime.getURL("icons/visible.svg")}
+                        onClick={(e) => {
+                            const stopAnimation = AnimationUtils.applyLoadingAnimation(e.currentTarget, 0.4);
+                            stopAnimation();
+
+                            if (segment.hidden === SponsorHideType.Hidden) {
+                                segment.hidden = SponsorHideType.Visible;
+                                setHidden(SponsorHideType.Visible);
+                            } else {
+                                segment.hidden = SponsorHideType.Hidden;
+                                setHidden(SponsorHideType.Hidden);
+                            }
+
+                            sendMessage({
+                                message: "hideSegment",
+                                type: segment.hidden,
+                                UUID: segment.UUID
+                            });
+                        }}/>
+                }
+                {
+                    segment.actionType !== ActionType.Full &&
+                    <img
+                        className="voteButton"
+                        title={segment.actionType === ActionType.Chapter ? chrome.i18n.getMessage("playChapter") : chrome.i18n.getMessage("skipSegment")}
+                        src={chrome.runtime.getURL("icons/skip.svg")}
+                        onClick={(e) => {
+                            skipSegment({
+                                segment,
+                                element: e.currentTarget,
+                                sendMessage
+                            });
+                        }}/>
+                }
+            </div>
+
+            <div className={"sponsorTimesVoteStatusContainer " + (voteMessage ? "" : "hidden")}>
+                <div className="sponsorTimesThanksForVotingText">
+                    {voteMessage}
+                </div>
+            </div>
+        </details>
+    );
+}
+
+async function vote(props: {
+    type: number;
+    UUID: SegmentUUID;
+    setVoteMessage: (message: string | null) => void;
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}): Promise<void> {
+    props.setVoteMessage(chrome.i18n.getMessage("Loading"));
+
+    const response = await props.sendMessage({
+        message: "submitVote",
+        type: props.type,
+        UUID: props.UUID
+    }) as VoteResponse;
+
+    if (response != undefined) {
+        // See if it was a success or failure
+        if (response.successType == 1 || (response.successType == -1 && response.statusCode == 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));
+        }
+        setTimeout(() => props.setVoteMessage(null), 1500);
+    }
+}
+
+function skipSegment({ segment, element, sendMessage }: {
+    segment: SponsorTime;
+    element?: HTMLElement;
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}): void {
+    if (segment.actionType === ActionType.Chapter) {
+        sendMessage({
+            message: "unskip",
+            UUID: segment.UUID
+        });
+    } else {
+        sendMessage({
+            message: "reskip",
+            UUID: segment.UUID
+        });
+    }
+
+    if (element) {
+        const stopAnimation = AnimationUtils.applyLoadingAnimation(element, 0.3);
+        stopAnimation();
+    }
+}
+
+function selectSegment({ segment, sendMessage }: {
+    segment: SponsorTime | null;
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}): void {
+    sendMessage({
+        message: "selectSegment",
+        UUID: segment?.UUID
+    });
+}
+
+function loopChapter({ segment, element, sendMessage }: {
+    segment: SponsorTime;
+    element: HTMLElement;
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}): void {
+    sendMessage({
+        message: "loopChapter",
+        UUID: segment?.UUID
+    });
+
+    if (element) {
+        const stopAnimation = AnimationUtils.applyLoadingAnimation(element, 0.3);
+        stopAnimation();
+    }
+}
+
+interface ImportSegmentsProps {
+    status: LoadingStatus;
+    segments: SponsorTime[];
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}
+
+function ImportSegments(props: ImportSegmentsProps) {
+    const [importMenuVisible, setImportMenuVisible] = React.useState(false);
+    const textArea = React.useRef<HTMLTextAreaElement>(null);
+
+    return (
+        <div id="issueReporterImportExport" className={props.status === LoadingStatus.Loading ? "hidden" : ""}>
+            <div id="importExportButtons">
+            <button id="importSegmentsButton"
+                    className={props.status === LoadingStatus.SegmentsFound || props.status === LoadingStatus.NoSegmentsFound ? "" : "hidden"}
+                    title={chrome.i18n.getMessage("importSegments")}
+                    onClick={() => {
+                        setImportMenuVisible(!importMenuVisible);
+                    }}>
+                <img src="/icons/import.svg" alt="Import icon" id="importSegments" />
+            </button>
+            <button id="exportSegmentsButton"
+                    className={props.segments.length === 0 ? "hidden" : ""}
+                    title={chrome.i18n.getMessage("exportSegments")}
+                    onClick={(e) => {
+                        copyToClipboardPopup(exportTimes(props.segments), props.sendMessage);
+
+                        const stopAnimation = AnimationUtils.applyLoadingAnimation(e.currentTarget, 0.3);
+                        stopAnimation();
+                        new GenericNotice(null, "exportCopied", {
+                            title:  chrome.i18n.getMessage(`CopiedExclamation`),
+                            timed: true,
+                            maxCountdownTime: () => 0.6,
+                            referenceNode: e.currentTarget.parentElement,
+                            dontPauseCountdown: true,
+                            style: {
+                                top: 0,
+                                bottom: 0,
+                                minWidth: 0,
+                                right: "30px",
+                                margin: "auto",
+                                height: "max-content"
+                            },
+                            hideLogo: true,
+                            hideRightInfo: true
+                        });
+                    }}>
+                <img src="/icons/export.svg" alt="Export icon" id="exportSegments" />
+            </button>
+            </div>
+
+            <span id="importSegmentsMenu" className={importMenuVisible ? "" : "hidden"}>
+                <textarea id="importSegmentsText" rows={5} style={{ width: "80%" }} ref={textArea}></textarea>
+
+                <button id="importSegmentsSubmit"
+                        title={chrome.i18n.getMessage("importSegments")}
+                        onClick={() => {
+                            const text = textArea.current.value;
+
+                            props.sendMessage({
+                                message: "importSegments",
+                                data: text
+                            });
+
+                            setImportMenuVisible(false);
+                        }}>
+                    {chrome.i18n.getMessage("Import")}
+                </button>
+            </span>
+        </div>
+    )
+}
--- a/src/popup/SegmentSubmissionComponent.tsx
+++ b/src/popup/SegmentSubmissionComponent.tsx
@@ -0,0 +1,66 @@
+import * as React from "react";
+import { VideoID } from "../types";
+import Config from "../config";
+import { Message, MessageResponse } from "../messageTypes";
+import { LoadingStatus } from "./PopupComponent";
+
+interface SegmentSubmissionComponentProps {
+    videoID: VideoID;
+    status: LoadingStatus;
+
+    sendMessage: (request: Message) => Promise<MessageResponse>;
+}
+
+export const SegmentSubmissionComponent = (props: SegmentSubmissionComponentProps) => {
+    const segments = Config.local.unsubmittedSegments[props.videoID];
+
+    const [showSubmitButton, setShowSubmitButton] = React.useState(segments && segments.length > 0);
+    const [showStartSegment, setShowStartSegment] = React.useState(!segments || segments[segments.length - 1].segment.length === 2);
+
+    return (
+        <div id="mainControls" className={props.status === LoadingStatus.Loading ? "hidden" : ""}>
+            <h1 className="sbHeader">
+                {chrome.i18n.getMessage("recordTimesDescription")}
+            </h1>
+            <sub className="sponsorStartHint grey-text">
+                {chrome.i18n.getMessage("popupHint")}
+            </sub>
+            <div style={{ textAlign: "center", margin: "8px 0" }}>
+                <button id="sponsorStart" 
+                        className="sbMediumButton"
+                        style={{ marginRight: "8px" }}
+                        onClick={() => {
+                            props.sendMessage({
+                                from: "popup",
+                                message: "sponsorStart"
+                            });
+
+                            setShowStartSegment(!showStartSegment);
+                            setShowSubmitButton(true);
+
+                            // Once data is saved, make sure it is correct
+                            setTimeout(() => {
+                                const segments = Config.local.unsubmittedSegments[props.videoID];
+                                setShowStartSegment(!segments || segments[segments.length - 1].segment.length === 2);
+
+                                setShowSubmitButton(segments && segments.length > 0);
+                            }, 200);
+                        }}>
+                    {showStartSegment ? chrome.i18n.getMessage("sponsorStart") : chrome.i18n.getMessage("sponsorEnd")}
+                </button>
+                <button id="submitTimes" 
+                        className={"sbMediumButton " + (showSubmitButton ? "" : "hidden")}
+                        onClick={() => {
+                            props.sendMessage({
+                                message: "submitTimes"
+                            });
+                        }}>
+                    {chrome.i18n.getMessage("OpenSubmissionMenu")}
+                </button>
+            </div>
+            <span id="submissionHint" className={showSubmitButton ? "" : "hidden"}>
+                {chrome.i18n.getMessage("submissionEditHint")}
+            </span>
+        </div>
+    );
+};
--- a/src/popup/YourWorkComponent.tsx
+++ b/src/popup/YourWorkComponent.tsx
@@ -0,0 +1,207 @@
+import * as React from "react";
+import { getHash } from "../../maze-utils/src/hash";
+import { getErrorMessage } from "../../maze-utils/src/formating";
+import Config from "../config";
+import { asyncRequestToServer } from "../utils/requests";
+import PencilIcon from "../svg-icons/pencilIcon";
+import ClipboardIcon from "../svg-icons/clipboardIcon";
+import CheckIcon from "../svg-icons/checkIcon";
+
+export const YourWorkComponent = () => {
+    const [isSettingUsername, setIsSettingUsername] = React.useState(false);
+    const [username, setUsername] = React.useState("");
+    const [newUsername, setNewUsername] = React.useState("");
+    const [usernameSubmissionStatus, setUsernameSubmissionStatus] = React.useState("");
+    const [submissionCount, setSubmissionCount] = React.useState("");
+    const [viewCount, setViewCount] = React.useState(0);
+    const [minutesSaved, setMinutesSaved] = React.useState(0);
+    const [showDonateMessage, setShowDonateMessage] = React.useState(false);
+
+    React.useEffect(() => {
+        (async () => {
+            const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions", "segmentCount"];
+            const result = await asyncRequestToServer("GET", "/api/userInfo", {
+                publicUserID: await getHash(Config.config!.userID!),
+                values
+            });
+
+            if (result.ok) {
+                const userInfo = JSON.parse(result.responseText);
+                setUsername(userInfo.userName);
+                setSubmissionCount(Math.max(Config.config.sponsorTimesContributed ?? 0, userInfo.segmentCount).toLocaleString());
+                setViewCount(userInfo.viewCount);
+                setMinutesSaved(userInfo.minutesSaved);
+
+                Config.config!.isVip = userInfo.vip;
+                Config.config!.permissions = userInfo.permissions;
+
+                setShowDonateMessage(Config.config.showDonationLink && Config.config.donateClicked <= 0 && Config.config.showPopupDonationCount < 5
+                    && viewCount < 50000 && !Config.config.isVip && Config.config.skipCount > 10);
+            }
+        })();
+    }, []);
+
+    return (
+        <div className="sbYourWorkBox">
+            <h2 className="sbHeader" style={{ "padding": "8px 15px" }}>
+                {chrome.i18n.getMessage("yourWork")}
+            </h2>
+            <div className="sbYourWorkCols">
+                {/* Username */}
+                <div id="usernameElement">
+                    <p className="u-mZ grey-text">
+                        {chrome.i18n.getMessage("Username")}:
+                        {/* loading/errors */}
+                        <span id="setUsernameStatus" 
+                            className={`u-mZ white-text${!usernameSubmissionStatus ? " hidden" : ""}`}>
+                            {usernameSubmissionStatus}
+                        </span>
+                    </p>
+                    <div id="setUsernameContainer" className={isSettingUsername ? " hidden" : ""}>
+                        <p id="usernameValue">{username}</p>
+                        <button id="setUsernameButton" 
+                            title={chrome.i18n.getMessage("setUsername")}
+                            onClick={() => {
+                                setNewUsername(username);
+                                setIsSettingUsername(!isSettingUsername);
+                            }}>
+                            <PencilIcon id="sbPopupIconEdit" className="sbPopupButton" />
+                        </button>
+                        <button id="copyUserID" 
+                            title={chrome.i18n.getMessage("copyPublicID")}
+                            onClick={async () => {
+                                window.navigator.clipboard.writeText(await getHash(Config.config!.userID!));
+                            }}>
+                            <ClipboardIcon id="sbPopupIconCopyUserID" className="sbPopupButton" />
+                        </button>
+                    </div>
+                    <div id="setUsername" className={!isSettingUsername ? " hidden" : " SBExpanded"}>
+                        <input id="usernameInput" 
+                            placeholder={chrome.i18n.getMessage("Username")}
+                            value={newUsername}
+                            onChange={(e) => {
+                                setNewUsername(e.target.value);
+                            }}/>
+                        <button id="submitUsername"
+                            onClick={() => {
+                                if (newUsername.length > 0) {
+                                    setUsernameSubmissionStatus(chrome.i18n.getMessage("Loading"));
+                                    asyncRequestToServer("POST", `/api/setUsername?userID=${Config.config!.userID}&username=${newUsername}`)
+                                    .then((result) => {
+                                        if (result.ok) {
+                                            setUsernameSubmissionStatus("");
+                                            setUsername(newUsername);
+                                            setIsSettingUsername(!isSettingUsername);
+                                        } else {
+                                            setUsernameSubmissionStatus(getErrorMessage(result.status, result.responseText));
+                                        }
+                                    }).catch((e) => {
+                                        setUsernameSubmissionStatus(`${chrome.i18n.getMessage("Error")}: ${e}`);
+                                    });
+                                }
+                            }}>
+                            <CheckIcon id="sbPopupIconCheck" className="sbPopupButton" />
+                        </button>
+                    </div>
+                </div>
+                <SubmissionCounts
+                    isSettingUsername={isSettingUsername}
+                    submissionCount={submissionCount}
+                />
+            </div>
+
+            <TimeSavedMessage
+                viewCount={viewCount}
+                minutesSaved={minutesSaved}
+            />
+
+            {showDonateMessage && <DonateMessage onClose={() => {
+                setShowDonateMessage(false);
+                Config.config.showPopupDonationCount = 100;
+            }} />}
+
+        </div>
+    );
+};
+
+function SubmissionCounts(props: { isSettingUsername: boolean; submissionCount: string }): JSX.Element {
+    return <>
+        <div id="sponsorTimesContributionsContainer" className={props.isSettingUsername ? " hidden" : ""}>
+            <p className="u-mZ grey-text">
+                {chrome.i18n.getMessage("Submissions")}:
+            </p>
+            <p id="sponsorTimesContributionsDisplay" className="u-mZ">{props.submissionCount}</p>
+        </div>
+    </>
+}
+
+function TimeSavedMessage({ viewCount, minutesSaved }: { viewCount: number; minutesSaved: number }): JSX.Element {
+    return (
+        <>
+            {
+                viewCount > 0 &&
+                <p id="sponsorTimesViewsContainer" className="u-mZ sbStatsSentence">
+                    {chrome.i18n.getMessage("savedPeopleFrom")}
+                    <b>
+                        <span id="sponsorTimesViewsDisplay">{viewCount.toLocaleString()}</span>{" "}
+                    </b>
+                    <span id="sponsorTimesViewsDisplayEndWord">{viewCount !== 1 ? chrome.i18n.getMessage("Segments") : chrome.i18n.getMessage("Segment")}</span>
+                    <br />
+                    <span className="sbExtraInfo">
+                        {"("}{" "}
+                        <b>
+                            <span id="sponsorTimesOthersTimeSavedDisplay">{getFormattedHours(minutesSaved)}</span>{" "}
+                            <span id="sponsorTimesOthersTimeSavedEndWord">{minutesSaved !== 1 ? chrome.i18n.getMessage("minsLower") : chrome.i18n.getMessage("minLower")}</span>{" "}
+                        </b>
+                        <span>{chrome.i18n.getMessage("youHaveSavedTimeEnd")}</span>{" "}
+                        {" )"}
+                    </span>
+                </p>
+            }
+            <p id="sponsorTimesSkipsDoneContainer" className="u-mZ sbStatsSentence">
+                {chrome.i18n.getMessage("youHaveSkipped")}
+                <b>
+                    <span id="sponsorTimesSkipsDoneDisplay">{Config.config.skipCount}</span>{" "}
+                </b>
+                <span id="sponsorTimesSkipsDoneEndWord">{Config.config.skipCount > 1 ? chrome.i18n.getMessage("Segments") : chrome.i18n.getMessage("Segment")}</span>{" "}
+                <span className="sbExtraInfo">
+                    {"("}{" "}
+                    <b>
+                        <span id="sponsorTimeSavedDisplay">{Config.config.minutesSaved}</span>{" "}
+                        <span id="sponsorTimeSavedEndWord">{Config.config.minutesSaved !== 1 ? chrome.i18n.getMessage("minsLower") : chrome.i18n.getMessage("minLower")}</span>{" "}
+                    </b>
+                    {")"}
+                </span>
+            </p>
+        </>
+    );
+}
+
+function DonateMessage(props: { onClose: () => void }): JSX.Element {
+    return (
+        <div id="sponsorTimesDonateContainer" style={{ alignItems: "center", justifyContent: "center" }}>
+            <img className="sbHeart" src="/icons/heart.svg" alt="Heart icon" />
+            <a id="sbConsiderDonateLink" href="https://sponsor.ajay.app/donate" target="_blank" rel="noreferrer" onClick={() => {
+                Config.config.donateClicked = Config.config.donateClicked + 1;
+            }}>
+                {chrome.i18n.getMessage("considerDonating")}
+            </a>
+            <img id="sbCloseDonate" src="/icons/close.png" alt={chrome.i18n.getMessage("closeIcon")} height="8" style={{ paddingLeft: "5px", cursor: "pointer" }} onClick={props.onClose} />
+        </div>
+    );
+}
+
+/**
+ * Converts time in minutes to 2d 5h 25.1
+ * If less than 1 hour, just returns minutes
+ *
+ * @param {float} minutes
+ * @returns {string}
+ */
+function getFormattedHours(minutes) {
+    minutes = Math.round(minutes * 10) / 10;
+    const years = Math.floor(minutes / 525600); // Assumes 365.0 days in a year
+    const days = Math.floor(minutes / 1440) % 365;
+    const hours = Math.floor(minutes / 60) % 24;
+    return (years > 0 ? years + chrome.i18n.getMessage("yearAbbreviation") + " " : "") + (days > 0 ? days + chrome.i18n.getMessage("dayAbbreviation") + " " : "") + (hours > 0 ? hours + chrome.i18n.getMessage("hourAbbreviation") + " " : "") + (minutes % 60).toFixed(1);
+}
--- a/src/popup/popup.tsx
+++ b/src/popup/popup.tsx
@@ -0,0 +1,13 @@
+import * as React from "react";
+import { createRoot } from "react-dom/client";
+import { PopupComponent } from "./PopupComponent";
+import { waitFor } from "../../maze-utils/src";
+import Config from "../config";
+
+
+document.addEventListener("DOMContentLoaded", async () => {
+    await waitFor(() => Config.isReady());
+
+    const root = createRoot(document.body);
+    root.render(<PopupComponent/>);
+})
--- a/src/popup/popupUtils.ts
+++ b/src/popup/popupUtils.ts
@@ -0,0 +1,12 @@
+import { Message, MessageResponse } from "../messageTypes";
+
+export function copyToClipboardPopup(text: string, sendMessage: (request: Message) => Promise<MessageResponse>): void {
+    if (window === window.top) {
+        window.navigator.clipboard.writeText(text);
+    } else {
+        sendMessage({
+            message: "copyToClipboard",
+            text
+        });
+    }
+}
--- a/src/render/AdvancedSkipOptions.tsx
+++ b/src/render/AdvancedSkipOptions.tsx
@@ -0,0 +1,15 @@
+import * as React from "react";
+import { createRoot } from 'react-dom/client';
+
+import { AdvancedSkipOptionsComponent } from "../components/options/AdvancedSkipOptionsComponent";
+
+class AdvancedSkipOptions {
+    constructor(element: Element) {
+        const root = createRoot(element);
+        root.render(
+            <AdvancedSkipOptionsComponent />
+        );
+    }
+}
+
+export default AdvancedSkipOptions;
--- a/src/render/ChapterVote.tsx
+++ b/src/render/ChapterVote.tsx
@@ -20,6 +20,10 @@ export class ChapterVote {
        this.container.id = "chapterVote";
        this.container.style.height = "100%";

+        if (document.location.host === "tv.youtube.com") {
+            this.container.style.lineHeight = "initial";
+        }
+
        this.root = createRoot(this.container);
        this.root.render(<ChapterVoteComponent ref={this.ref} vote={vote} />);
    }
--- a/src/render/SkipNotice.tsx
+++ b/src/render/SkipNotice.tsx
@@ -5,7 +5,7 @@ import Utils from "../utils";
 const utils = new Utils();

 import SkipNoticeComponent from "../components/SkipNoticeComponent";
-import { SponsorTime, ContentContainer, NoticeVisbilityMode } from "../types";
+import { SponsorTime, ContentContainer, NoticeVisibilityMode } from "../types";
 import Config from "../config";
 import { SkipNoticeAction } from "../utils/noticeUtils";

@@ -20,7 +20,7 @@ class SkipNotice {
    skipNoticeRef: React.MutableRefObject<SkipNoticeComponent>;
    root: Root;

-    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer, componentDidMount: () => void, unskipTime: number = null, startReskip = false, upcomingNoticeShown: boolean) {
+    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer, componentDidMount: () => void, unskipTime: number = null, startReskip = false, upcomingNoticeShown: boolean, voteNotice = false) {
        this.skipNoticeRef = React.createRef();

        this.segments = segments;
@@ -42,18 +42,18 @@ class SkipNotice {
        this.noticeElement.id = "sponsorSkipNoticeContainer" + idSuffix;

        referenceNode.prepend(this.noticeElement);
-
        this.root = createRoot(this.noticeElement);
        this.root.render(
            <SkipNoticeComponent segments={segments} 
                autoSkip={autoSkip} 
                startReskip={startReskip}
+                voteNotice={voteNotice}
                contentContainer={contentContainer}
                ref={this.skipNoticeRef}
                closeListener={() => this.close()}
-                smaller={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAll 
-                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAutoSkip && autoSkip)}
-                fadeIn={!upcomingNoticeShown}
+                smaller={!voteNotice && (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.MiniForAll 
+                    || (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.MiniForAutoSkip && autoSkip))}
+                fadeIn={!upcomingNoticeShown && !voteNotice}
                unskipTime={unskipTime}
                componentDidMount={componentDidMount} />
        );
@@ -81,6 +81,26 @@ class SkipNotice {
    unmutedListener(time: number): void {
        this.skipNoticeRef?.current?.unmutedListener(time);
    }
+
+    async waitForSkipNoticeRef(): Promise<SkipNoticeComponent> {
+        const waitForRef = () => new Promise<SkipNoticeComponent>((resolve) => {
+            const observer = new MutationObserver(() => {
+            if (this.skipNoticeRef.current) {
+                observer.disconnect();
+                resolve(this.skipNoticeRef.current);
+            }
+            });
+
+            observer.observe(document.getElementsByClassName("sponsorSkipNoticeContainer")[0], { childList: true, subtree: true});
+
+            if (this.skipNoticeRef.current) {
+            observer.disconnect();
+            resolve(this.skipNoticeRef.current);
+            }
+        });
+
+        return this.skipNoticeRef?.current || await waitForRef();
+    }
 }

 export default SkipNotice;
--- a/src/svg-icons/checkIcon.tsx
+++ b/src/svg-icons/checkIcon.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+
+export interface CheckIconProps {
+  id?: string;
+  style?: React.CSSProperties;
+  className?: string;
+  onClick?: () => void;
+}
+
+const CheckIcon = ({
+  id = "",
+  className = "",
+  style = {},
+  onClick
+}: CheckIconProps): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    className={className}
+    style={style}
+    id={id}
+    onClick={onClick} >
+    <path d="M20.3 2L9 13.6l-5.3-5L0 12.3 9 21 24 5.7z"/>
+  </svg>
+);
+
+export default CheckIcon;
--- a/src/svg-icons/clipboardIcon.tsx
+++ b/src/svg-icons/clipboardIcon.tsx
@@ -0,0 +1,28 @@
+import * as React from "react";
+
+export interface ClipboardIconProps {
+  id?: string;
+  style?: React.CSSProperties;
+  className?: string;
+  onClick?: () => void;
+}
+
+const ClipboardIcon = ({
+  id = "",
+  className = "",
+  style = {},
+  onClick
+}: ClipboardIconProps): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    className={className}
+    style={style}
+    id={id}
+    onClick={onClick} >
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm-1 4l6 6v10c0 1.1-.9 2-2 2H7.99C6.89 23 6 22.1 6 21l.01-14c0-1.1.89-2 1.99-2h7zm-1 7h5.5L14 6.5V12z" />
+  </svg>
+);
+
+export default ClipboardIcon;
--- a/src/svg-icons/pencilIcon.tsx
+++ b/src/svg-icons/pencilIcon.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+
+export interface PencilIconProps {
+  id?: string;
+  style?: React.CSSProperties;
+  className?: string;
+  onClick?: () => void;
+}
+
+const PencilIcon = ({
+  id = "",
+  className = "",
+  style = {},
+  onClick
+}: PencilIconProps): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    className={className}
+    style={style}
+    id={id}
+    onClick={onClick} >
+    <path d="M14.1 7.1l2.9 2.9L6.1 20.7l-3.6.7.7-3.6L14.1 7.1zm0-2.8L1.4 16.9 0 24l7.1-1.4L19.8 9.9l-5.7-5.7zm7.1 4.3L24 5.7 18.3 0l-2.8 2.8 5.7 5.7z"/>
+  </svg>
+);
+
+export default PencilIcon;
--- a/src/types.ts
+++ b/src/types.ts
@@ -6,7 +6,7 @@ export interface ContentContainer {
    (): {
        vote: (type: number, UUID: SegmentUUID, category?: Category, skipNotice?: SkipNoticeComponent) => void;
        dontShowNoticeAgain: () => void;
-        unskipSponsorTime: (segment: SponsorTime, unskipTime: number, forceSeek?: boolean) => void;
+        unskipSponsorTime: (segment: SponsorTime, unskipTime: number, forceSeek?: boolean, voteNotice?: boolean) => void;
        sponsorTimes: SponsorTime[];
        sponsorTimesSubmitting: SponsorTime[];
        skipNotices: SkipNotice[];
@@ -70,7 +70,8 @@ export type Category = string & { __categoryBrand: unknown };
 export enum SponsorSourceType {
    Server = undefined,
    Local = 1,
-    YouTube = 2
+    YouTube = 2,
+    Autogenerated = 3
 }

 export interface SegmentContainer {
@@ -219,7 +220,7 @@ export interface ToggleSkippable {
    setShowKeybindHint: (show: boolean) => void;
 }

-export enum NoticeVisbilityMode {
+export enum NoticeVisibilityMode {
    FullSize = 0,
    MiniForAutoSkip = 1,
    MiniForAll = 2,
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,10 +1,11 @@
 import Config, { VideoDownvotes } from "./config";
-import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType, CategorySkipOption } from "./types";
+import { SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType } from "./types";

 import { getHash, HashedValue } from "../maze-utils/src/hash";
 import { waitFor } from "../maze-utils/src";
 import { findValidElementFromSelector } from "../maze-utils/src/dom";
 import { isSafari } from "../maze-utils/src/config";
+import { asyncRequestToServer } from "./utils/requests";

 export default class Utils {
    
@@ -198,7 +199,7 @@ export default class Utils {

    getSponsorIndexFromUUID(sponsorTimes: SponsorTime[], UUID: string): number {
        for (let i = 0; i < sponsorTimes.length; i++) {
-            if (sponsorTimes[i].UUID === UUID) {
+            if (sponsorTimes[i].UUID && (sponsorTimes[i].UUID.startsWith(UUID) || UUID.startsWith(sponsorTimes[i].UUID))) {
                return i;
            }
        }
@@ -210,15 +211,6 @@ export default class Utils {
        return sponsorTimes[this.getSponsorIndexFromUUID(sponsorTimes, UUID)];
    }

-    getCategorySelection(category: string): CategorySelection {
-        for (const selection of Config.config.categorySelections) {
-            if (selection.name === category) {
-                return selection;
-            }
-        }
-        return { name: category, option: CategorySkipOption.Disabled} as CategorySelection;
-    }
-
    /**
     * @returns {String[]} Domains in regex form
     */
@@ -248,6 +240,7 @@ export default class Utils {
            ".main-video-section > .video-container", // Cloudtube
            ".shaka-video-container", // Piped
            "#player-container.ytk-player", // YT Kids
+            "#id-tv-container" // YTTV
        ];

        let referenceNode = findValidElementFromSelector(selectors)
@@ -282,6 +275,17 @@ export default class Utils {
        if ((chrome.extension.inIncognitoContext && !Config.config.trackDownvotesInPrivate)
                || !Config.config.trackDownvotes) return;

+        if (segmentUUID.length < 60) {
+            const segmentIDData = await asyncRequestToServer("GET", "/api/segmentID", {
+                UUID: segmentUUID,
+                videoID
+            });
+
+            if (segmentIDData.ok && segmentIDData.responseText) {
+                segmentUUID = segmentIDData.responseText;
+            }
+        }
+
        const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
        const UUIDHash = await getHash(segmentUUID, 1);

--- a/src/utils/categoryUtils.ts
+++ b/src/utils/categoryUtils.ts
@@ -6,6 +6,7 @@ export function getSkippingText(segments: SponsorTime[], autoSkip: boolean): str
    if (autoSkip) {
        let messageId = "";
        switch (segments[0].actionType) {
+            case ActionType.Chapter:
            case ActionType.Skip:
                messageId = "skipped";
                break;
@@ -21,6 +22,7 @@ export function getSkippingText(segments: SponsorTime[], autoSkip: boolean): str
    } else {
        let messageId = "";
        switch (segments[0].actionType) {
+            case ActionType.Chapter:
            case ActionType.Skip:
                messageId = "skip_category";
                break;
@@ -44,6 +46,14 @@ export function getUpcomingText(segments: SponsorTime[]): string {
    return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
 }

+export function getVoteText(segments: SponsorTime[]): string {
+    const categoryName = chrome.i18n.getMessage(segments.length > 1 ? "multipleSegments" 
+        : "category_" + segments[0].category + "_short") || chrome.i18n.getMessage("category_" + segments[0].category);
+        
+    const messageId = "voted_on";
+    return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
+}
+

 export function getCategorySuffix(category: Category): string {
    if (category.startsWith("poi_")) {
--- a/src/utils/exporter.ts
+++ b/src/utils/exporter.ts
@@ -16,7 +16,7 @@ export function exportTimes(segments: SponsorTime[]): string {
    let result = "";
    for (const segment of segments) {
        if (![ActionType.Full, ActionType.Mute].includes(segment.actionType)
-                && segment.source !== SponsorSourceType.YouTube) {
+                && ![SponsorSourceType.YouTube, SponsorSourceType.Autogenerated].includes(segment.source)) {
            result += exportTime(segment) + "\n";
        }
    }
@@ -34,9 +34,12 @@ function exportTime(segment: SponsorTime): string {

 export function importTimes(data: string, videoDuration: number): SponsorTime[] {
    const lines = data.split("\n");
+    const timeRegex = /(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g;
+    const anyLineHasTime = lines.some((line) => timeRegex.test(line));
+
    const result: SponsorTime[] = [];
    for (const line of lines) {
-        const match = line.match(/(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g);
+        const match = line.match(timeRegex);
        if (match) {
            const startTime = getFormattedTimeToSeconds(match[0]);
            if (startTime !== null) {
@@ -71,6 +74,18 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]

                result.push(segment);
            }
+        } else if (!anyLineHasTime) {
+            // Adding chapters with placeholder times
+            const segment: SponsorTime = {
+                segment: [0, 0],
+                category: "chapter" as Category,
+                actionType: ActionType.Chapter,
+                description: line,
+                source: SponsorSourceType.Local,
+                UUID: generateUserID() as SegmentUUID
+            };
+
+            result.push(segment);
        }
    }

--- a/src/utils/pageUtils.ts
+++ b/src/utils/pageUtils.ts
@@ -4,6 +4,8 @@ import Config from "../config";

 export function getControls(): HTMLElement {
    const controlsSelectors = [
+        // New YouTube (2025 April)
+        ".ytp-right-controls-right",
        // YouTube
        ".ytp-right-controls",
        // Mobile YouTube
@@ -13,7 +15,9 @@ export function getControls(): HTMLElement {
        // Piped shaka player
        ".shaka-bottom-controls",
        // Vorapis v3
-        ".html5-player-chrome"
+        ".html5-player-chrome",
+        // tv.youtube.com
+        ".ypcs-control-buttons-right"
    ];

    for (const controlsSelector of controlsSelectors) {
@@ -64,7 +68,9 @@ export function getExistingChapters(currentVideoID: VideoID, duration: number):
    const chaptersBox = document.querySelector("ytd-macro-markers-list-renderer");
    const title = chaptersBox?.closest("ytd-engagement-panel-section-list-renderer")?.querySelector("#title-text.ytd-engagement-panel-title-header-renderer");
    if (title?.textContent?.includes("Key moment")) return [];
-    if (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) return [];
+
+    const autogenerated = hasAutogeneratedChapters();
+    if (!Config.config.showAutogeneratedChapters && autogenerated) return [];

    const chapters: SponsorTime[] = [];
    // .ytp-timed-markers-container indicates that key-moments are present, which should not be divided
@@ -88,7 +94,7 @@ export function getExistingChapters(currentVideoID: VideoID, duration: number):
                    category: "chapter" as Category,
                    actionType: ActionType.Chapter,
                    description: description.innerText,
-                    source: SponsorSourceType.YouTube,
+                    source: autogenerated ? SponsorSourceType.Autogenerated : SponsorSourceType.YouTube,
                    UUID: null
                };
            }
--- a/src/utils/segmentData.ts
+++ b/src/utils/segmentData.ts
@@ -1,10 +1,11 @@
 import { DataCache } from "../../maze-utils/src/cache";
 import { getHash, HashedValue } from "../../maze-utils/src/hash";
-import Config from "../config";
+import Config, {  } from "../config";
 import * as CompileConfig from "../../config.json";
 import { ActionType, ActionTypes, SponsorSourceType, SponsorTime, VideoID } from "../types";
 import { getHashParams } from "./pageUtils";
 import { asyncRequestToServer } from "./requests";
+import { extensionUserAgent } from "../../maze-utils/src";

 const segmentDataCache = new DataCache<VideoID, SegmentResponse>(() => {
    return {
@@ -43,19 +44,19 @@ export async function getSegmentsForVideo(videoID: VideoID, ignoreCache: boolean
 }

 async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse> {
-    const categories: string[] = Config.config.categorySelections.map((category) => category.name);
-
    const extraRequestData: Record<string, unknown> = {};
    const hashParams = getHashParams();
    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.slice(0, 4)];
    const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
        categories: CompileConfig.categoryList,
        actionTypes: ActionTypes,
+        trimUUIDs: hasDownvotedSegments ? null : 5,
        ...extraRequestData
    }, {
-        "X-CLIENT-NAME": `${chrome.runtime.id}/v${chrome.runtime.getManifest().version}`
+        "X-CLIENT-NAME": extensionUserAgent(),
    });

    if (response.ok) {
@@ -64,7 +65,7 @@ async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse>
        const receivedSegments: SponsorTime[] = JSON.parse(response.responseText)
                    ?.filter((video) => video.videoID === videoID)
                    ?.map((video) => video.segments)?.[0]
-                    ?.filter((segment) => enabledActionTypes.includes(segment.actionType) && categories.includes(segment.category))
+                    ?.filter((segment) => enabledActionTypes.includes(segment.actionType))
                    ?.map((segment) => ({
                        ...segment,
                        source: SponsorSourceType.Server
--- a/src/utils/skipRule.ts
+++ b/src/utils/skipRule.ts
@@ -0,0 +1,164 @@
+import { getChannelIDInfo, getVideoDuration } from "../../maze-utils/src/video";
+import Config from "../config";
+import { CategorySelection, CategorySkipOption, SponsorSourceType, SponsorTime } from "../types";
+import { VideoLabelsCacheData } from "./videoLabels";
+
+export interface Permission {
+    canSubmit: boolean;
+}
+
+export enum SkipRuleAttribute {
+    StartTime = "time.start",
+    EndTime = "time.end",
+    Duration = "time.duration",
+    StartTimePercent = "time.startPercent",
+    EndTimePercent = "time.endPercent",
+    DurationPercent = "time.durationPercent",
+    Category = "category",
+    ActionType = "actionType",
+    Description = "chapter.name",
+    Source = "chapter.source",
+    ChannelID = "channel.id",
+    ChannelName = "channel.name"
+}
+
+export enum SkipRuleOperator {
+    Less = "<",
+    LessOrEqual = "<=",
+    Greater = ">",
+    GreaterOrEqual = ">=",
+    Equal = "==",
+    NotEqual = "!=",
+    Contains = "*=",
+    NotContains = "!*=",
+    Regex = "~=",
+    RegexIgnoreCase = "~i=",
+    NotRegex = "!~=",
+    NotRegexIgnoreCase = "!~i="
+}
+
+export interface AdvancedSkipRule {
+    attribute: SkipRuleAttribute;
+    operator: SkipRuleOperator;
+    value: string | number;
+}
+
+export interface AdvancedSkipRuleSet {
+    rules: AdvancedSkipRule[];
+    skipOption: CategorySkipOption;
+    comment: string;
+}
+
+export function getCategorySelection(segment: SponsorTime | VideoLabelsCacheData): CategorySelection {
+    for (const ruleSet of Config.local.skipRules) {
+        if (ruleSet.rules.every((rule) => isSkipRulePassing(segment, rule))) {
+            return { name: segment.category, option: ruleSet.skipOption } as CategorySelection;
+        }
+    }
+
+    for (const selection of Config.config.categorySelections) {
+        if (selection.name === segment.category) {
+            return selection;
+        }
+    }
+    return { name: segment.category, option: CategorySkipOption.Disabled} as CategorySelection;
+}
+
+function getSkipRuleValue(segment: SponsorTime | VideoLabelsCacheData, rule: AdvancedSkipRule): string | number | undefined {
+    switch (rule.attribute) {
+        case SkipRuleAttribute.StartTime:
+            return (segment as SponsorTime).segment?.[0];
+        case SkipRuleAttribute.EndTime:
+            return (segment as SponsorTime).segment?.[1];
+        case SkipRuleAttribute.Duration:
+            return (segment as SponsorTime).segment?.[1] - (segment as SponsorTime).segment?.[0];
+        case SkipRuleAttribute.StartTimePercent: {
+            const startTime = (segment as SponsorTime).segment?.[0];
+            if (startTime === undefined) return undefined;
+
+            return startTime / getVideoDuration() * 100;
+        }
+        case SkipRuleAttribute.EndTimePercent: {
+            const endTime = (segment as SponsorTime).segment?.[1];
+            if (endTime === undefined) return undefined;
+
+            return endTime / getVideoDuration() * 100;
+        }
+        case SkipRuleAttribute.DurationPercent: {
+            const startTime = (segment as SponsorTime).segment?.[0];
+            const endTime = (segment as SponsorTime).segment?.[1];
+            if (startTime === undefined || endTime === undefined) return undefined;
+
+            return (endTime - startTime) / getVideoDuration() * 100;
+        }
+        case SkipRuleAttribute.Category:
+            return segment.category;
+        case SkipRuleAttribute.ActionType:
+            return (segment as SponsorTime).actionType;
+        case SkipRuleAttribute.Description:
+            return (segment as SponsorTime).description || "";
+        case SkipRuleAttribute.Source:
+            switch ((segment as SponsorTime).source) {
+                case SponsorSourceType.Local:
+                    return "local";
+                case SponsorSourceType.YouTube:
+                    return "youtube";
+                case SponsorSourceType.Autogenerated:
+                    return "autogenerated";
+                case SponsorSourceType.Server:
+                    return "server";
+                default:
+                    return undefined;
+            }
+        case SkipRuleAttribute.ChannelID:
+            getChannelIDInfo()
+            return getChannelIDInfo().id;
+        case SkipRuleAttribute.ChannelName:
+            getChannelIDInfo()
+            return getChannelIDInfo().author;
+        default:
+            return undefined;
+    }
+}
+
+function isSkipRulePassing(segment: SponsorTime | VideoLabelsCacheData, rule: AdvancedSkipRule): boolean {
+    const value = getSkipRuleValue(segment, rule);
+    
+    switch (rule.operator) {
+        case SkipRuleOperator.Less:
+            return typeof value === "number" && value < (rule.value as number);
+        case SkipRuleOperator.LessOrEqual:
+            return typeof value === "number" && value <= (rule.value as number);
+        case SkipRuleOperator.Greater:
+            return typeof value === "number" && value > (rule.value as number);
+        case SkipRuleOperator.GreaterOrEqual:
+            return typeof value === "number" && value >= (rule.value as number);
+        case SkipRuleOperator.Equal:
+            return value === rule.value;
+        case SkipRuleOperator.NotEqual:
+            return value !== rule.value;
+        case SkipRuleOperator.Contains:
+            return String(value).toLocaleLowerCase().includes(String(rule.value).toLocaleLowerCase());
+        case SkipRuleOperator.NotContains:
+            return !String(value).toLocaleLowerCase().includes(String(rule.value).toLocaleLowerCase());
+        case SkipRuleOperator.Regex:
+            return new RegExp(rule.value as string).test(String(value));
+        case SkipRuleOperator.RegexIgnoreCase:
+            return new RegExp(rule.value as string, "i").test(String(value));
+        case SkipRuleOperator.NotRegex:
+            return !new RegExp(rule.value as string).test(String(value));
+        case SkipRuleOperator.NotRegexIgnoreCase:
+            return !new RegExp(rule.value as string, "i").test(String(value));
+        default:
+            return false;
+    }
+}
+
+export function getCategoryDefaultSelection(category: string): CategorySelection {
+    for (const selection of Config.config.categorySelections) {
+        if (selection.name === category) {
+            return selection;
+        }
+    }
+    return { name: category, option: CategorySkipOption.Disabled} as CategorySelection;
+}
--- a/src/utils/thumbnails.ts
+++ b/src/utils/thumbnails.ts
@@ -1,6 +1,6 @@
 import { isOnInvidious, parseYouTubeVideoIDFromURL } from "../../maze-utils/src/video";
 import Config from "../config";
-import { getVideoLabel } from "./videoLabels";
+import { getHasStartSegment, getVideoLabel } from "./videoLabels";
 import { getThumbnailSelector, setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
 import { VideoID } from "../types";
 import { getSegmentsForVideo } from "./segmentData";
@@ -58,10 +58,27 @@ function thumbnailHoverListener(e: MouseEvent) {
    if (!thumbnail) return;

    // Pre-fetch data for this video
-    const videoID = extractVideoID(thumbnail);
-    if (videoID) {
-        void getSegmentsForVideo(videoID, false);
-    }
+    let fetched = false;
+    const preFetch = async () => {
+        fetched = true;
+        const videoID = extractVideoID(thumbnail);
+        if (videoID && await getHasStartSegment(videoID)) {
+            void getSegmentsForVideo(videoID, false);
+        }
+    };
+    const timeout = setTimeout(preFetch, 100);
+    const onMouseDown = () => {
+        clearTimeout(timeout);
+        if (!fetched) {
+            preFetch();
+        }
+    };
+
+    e.target.addEventListener("mousedown", onMouseDown, { once: true });
+    e.target.addEventListener("mouseleave", () => {
+        clearTimeout(timeout);
+        e.target.removeEventListener("mousedown", onMouseDown);
+    }, { once: true });
 }

 function getLink(thumbnail: HTMLImageElement): HTMLAnchorElement | null {
--- a/src/utils/videoLabels.ts
+++ b/src/utils/videoLabels.ts
@@ -1,14 +1,17 @@
 import { Category, CategorySkipOption, VideoID } from "../types";
 import { getHash } from "../../maze-utils/src/hash";
-import Utils from "../utils";
 import { logWarn } from "./logger";
 import { asyncRequestToServer } from "./requests";
+import { getCategorySelection } from "./skipRule";

-const utils = new Utils();
+export interface VideoLabelsCacheData {
+    category: Category;
+    hasStartSegment: boolean;
+}

 export interface LabelCacheEntry {
    timestamp: number;
-    videos: Record<VideoID, Category>;
+    videos: Record<VideoID, VideoLabelsCacheData>;
 }

 const labelCache: Record<string, LabelCacheEntry> = {};
@@ -21,7 +24,7 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
        return cachedEntry;
    }

-    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}`);
+    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}?hasStartSegment=true`);
    if (response.status !== 200) {
        // No video labels or server down
        labelCache[hashPrefix] = {
@@ -36,7 +39,10 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |

        const newEntry: LabelCacheEntry = {
            timestamp: Date.now(),
-            videos: Object.fromEntries(data.map(video => [video.videoID, video.segments[0].category])),
+            videos: Object.fromEntries(data.map(video => [video.videoID, {
+                category: video.segments[0]?.category,
+                hasStartSegment: video.hasStartSegment
+            }])),
        };
        labelCache[hashPrefix] = newEntry;

@@ -55,17 +61,28 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
 }

 export async function getVideoLabel(videoID: VideoID): Promise<Category | null> {
-    const prefix = (await getHash(videoID, 1)).slice(0, 3);
+    const prefix = (await getHash(videoID, 1)).slice(0, 4);
    const result = await getLabelHashBlock(prefix);

    if (result) {
-        const category = result.videos[videoID];
-        if (category && utils.getCategorySelection(category).option !== CategorySkipOption.Disabled) {
+        const category = result.videos[videoID]?.category;
+        if (category && getCategorySelection(result.videos[videoID]).option !== CategorySkipOption.Disabled) {
            return category;
        } else {
            return null;
        }
    }

+    return null;
+}
+
+export async function getHasStartSegment(videoID: VideoID): Promise<boolean | null> {
+    const prefix = (await getHash(videoID, 1)).slice(0, 4);
+    const result = await getLabelHashBlock(prefix);
+
+    if (result) {
+        return result?.videos[videoID]?.hasStartSegment ?? false;
+    }
+
    return null;
 }
--- a/test/previewBar.test.ts
+++ b/test/previewBar.test.ts
@@ -1,9 +1,13 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import PreviewBar, { PreviewBarSegment } from "../src/js-components/previewBar";

 describe("createChapterRenderGroups", () => {
    let previewBar: PreviewBar;
    beforeEach(() => {
-        previewBar = new PreviewBar(null, null, null, null, null, true);
+        previewBar = new PreviewBar(null, null, null, null, null, null, true);
    })

    it("Two unrelated times", () => {
--- a/test/selenium.test.ts
+++ b/test/selenium.test.ts
@@ -58,7 +58,7 @@ async function setup(): Promise<WebDriver> {
    options.addArguments("--headless=new");
    options.addArguments("--window-size=1920,1080");

-    const driver = await new Builder().forBrowser("chrome").setChromeOptions(options).build();
+    const driver = await new Builder().forBrowser("chromium").setChromeOptions(options).build();
    driver.manage().setTimeouts({
        implicit: 5000
    });
@@ -127,6 +127,8 @@ async function editSegments(driver: WebDriver, index: number, expectedStartTimeB
    await endTimeBox.clear();
    await endTimeBox.sendKeys(endTime);

+    await driver.sleep(1000);
+
    editButton = await driver.findElement(By.id("sponsorTimeEditButtonSubmissionNotice" + index));
    await editButton.click();

--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
        "resolveJsonModule": true,
        "jsx": "react",
        "lib": [
-            "es2019",
+            "es2020",
            "dom",
            "dom.iterable"
        ]
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -93,7 +93,7 @@ module.exports = env => {

    return {
        entry: {
-            popup: path.join(__dirname, srcDir + 'popup.ts'),
+            popup: path.join(__dirname, srcDir + 'popup/popup.tsx'),
            background: path.join(__dirname, srcDir + 'background.ts'),
            content: path.join(__dirname, srcDir + 'content.ts'),
            options: path.join(__dirname, srcDir + 'options.ts'),
--- a/webpack/webpack.manifest.js
+++ b/webpack/webpack.manifest.js
@@ -51,6 +51,7 @@ class BuildManifest {
        }  else if (this.options.browser.toLowerCase() === "safari") {
            mergeObjects(manifest, manifestV2ManifestExtra);
            mergeObjects(manifest, safariManifestExtra);
+            manifest.optional_permissions = manifest.optional_permissions.filter((a) => a !== "*://*/*");
        }

        if (this.options.stream === "beta") {
Author	SHA1	Message	Date
Ajay	f5d959e0e0	bump version	2025-06-20 21:58:00 -04:00
Ajay	a8c99dc9fb	Fix some channel information requests failing	2025-06-20 21:57:51 -04:00
Ajay	4d92f1fbbb	update translations	2025-06-19 17:11:21 -04:00
Ajay	af682801c6	bump version	2025-06-19 17:10:57 -04:00
Ajay	1a404afede	Fix exporter test	2025-06-19 17:07:34 -04:00
Ajay	bbdb03f50d	Use chromium for tests	2025-06-19 16:57:17 -04:00
Ajay	efe2906dde	Update chrome package name	2025-06-19 14:58:01 -04:00
Ajay	5127ba88a6	Use apt get instead of apt	2025-06-19 14:48:45 -04:00
Ajay	49968c3b45	Fix apt not having sudo	2025-06-19 14:48:19 -04:00
Ajay	4f29058b4f	Remove old chrome version	2025-06-19 14:46:10 -04:00
Ajay	616d09171e	Remove extra chrome driver install	2025-06-19 13:34:56 -04:00
Ajay	8022fa77cb	Speed up channel info fetching	2025-06-19 03:08:48 -04:00
Ajay	993c9becf4	Update recommended node version	2025-06-13 14:40:44 -04:00
Ajay	689594851d	Fix overlapping text on tooltip when chapters are present	2025-06-12 04:07:11 -04:00
Ajay	9a7c65899e	Increase es version	2025-06-11 15:28:33 -04:00
Ajay	da1a535de7	Add channel id and name attribute for advanced skip options	2025-06-07 01:01:52 -04:00
Ajay	ec1df44cbc	Also check values for not equals	2025-06-06 23:54:57 -04:00
Ajay	b2461a6a30	Add not contains, not regex and regex ignore case	2025-06-06 23:51:36 -04:00
Ajay	3fb9286e47	Add action type attribute	2025-06-06 23:46:07 -04:00
Ajay	dc5bb5b8aa	Move skip rule code to new file	2025-06-06 23:39:51 -04:00
Ajay	1b5dc38750	Add percentage options for advanced skip options	2025-06-06 23:21:35 -04:00
Ajay	72d3f68957	Add autogenerated type for source in advance skip options	2025-06-06 23:15:34 -04:00
Ajay	d5ff71b367	Case insensitive contains	2025-06-06 22:56:57 -04:00
Ajay	09bd27a59b	Add advanced skip options	2025-06-06 22:03:07 -04:00
Ajay	cf2d39ae3f	Delete old popup	2025-06-04 01:02:33 -04:00
Ajay	4330d5a726	Copy styles over to popup	2025-06-04 00:57:25 -04:00
Ajay	3734b61c81	Add copy debug log button to popup	2025-06-02 16:22:21 -04:00
Ajay	0f2bd699c4	Only show import segments button when video open	2025-06-02 04:38:13 -04:00
Ajay	71b9e497d6	Fix errors	2025-06-02 04:33:14 -04:00
Ajay	550608cdb5	Fix loading indicator in popup	2025-06-02 04:29:59 -04:00
Ajay	e4a050f905	Rewrite popup in react	2025-06-02 04:11:52 -04:00
Ajay	d7db6d58c5	bump version	2025-05-27 12:51:20 -04:00
Ajay	56a2d76f38	Fix next chapter hotkey causing multiple chapters to be skipped on Chrome Fixes #2276	2025-05-27 12:51:07 -04:00
Ajay	4a7d431a17	bump translations	2025-05-24 02:11:15 -04:00
Ajay	a91ff4e49f	bump version	2025-05-24 02:10:48 -04:00
Ajay	fcb9f32d4c	Fix skip keybind also being used for skip to highlight Fixes #2274	2025-05-24 02:10:38 -04:00
Ajay	cf4d13a756	Fix next chapter hotkey causing multiple chapters to be skipped Fixes #2273	2025-05-24 02:07:36 -04:00
Ajay	75d0043e45	Make popup more accessible	2025-05-23 04:24:13 -04:00
Ajay Ramachandran	2391337ee2	Merge pull request #2252 from ajayyy/dependabot/npm_and_yarn/axios-1.8.4 Bump axios from 1.7.7 to 1.8.4	2025-05-16 04:09:57 -04:00
Ajay	1074f653b2	bump version	2025-05-16 02:17:05 -04:00
Ajay	a12601180e	update translations	2025-05-16 02:16:57 -04:00
Ajay	3a7716240d	Fix time without skip for new yt player Fixes #2263	2025-05-14 01:24:54 -04:00
Ajay Ramachandran	93f44859b2	Merge pull request #2255 from mini-bomba/useragent Use useragent generator from maze-utils	2025-04-28 01:26:39 -04:00
mini-bomba	376ce21eae	Use useragent generator from maze-utils	2025-04-26 19:39:58 +02:00
Ajay	19635d2f06	bump version	2025-04-25 02:13:56 -04:00
Ajay	b2a5539324	Another fix for button placement on new YouTube layout	2025-04-25 02:13:33 -04:00
Ajay	01df1e655e	Fix commit hash for setup chrome workflow	2025-04-24 15:53:39 -04:00
Ajay	467e1cae50	Install specific version of chrome for testing	2025-04-24 15:20:59 -04:00
Ajay	822e00a46a	Change wireguard connection action	2025-04-24 03:37:13 -04:00
Ajay	74433fe751	Use VPN for testing action	2025-04-24 03:27:30 -04:00
Ajay	a45690b26e	Use self-hosted runner	2025-04-24 03:08:33 -04:00
Ajay	f69d6736d4	Add more delay to make tests work	2025-04-24 02:55:52 -04:00
Ajay	ae7916b7e7	Fix behavior or auto skip on music videos with when only skipping on music.youtube.com enabled	2025-04-24 02:03:08 -04:00
dependabot[bot]	3bb4cf4fbc	Bump axios from 1.7.7 to 1.8.4 Bumps [axios](https://github.com/axios/axios) from 1.7.7 to 1.8.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.7...v1.8.4) --- updated-dependencies: - dependency-name: axios dependency-version: 1.8.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-24 01:34:34 +00:00
Ajay	8b305ba5ec	bump version	2025-04-23 21:33:55 -04:00
Ajay	0fdcade27e	update translations	2025-04-23 21:33:33 -04:00
Ajay	897ebda42d	update chromedriver to make tests run	2025-04-23 21:33:24 -04:00
Ajay Ramachandran	ddd0b4ea05	Merge pull request #2235 from FlorianZahn/auto-skip-only-on-youtube-music feat: Option to auto-skip non-music on youtube music only	2025-04-23 21:30:41 -04:00
Ajay	4826bcf7df	Remove unnecessary change	2025-04-23 21:27:56 -04:00
Ajay	09d8bc4425	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into pr/FlorianZahn/2235	2025-04-23 21:25:41 -04:00
Ajay	aeb3299c50	update submodules	2025-04-23 21:23:56 -04:00
Ajay	be11012096	Remove unnecessary change	2025-04-23 21:23:00 -04:00
Ajay	22da289151	Improve youtube music check code readability	2025-04-23 21:21:07 -04:00
Ajay Ramachandran	67a16a7b34	Merge pull request #2243 from gosha305/loop-chapters Added the possibility to loop a chapter	2025-04-23 21:06:49 -04:00
Ajay	312ac788b3	update translations	2025-04-23 21:06:31 -04:00
Ajay	8117f3c215	Formatting changes	2025-04-23 21:05:49 -04:00
Ajay	3c1d3f5d8e	Fix cases where hidden segments are not skipped when a chapter is at the same time Fixes #2228	2025-04-23 20:55:06 -04:00
Ajay	7cbd1fa59d	Fix downvoted segments not getting saved	2025-04-23 20:16:33 -04:00
Ajay	f9e9c5c868	Fix volume controls on new YouTube video layout Fixes #2248	2025-04-23 19:52:00 -04:00
gosha305	3b89ef0487	Added the possibility to loop a chapter	2025-04-13 22:19:05 +02:00
Ajay	d49bfa0a4c	bump version	2025-04-02 15:40:16 -04:00
Ajay	28cfcf7ddc	Remove optional permissions in safari for now due to safari bug https://bugs.webkit.org/show_bug.cgi?id=290508 Forgot to commit it in the last build	2025-04-02 15:40:08 -04:00
Florian Zahn	e656dd8d8b	feat: Option to auto-skip non-music on youtube music only	2025-04-01 22:53:28 +02:00
Ajay	7904913fdb	update translations	2025-03-31 18:37:36 -04:00
Ajay	464561992e	bump version	2025-03-31 18:36:51 -04:00
Ajay	4db73d5e54	Disable Invidious support in safari due to permission bug Will be re-enabled later #2227	2025-03-31 18:36:38 -04:00
Ajay	19020d2131	Try to fix NaN showing in skip popup	2025-03-20 01:37:08 -04:00
Ajay	244cce56c0	Fix server-side add detector when setting time at the end of the video	2025-03-12 23:28:52 -04:00
Ajay	b05d696057	Use longer hash prefix when fetching segments to save bandwidth	2025-03-12 02:51:07 -04:00
Ajay	d8ddcdc117	bump version	2025-03-10 22:55:12 -04:00
Ajay	48e8abb247	bump version	2025-03-09 14:28:08 -04:00
Ajay	a10f95f900	update translations	2025-03-09 14:28:03 -04:00
Ajay	70b415b67a	Fix skipping on /live/ links Fixes #2219	2025-03-09 03:15:18 -04:00
Ajay	c22a763da6	Fix issue with unfinished chapter submissions causing the seek bar to look wrong	2025-03-08 16:10:33 -05:00
Ajay	abbab887c6	More fixes for skiping accuracy with bluetooth headphones Raise threshold virtual time is allowed to adjust by	2025-03-08 04:59:16 -05:00
Ajay	169350a5bf	Fix extension context lost errors	2025-03-08 04:05:29 -05:00
Ajay	a4bb17f935	Fix skipping accuracy with bluetooth headphones on firefox	2025-03-08 03:56:19 -05:00
Ajay	1fa886690a	Add back clarified comment	2025-03-06 21:22:30 -05:00
Ajay Ramachandran	5540728fc6	Merge pull request #2187 from tech234a/master Implement support for YouTube TV (tv.youtube.com)	2025-03-06 03:16:36 -05:00
Ajay	9ab235c017	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into pr/tech234a/2187	2025-03-06 03:14:22 -05:00
Ajay	e5cc0587e2	update submodules	2025-03-06 03:12:59 -05:00
Ajay	e8b3753a17	Remove confusing comment	2025-03-06 03:10:21 -05:00
Ajay Ramachandran	b0984e9bbc	Merge pull request #2203 from gosha305/master Added keybinds for voting on segments	2025-03-05 01:49:53 -05:00
Ajay	1a3964e238	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into pr/gosha305/2203	2025-03-05 01:45:52 -05:00
Ajay	5903d1a023	Fixes for vote notice	2025-03-05 01:45:08 -05:00
Ajay	8b0b670ea8	update translation	2025-03-05 01:44:01 -05:00
Ajay	9ef948670c	bump version	2025-03-04 21:08:39 -05:00
gosha305	5a7e16b51c	Fixed chapter skip notices not working + fixed typo Fixed chapter skip notices not working + fixed typo Fixed chapter skip notices not working + fixed typo Fixed chapter skip notices not working + fixed typo A skip notice is now shown upon voting if one isn't already on screen minor fixes fixed commit error	2025-03-04 03:12:05 +01:00
Ajay	be98dc7b73	update translations	2025-03-02 23:41:58 -05:00
Ajay	3174eda29a	bump version	2025-03-02 23:40:30 -05:00
Ajay	6a4bb50006	Fix document script player client fetching	2025-03-02 23:34:50 -05:00
gosha305	66876283b4	A skip notice is now shown upon voting if one isn't already on screen A skip notice is now shown upon voting if one isn't already on screen minor fixes	2025-02-20 21:00:14 +01:00
gosha305	75dc6a1980	Added limit to how far back the segment voted on can be	2025-02-12 20:15:32 +01:00
Ajay	2823e51b1d	Allow importing placeholder chapters without start times	2025-02-11 20:28:10 -05:00
gosha305	c9c02e91ff	Added keybinds to vote on the last segment Added keybinds to vote on the last segment fixed Upvote/Downvote keybind message variable names to match others in that options section	2025-02-11 23:16:01 +01:00
Ajay	19efcb5a98	Handle video being null in skip notice Resolves #2201	2025-02-02 22:17:51 -05:00
Ajay	5c7e3b5cb3	bump version	2025-01-23 05:19:10 -05:00
Ajay	c3cbc44d28	Fix hiding segments not working on videos with YouTube chapters Fixes #2194	2025-01-23 05:18:49 -05:00
Ajay	6965279d36	bump version	2025-01-22 14:17:15 -05:00
Ajay	eb61ad76c1	Add extension name to storage error message	2025-01-22 14:17:04 -05:00
Ajay	7a1fa601da	bump version	2025-01-21 23:43:11 -05:00
Ajay	945ac5aad3	Fix local storage error appearing unnecessarily Also adds more details to the log message	2025-01-21 23:42:58 -05:00
Ajay	617f0e25e8	bump version	2025-01-20 02:28:35 -05:00
Ajay	ac52a1cb1d	update translations	2025-01-20 02:28:23 -05:00
Ajay	2cefb9822b	Make copy button in popup use full segment ID	2025-01-18 03:13:40 -05:00
Ajay	b81de96277	Add support for partial segment IDs	2025-01-18 03:10:14 -05:00
Ajay	236c95d2f6	Only do pre-fetch on hover if there are segments near the start of the video	2025-01-18 00:25:33 -05:00
Ajay	0f75953ad1	bump version	2025-01-17 04:35:52 -05:00
Ajay	0f4c1c50cb	Add delay to fetch on hover to make it less easy to trigger	2025-01-17 04:33:56 -05:00
Ajay	9e4939e2e3	Fix options page layout issue	2025-01-14 15:08:01 -05:00
tech234a	f4dc98112a	Fix tests	2025-01-13 00:57:12 -05:00
tech234a	138e57b720	Use a specific error message channel whitelisting on YTTV	2025-01-13 00:47:23 -05:00
tech234a	de1d6bd76a	Implement support for YouTube TV (tv.youtube.com)	2025-01-12 23:01:33 -05:00
Ajay	4a217300a2	bump version	2025-01-12 20:03:33 -05:00
Ajay	f4822fa587	update translations	2025-01-12 20:03:21 -05:00
Ajay	e4d6fdbd97	New filler wiki page	2025-01-11 15:33:04 -05:00
Ajay	1bd72e4db1	filler is gone🦀, long live tangents	2025-01-11 15:24:23 -05:00
Ajay	307eadc2da	Fix compilation error	2025-01-10 13:45:30 -05:00
Ajay	99014dd113	Handle when local storage gets reset Might fix the age old issue where the entire extension randomly becomes corrupted	2025-01-10 03:42:36 -05:00
Ajay	89b7cb0230	Fix audio glitch when chapter boundary passes Fixes #1596	2025-01-10 03:29:04 -05:00
Ajay	e3da6c8643	bump version	2024-12-25 23:36:48 -05:00
Ajay	136f5e7d61	Fix preview bar on mobile for videos without chapters	2024-12-25 23:36:33 -05:00
Ajay	16f24978ff	Fix offset with chapters on hover preview	2024-12-24 15:20:16 -05:00
Ajay	091d67e6b3	bump version	2024-12-24 14:34:49 -05:00
Ajay	fcf9bdc68e	Fix linting issues	2024-12-24 14:34:19 -05:00
Ajay	af73aabbae	Fix errors	2024-12-24 14:33:28 -05:00
Ajay	778b433ad4	Remove unused auto refetch segments option	2024-12-24 14:31:17 -05:00
Ajay	dc9c08f1fa	Fix chapter titles still showing on hover after they've been removed from the seek bar	2024-12-24 14:29:07 -05:00
Ajay	4efa8b464e	Fix capitalization	2024-12-14 18:30:13 -05:00
Ajay	e7d0180e15	Change options page to sentence case	2024-12-14 16:36:02 -05:00
Ajay	0fa24dbae4	bump version	2024-12-13 03:10:54 -05:00
Ajay	975b876a74	Fix preview bar on mobile Fixes #2172	2024-12-13 03:10:17 -05:00
Ajay	557e2ea2df	Fix full size manual skip notices showing "unskip" button instead of "skip" Fixes #2160	2024-12-11 00:50:55 -05:00