Merge pull request #139 from ajayyy/experimental-ajay

Fixed preview bar causing issues
Updated version number.
2025-12-15 16:07:06 +03:00 · 2019-08-27 21:01:48 -04:00 · 2019-08-27 21:00:00 -04:00 · 2019-08-27 20:59:36 -04:00 · 2019-08-26 16:10:25 -04:00 · 2019-08-26 16:09:26 -04:00
16 changed files with 3212 additions and 2671 deletions
--- a/README.md
+++ b/README.md
@@ -1,16 +1,23 @@
-![Logo](icons/LogoSponsorBlocker256px.png)
-<br/><sub>Logo by [@munadikieh](https://github.com/munadikieh)</sub>
+<p align="center">
+  <img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img>
  
-# SponsorBlock
+  <br/>
+  <sub>Logo by <a href="https://github.com/munadikieh">@munadikieh</a></sub>
+</p>
+
+<h1 align="center">SponsorBlock</h1>
+
+<p align="center">
+  <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone">Chrome/Chromium</a> |
+  <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github">Firefox</a> |
+  <a href="https://sponsor.ajay.app">Website</a> |
+  <a href="https://sponsor.ajay.app/stats">Stats</a>
+</p>
+
+[![](https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users)](https://addons.mozilla.org/addon/sponsorblock/?src=external-github) [![](https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users)](https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone)

 SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.

-# Available for Chrome and Firefox
-
-Chrome: https://chrome.google.com/webstore/detail/ajjollijmimolcncegpgkbilohbhjnhi
-
-Firefox: https://addons.mozilla.org/addon/sponsorblock/
-
 # Server

 The backend server code is available here: https://github.com/ajayyy/SponsorBlockServer
@@ -25,10 +32,6 @@ Hopefully this project can be combined with projects like [this](https://github.

 You can read the API docs [here](https://github.com/ajayyy/SponsorBlockServer#api-docs).

-# Previous extension
-
-This project is partially based off of [this experimental extension](https://github.com/OfficialNoob/YTSponsorSkip), which has the basic video skipping functionality.
-
 # Build Yourself

 You can load this project as an unpacked extension. Make sure to rename the `config.js.example` file to `config.js` before installing.
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -45,8 +45,11 @@
    "noticeTitle": {
        "message": "Sponsor Skipped"
    },
-  "noticeClosingMessage": {
-    "message": "closes in 7s"
+    "reportButtonTitle": {
+        "message": "Report"
+    },
+    "reportButtonInfo": {
+        "message": "Report this sponsor submission as incorrect."
    },
    "Dismiss": {
        "message": "Dismiss"
@@ -66,9 +69,15 @@
    "hitGoBack": {
        "message": "Hit unskip to get to where you came from."
    },
-  "goBack": {
+    "unskip": {
        "message": "Unskip"
    },
+    "reskip": {
+        "message": "Reskip"
+    },
+    "paused": {
+        "message": "Paused"
+    },
    "confirmMSG": {
        "message": "\n\nTo edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
    },
@@ -94,7 +103,10 @@
    "noVideoID": {
        "message": "This probably isn't a YouTube tab, or you clicked too early. \n If you know this is a YouTube tab,\n close this popup and open it again."
    },
-  "Voted": {
+    "success": {
+        "message": "Success!"
+    },
+    "voted": {
        "message": "Voted!"
    },
    "voteFail": {
@@ -111,5 +123,29 @@
    },
    "leftTimes": {
        "message": "You seem to have left some sponsor times unsubmitted. Go back to that page to submit them (they are not deleted)."
+    },
+    "clearTimes": {
+        "message": "Clear Sponsor Times"
+    },
+    "openPopup": {
+        "message": "Open SponsorBlock Popup"
+    },
+    "SubmitTimes": {
+        "message": "Submit Sponsor Times"
+    },
+    "submitCheck": {
+        "message": "Are you sure you want to submit this?"
+    },
+    "longDescription": {
+        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that let's anyone submit the start and end time's of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Source Code",
+        "description": "Used on Firefox Store Page"
    }
 }
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -0,0 +1,129 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock pour YouTube - Enlève les messages commerciaux et publicités intégrées",
+        "description": "Name of the extension."
+    },
+
+    "Description": {
+        "message": "Passe automatiquement les messages commerciaux intégrés dans les vidéos YouTube. Soumettez les segments commerciaux dans les vidéos que vous regardez pour aidez les autres.",
+        "description": "Description of the extension."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Soumission invalide"
+    },
+    "429": {
+        "message": "Vous cherchez à envoyer beaucoup de segments, il y en a vraiment autant ?"
+    },
+    "409": {
+        "message": "Déja soumis"
+    },
+    "502": {
+        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
+    },
+    "channelWhitelisted": {
+        "message": "Cette chaine est sur la liste blanche !"
+    },
+    "Sponsor": {
+        "message": "message commercial"
+    },
+    "Sponsors": {
+        "message": "messages commerciaux"
+    },
+    "Segment": {
+        "message": "segment de message commercial"
+    },
+    "Segments": {
+        "message": "segments de message commercial"
+    },
+    "noticeTitle": {
+        "message": "Message passé"
+    },
+    "reportButtonTitle": {
+        "message": "Incorrect"
+    },
+    "reportButtonInfo": {
+        "message": "Signaler que ce segment est incorrect ou n'existe pas."
+    },
+    "Dismiss": {
+        "message": "Fermer"
+    },
+    "Loading": {
+        "message": "Chargement en cours..."
+    },
+    "Mins": {
+        "message": "Minutes"
+    },
+    "Secs": {
+        "message": "Secondes"
+    },
+    "Hide": {
+        "message": "Ne plus montrer"
+    },
+    "hitGoBack": {
+        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment"
+    },
+    "unskip": {
+        "message": "Revenir en arrière"
+    },
+    "reskip": {
+        "message": "Sauter"
+    },
+    "paused": {
+        "message": "En pause"
+    },
+    "confirmMSG": {
+        "message": "\n\nPour modifier ou enlever des soumissions, cliquez sur le bouton d'info."
+    },
+    "clearThis": {
+        "message": "Êtes-vous certain(e) que vous voulez enlever vos soumissions ?\n\n"
+    },
+    "Unknown": {
+        "message": "Erreur, essayer plus tard."
+    },
+    "sponsorFound": {
+        "message": "Les messages commerciaux sont déjà dans notre base de donnée pour cette vidéo !"
+    },
+    "sponsor404": {
+        "message": "Pas de messages trouvés"
+    },
+    "sponsorStart": {
+        "message": "Début du message"
+    },
+    "sponsorEnd": {
+        "message": "Fin du message"
+    },
+    "noVideoID": {
+        "message": "Ceci n'est pas un onglet YouTube, ou vous avez cliqué trop tôt. \n Si vous êtes sur(e) que c'est un onglet YouTube, fermez ce menu et réessayer."
+    },
+    "success": {
+        "message": "Succès !"
+    },
+    "voted": {
+        "message": "A voté !"
+    },
+    "voteFail": {
+        "message": "Vous avez déjà voté pour ce choix auparavant."
+    },
+    "serverDown": {
+        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
+    },
+    "connectionError": {
+        "message": "Erreur de connexion, Code : "
+    },
+    "wantToSubmit": {
+        "message": "Voulez-vous soumettre les messages pour cette vidéo"
+    },
+    "leftTimes": {
+        "message": "Vous avez laissé des messages non soumis. Retournez sur la vidéo pour les soumettre (ils ont été conservés)."
+    },
+    "submitCheck": {
+        "message": "Soumettre ce(s) message(s) ?"
+    }
+}
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -0,0 +1,127 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Nome da extensão."
+    },
+    "fullName": {
+        "message": "SponsorBlock para YouTube - Pule patrocínios",
+        "description": "Nome da extensão."
+    },
+
+    "Description": {
+        "message": "Pule patrocinadores em vídeos do YouTube. Reporte patrocinadores em videos que você assiste para salvar o tempo dos outros.",
+        "description": "Descrição da extensão."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "O servidor disse que esse pedido foi inválido"
+    },
+    "429": {
+        "message": "Você enviou muitos segmentos para esse vídeo, tem certeza que tem tantos assim?"
+    },
+    "409": {
+        "message": "Isso já foi enviado antes"
+    },
+    "502": {
+        "message": "Parece que o servidor caiu. Contate o desenvolvedor para informá-los."
+    },
+    "channelWhitelisted": {
+        "message": "Canal adicionado a lista branca!"
+    },
+    "Sponsor": {
+        "message": "patrocinador"
+    },
+    "Sponsors": {
+        "message": "patrocinadores"
+    },
+   "Segment": {
+        "message": "segmento de patrocinador"
+    },
+    "Segments": {
+        "message": "segmento de patrocinadores"
+    },
+    "noticeTitle": {
+        "message": "Patrocinador pulado"
+    },
+    "reportButtonTitle": {
+        "message": "Reportar"
+    },
+    "reportButtonInfo": {
+        "message": "Reportar essa subimissão como inválida."
+    },
+    "Dismiss": {
+        "message": "Ignorar"
+    },
+    "Loading": {
+        "message": "Carregando..."
+    },
+    "Mins": {
+        "message": "Minutos"
+    },
+    "Secs": {
+        "message": "Segundos"
+    },
+    "Hide": {
+        "message": "Nunca mostrar"
+    },
+    "hitGoBack": {
+        "message": "Aperta reverter pulo para voltar onde estava"
+    },
+    "unskip": {
+        "message": "Reverter pulo"
+    },
+    "reskip": {
+        "message": "Pular novamente"
+    },
+    "paused": {
+        "message": "Pausado"
+    },
+    "confirmMSG": {
+        "message": "\n\nPara editar ou remover linhas individuais, clique com o botão direito ou abra o popup da extensão pelo icone no canto superior direito."
+    },
+    "clearThis": {
+        "message": "Tem certeza que quer limpar isso?\n\n"
+    },
+    "Unknown": {
+        "message": "Teve um erro ao enviar seus segmentos, tente novamente depois"
+    },
+  
+    "sponsorFound": {
+        "message": "Os patrocinadores desse vídeo estão no banco de dados!"
+    },
+    "sponsor404": {
+        "message": "Nenhum patrocinador encontrado"
+    },
+    "sponsorStart": {
+        "message": "Patrocínio começa agora"
+    },
+    "sponsorEnd": {
+        "message": "Patrocínio termina agora"
+    },
+    "noVideoID": {
+        "message": "Isso provavelmente não é uma tab do YouTube, ou você clicou muito cedo. \n Se sabe que é uma tab do YouTube,\n fecha esse popup e abre de novo."
+    },
+    "success": {
+        "message": "Sucesso!"
+    },
+    "voted": {
+        "message": "Votado!"
+    },
+    "voteFail": {
+        "message": "Você já votou antes."
+    },
+    "serverDown": {
+        "message": "Parece que o servidor caiu. Contate o desenvolvedor o quanto antes."
+    },
+    "connectionError": {
+        "message": "Um erro de conexão aconteceu: Código: "
+    },
+    "wantToSubmit": {
+        "message": "Quer enviar os segmentos para o vídeo de ID"
+    },
+    "leftTimes": {
+        "message": "Parece que você esqueceu de enviar alguns segmentos. Volta pra página para enviar eles (não foram deletados)."
+    }
+}
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -0,0 +1,130 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Название расширения, не переводится."
+    },
+    "fullName": {
+        "message": "SponsorBlock для YouTube - Пропускайте спонсорские вставки",
+        "description": "Название расширения."
+    },
+
+    "Description": {
+        "message": "Пропускайте спонсорские вставки в видео на YouTube. Сообщайте о спонсорских вставках в видео, которые Вы смотрите, чтобы сэкономить время других пользователей.",
+        "description": "Описание раширения."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Сервер отклонил этот запрос."
+    },
+    "429": {
+        "message": "Вы отправили слишком много спонсоров для этого видео. Вы уверены, что их так много?"
+    },
+    "409": {
+        "message": "Этот запрос был отправлен ранее."
+    },
+    "502": {
+        "message": "Сервер недоступен. Свяжитесь с разработчиком и сообщите ему об этом."
+    },
+    "channelWhitelisted": {
+        "message": "Канал добавлен в белый список!"
+    },
+    "Sponsor": {
+        "message": "Спонсор"
+    },
+    "Sponsors": {
+        "message": "Спонсоры"
+    },
+   "Segment": {
+        "message": "спонсорская вставка"
+    },
+    "Segments": {
+        "message": "спонсорские вставки"
+    },
+    "noticeTitle": {
+        "message": "Спонсор пропущен"
+    },
+    "reportButtonTitle": {
+        "message": "Ошибка"
+    },
+    "reportButtonInfo": {
+        "message": "Сообщить, что информация об этом спонсорском сегменте ошибочна."
+    },
+    "Dismiss": {
+        "message": "Закрыть"
+    },
+    "Loading": {
+        "message": "Загрузка..."
+    },
+    "Mins": {
+        "message": "мин"
+    },
+    "Secs": {
+        "message": "сек"
+    },
+    "Hide": {
+        "message": "Не показывать"
+    },
+    "hitGoBack": {
+        "message": "Нажмите «Назад», чтобы вернуться обратно."
+    },
+    "unskip": {
+        "message": "Назад"
+    },
+    "reskip": {
+        "message": "Пропустить"
+    },
+    "paused": {
+        "message": "Пауза"
+    },
+    "confirmMSG": {
+        "message": "\n\nЧтобы изменить или удалить отдельные значения, нажмите кнопку «Информация» или откройте всплывающее окно расширения, щелкнув значок расширения в правом верхнем углу."
+    },
+    "clearThis": {
+        "message": "Вы уверены, что хотите удалить эту информацию?\n\n"
+    },
+    "Unknown": {
+        "message": "При отправке отчета о спонсорском сегменте произошла ошибка. Попытайтесь отправить его позже."
+    },
+  
+    "sponsorFound": {
+        "message": "Спонсоры этого видео уже находятся в базе данных!"
+    },
+    "sponsor404": {
+        "message": "Спонсорские вставки не найдены"
+    },
+    "sponsorStart": {
+        "message": "Спонсорская вставка начинается сейчас"
+    },
+    "sponsorEnd": {
+        "message": "Спонсорская вставка оканчивается сейчас"
+    },
+    "noVideoID": {
+        "message": "Возможно, это не вкладка YouTube, или Вы нажали слишком рано. \n Если это вкладка YouTube,\n закройте это всплывающее окно и откройте его снова."
+    },
+    "success": {
+        "message": "Успех!"
+    },
+    "voted": {
+        "message": "Голос засчитан!"
+    },
+    "voteFail": {
+        "message": "Вы уже проголосовали таким образом раньше."
+    },
+    "serverDown": {
+        "message": "Кажется, сервер не работает. Свяжитесь с разработчиком."
+    },
+    "connectionError": {
+        "message": "Ошибка соединения. Код ошибки: "
+    },
+    "wantToSubmit": {
+        "message": "Вы точно хотите отправить отчёт о спонсорских вставках в видео с идентификатором"
+    },
+    "leftTimes": {
+        "message": "Вы ещё не отправили отчёты о некоторых спонсорских вставках. Хотите вернуться на эту страницу, чтобы отправить их (они не удаляются)."
+    },
+    "submitCheck": {
+        "message": "Вы уверены, что хотите отправить эту информацию?"
+    }
+}
--- a/background.js
+++ b/background.js
@@ -33,8 +33,8 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
    case "alertPrevious":
 			chrome.notifications.create("stillThere" + Math.random(), {
        type: "basic",
-				title: "Do you want to submit the sponsor times for video id " + request.previousVideoID + "?",
-				message: "You seem to have left some sponsor times unsubmitted. Go back to that page to submit them (they are not deleted).",
+        title: chrome.i18n.getMessage("wantToSubmit") + request.previousVideoID + "?",
+        message: chrome.i18n.getMessage("leftTimes"),
        iconUrl: "./icons/LogoSponsorBlocker256px.png"
 			});
 	}
@@ -56,7 +56,6 @@ chrome.runtime.onInstalled.addListener(function (object) {
            // TODO (shownInstallPage): remove this if statement, but leave contents
            if (!shownInstallPage){
                //open up the install page
-	      
                chrome.tabs.create({url: chrome.extension.getURL("/help/"+chrome.i18n.getMessage("helpPage"))});
            }

@@ -67,13 +66,10 @@ chrome.runtime.onInstalled.addListener(function (object) {
            }

            //generate a userID
-      const newUserID = generateUUID();
+            const newUserID = generateUserID();
            //save this UUID
            chrome.storage.sync.set({
-        "userID": newUserID,
-        //the last video id loaded, to make sure it is a video id change
-        "sponsorVideoID": null,
-        "previousVideoID": null
+                "userID": newUserID
            });
        }
    });
@@ -117,6 +113,14 @@ function submitVote(type, UUID, callback) {
    chrome.storage.sync.get(["userID"], function(result) {
        let userID = result.userID;

+        if (userID == undefined || userID === "undefined") {
+            //generate one
+            userID = generateUserID();
+            chrome.storage.sync.set({
+                "userID": userID
+            });
+        }
+
        //publish this vote
        sendRequestToServer("GET", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
            if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
@@ -143,11 +147,29 @@ function submitVote(type, UUID, callback) {
 function submitTimes(videoID, callback) {
    //get the video times from storage
    let sponsorTimeKey = 'sponsorTimes' + videoID;
-  chrome.storage.sync.get([sponsorTimeKey, "userID"], function(result) {
+    chrome.storage.sync.get([sponsorTimeKey, "userID"], async function(result) {
        let sponsorTimes = result[sponsorTimeKey];
        let userID = result.userID;

        if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+            let durationResult = await new Promise((resolve, reject) => {
+                chrome.tabs.query({
+                    active: true,
+                    currentWindow: true
+                }, function(tabs) {
+                    chrome.tabs.sendMessage(tabs[0].id, {
+                        message: "getVideoDuration"
+                    }, (response) => resolve(response));
+                });
+            });
+
+            //check if a sponsor exceeds the duration of the video
+            for (let i = 0; i < sponsorTimes.length; i++) {
+                if (sponsorTimes[i][1] > durationResult.duration) {
+                    sponsorTimes[i][1] = durationResult.duration;
+                }
+            }
+
            //submit these times
            for (let i = 0; i < sponsorTimes.length; i++) {
                    //submit the sponsorTime
@@ -201,10 +223,9 @@ function sendRequestToServer(type, address, callback) {
    xmlhttp.send();
 }

-function generateUUID(length = 36) {
+function generateUserID(length = 36) {
        let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
        let result = "";
-    let isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
        if (window.crypto && window.crypto.getRandomValues) {
                values = new Uint32Array(length);
                window.crypto.getRandomValues(values);
--- a/content.css
+++ b/content.css
@@ -58,6 +58,11 @@
 	  to { opacity: 1; }
 }

+@keyframes fadeOut {
+	from { opacity: 1; }
+	  to { opacity: 0; }
+}
+
 .sponsorBlockSpacer {
 	background-color: rgb(100, 100, 100);
 	border-color: rgb(100, 100, 100);
@@ -66,7 +71,7 @@
 }

 .sponsorSkipNotice {
-    min-width: 280px;
+    min-width: 300px;
    background-color: rgba(28, 28, 28, 0.9);
    position: absolute;
 	right: 5px;
@@ -82,6 +87,10 @@
 	padding-right: 5px;
 }

+.sponsorSkipNoticeFadeOut {
+	animation: fadeOut 3s cubic-bezier(0.55, 0.055, 0.675, 0.19);
+}
+
 .sponsorSkipNoticeTimeLeft {
 	color: #eeeeee;

@@ -105,11 +114,6 @@
 	border-left: 1px solid rgb(150, 150, 150);
 }

-.sponsorSkipNoticeCloseButton {
-	height: 10px;
-    width: 10px;
-}
-
 .sponsorSkipNoticeButton {
 	background: none;
 	color: rgb(235, 235, 235);
@@ -119,6 +123,23 @@
 	cursor: pointer;

 	margin-right: 10px;
+
+    padding: 2px 5px;
+}
+
+.sponsorSkipNoticeButton:hover {
+	background-color: rgba(235, 235, 235,0.2);
+	border-radius: 4px;
+	
+	transition: background-color 0.4s;
+}
+
+.sponsorTimesVoteButtonsContainer {
+	float: left;
+	
+	padding: 2px 5px;
+
+	margin-right: 4px;
 }

 .sponsorSkipNoticeRightSection {
@@ -131,8 +152,17 @@
 }

 .sponsorSkipNoticeRightButton {
-    margin-left: 7px;
-	padding: 0px;
+	margin-right: 0;
+}
+
+.sponsorSkipNoticeCloseButton {
+	height: 10px;
+	width: 10px;
+	
+	padding: 2px 5px;
+
+	margin-left: 2px;
+    float: right;
 }

 .sponsorSkipMessage {
@@ -178,7 +208,7 @@
 }

 .voteButton {
-	height: 18px;
+	height: 17px;
 	cursor: pointer;
 }
 .voteButton:hover {
--- a/content.js
+++ b/content.js
@@ -10,9 +10,6 @@ var sponsorVideoID = null;
 //these are sponsors that have been downvoted
 var hiddenSponsorTimes = [];

-//the time this video is starting at when first played, if not zero
-var youtubeVideoStartTime = null;
-
 //the video
 var v;

@@ -31,18 +28,17 @@ var channelURL;
 var channelWhitelisted = false;

 // create preview bar
-var previewBar;
+var previewBar = null;

-if (id = getYouTubeVideoID(document.URL)) { // Direct Links
-  videoIDChange(id);
-}
+//the player controls on the YouTube player
+var controls = null;
+
+// Direct Links
+videoIDChange(getYouTubeVideoID(document.URL));

 //the last time looked at (used to see if this time is in the interval)
 var lastTime = -1;

-//the actual time (not video time) that the last skip happened
-var lastUnixTimeSkipped = -1;
-
 //the amount of times the sponsor lookup has retried
 //this only happens if there is an error
 var sponsorLookupRetries = 0;
@@ -61,10 +57,6 @@ var hideVideoPlayerControls = false;
 var hideInfoButtonPlayerControls = false;
 var hideDeleteButtonPlayerControls = false;

-//the downloaded sponsor times
-var sponsorTimes = [];
-var UUIDs = [];
-
 //the sponsor times being prepared to be submitted
 var sponsorTimesSubmitting = [];

@@ -100,11 +92,7 @@ function messageListener(request, sender, sendResponse) {
        //messages from popup script
  
        if (request.message == "update") {
-      if(id = getYouTubeVideoID(document.URL)){
-        videoIDChange(id);
-      } else {
-        resetValues();
-      }
+			videoIDChange(getYouTubeVideoID(document.URL));
        }
  
        if (request.message == "sponsorStart") {
@@ -134,10 +122,16 @@ function messageListener(request, sender, sendResponse) {

        if (request.message == "getVideoID") {
            sendResponse({
-        videoID: getYouTubeVideoID(document.URL)
+                videoID: sponsorVideoID
            })
        }

+        if (request.message == "getVideoDuration") {
+            sendResponse({
+                duration: v.duration
+            });
+        }
+
        if (request.message == "skipToTime") {
            v.currentTime = request.time;
        }
@@ -162,7 +156,7 @@ function messageListener(request, sender, sendResponse) {

        if (request.message == "whitelistChange") {
            channelWhitelisted = request.value;
-      sponsorsLookup(getYouTubeVideoID(document.URL));
+            sponsorsLookup(sponsorVideoID);
        }

        if (request.message == "showNoticeAgain") {
@@ -214,29 +208,40 @@ document.onkeydown = function(e){
 function resetValues() {
    //reset last sponsor times
    lastTime = -1;
-  lastUnixTimeSkipped = -1;

    //reset sponsor times
    sponsorTimes = null;
    UUIDs = null;
-  sponsorVideoID = id;
    sponsorLookupRetries = 0;

    //empty the preview bar
+    if (previewBar !== null) {
        previewBar.set([], [], 0);
+    }

    //reset sponsor data found check
    sponsorDataFound = false;
 }

 function videoIDChange(id) {
-  //not a url change
-  if (sponsorVideoID == id) return;
+    //if the id has not changed return
+    if (sponsorVideoID === id) return;

+    //set the global videoID
+    sponsorVideoID = id;
+
+	resetValues();
+	
+	//id is not valid
+    if (!id) return;
+
+    //setup the preview bar
    if (previewBar == null) {
        //create it
+        wait(getControls).then(result => {
            let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
            previewBar = new PreviewBar(progressBar);
+        });
    }

    //warn them if they had unsubmitted times
@@ -265,20 +270,16 @@ function videoIDChange(id) {
    //close popup
    closeInfoMenu();
 	
-  resetValues();
-
-  //see if there is a video start time
-  youtubeVideoStartTime = getYouTubeVideoStartTime(document.URL);
-
    sponsorsLookup(id);

    //make sure everything is properly added
-  updateVisibilityOfPlayerControlsButton(true);
+    updateVisibilityOfPlayerControlsButton();

    //reset sponsor times submitting
    sponsorTimesSubmitting = [];

    //see if the onvideo control image needs to be changed
+	wait(getControls).then(result => {
 		chrome.runtime.sendMessage({
 			message: "getSponsorTimes",
 			videoID: id
@@ -296,9 +297,12 @@ function videoIDChange(id) {
 				//see if this data should be saved in the sponsorTimesSubmitting variable
 				if (sponsorTimes != undefined && sponsorTimes.length > 0) {
 					sponsorTimesSubmitting = sponsorTimes;
+          
+                    updatePreviewBar();
 				}
 			}
 		});
+	});

    //see if video controls buttons should be added
    chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
@@ -341,6 +345,9 @@ function sponsorsLookup(id) {
    }
  
    //check database for sponsor times
+
+    //made true once a setTimeout has been created to try again after a server error
+    let recheckStarted = false;
    sendRequestToServer('GET', "/api/getVideoSponsorTimes?videoID=" + id, function(xmlhttp) {
        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
            sponsorDataFound = true;
@@ -376,7 +383,9 @@ function sponsorsLookup(id) {
            });

            sponsorLookupRetries = 0;
-    } else if (xmlhttp.readyState == 4 && sponsorLookupRetries < 90) {
+        } else if (xmlhttp.readyState == 4 && sponsorLookupRetries < 90 && !recheckStarted) {
+            recheckStarted = true;
+
            //some error occurred, try again in a second
            setTimeout(() => sponsorsLookup(id), 1000);

@@ -391,10 +400,24 @@ function sponsorsLookup(id) {
 }

 function updatePreviewBar() {
-  previewBar.set(sponsorTimes, [], v.duration);
+    let localSponsorTimes = sponsorTimes;
+    if (localSponsorTimes == null) localSponsorTimes = [];
+
+    let allSponsorTimes = localSponsorTimes.concat(sponsorTimesSubmitting);
+
+    //create an array of the sponsor types
+    let types = [];
+    for (let i = 0; i < localSponsorTimes.length; i++) {
+        types.push("sponsor");
+    }
+    for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
+        types.push("previewSponsor");
+    }
+
+    wait(() => previewBar !== null).then((result) => previewBar.set(allSponsorTimes, types, v.duration));

    //update last video id
-  lastPreviewBarUpdate = getYouTubeVideoID(document.URL);
+    lastPreviewBarUpdate = sponsorVideoID;
 }

 function getChannelID() {
@@ -476,7 +499,7 @@ function checkSponsorTime(sponsorTimes, index, openNotice) {
        lastTime = v.currentTime - 0.0001;
    }

-  if (checkIfTimeToSkip(v.currentTime, sponsorTimes[index][0]) && !hiddenSponsorTimes.includes(index)) {
+    if (checkIfTimeToSkip(v.currentTime, sponsorTimes[index][0], sponsorTimes[index][1]) && !hiddenSponsorTimes.includes(index)) {
        //skip it
        skipToTime(v, index, sponsorTimes, openNotice);

@@ -487,15 +510,13 @@ function checkSponsorTime(sponsorTimes, index, openNotice) {
    return false;
 }

-function checkIfTimeToSkip(currentVideoTime, startTime) {
-  let currentTime = Date.now();
-
+function checkIfTimeToSkip(currentVideoTime, startTime, endTime) {
    //If the sponsor time is in between these times, skip it
    //Checks if the last time skipped to is not too close to now, to make sure not to get too many
    //  sponsor times in a row (from one troll)
    //the last term makes 0 second start times possible only if the video is not setup to start at a different time from zero
-  return (Math.abs(currentVideoTime - startTime) < 0.3 && startTime >= lastTime && startTime <= currentVideoTime && 
-      (lastUnixTimeSkipped == -1 || currentTime - lastUnixTimeSkipped > 500)) || (lastTime == -1 && startTime == 0 && youtubeVideoStartTime == null)
+    return (Math.abs(currentVideoTime - startTime) < 3 && startTime >= lastTime && startTime <= currentVideoTime) || 
+                (lastTime == -1 && startTime == 0 && currentVideoTime < endTime)
 }

 //skip fromt he start time to the end time for a certain index sponsor time
@@ -509,76 +530,93 @@ function skipToTime(v, index, sponsorTimes, openNotice) {

    if (openNotice) {
        //send out the message saying that a sponsor message was skipped
-    openSkipNotice(currentUUID);
+        if (!dontShowNotice) {
+            new SkipNotice(this, currentUUID);

-    setTimeout(() => closeSkipNotice(currentUUID), 7000);
+            //auto-upvote this sponsor
+            if (trackViewCount) {
+                vote(1, currentUUID, null);
+            }
+        }
+    }

    //send telemetry that a this sponsor was skipped happened
    if (trackViewCount) {
        sendRequestToServer("GET", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
-
-      //upvote this
-      vote(1, currentUUID, true);
-    }
    }
 }

-function goBackToPreviousTime(UUID) {
+function unskipSponsorTime(UUID) {
    if (sponsorTimes != null) {
        //add a tiny bit of time to make sure it is not skipped again
        v.currentTime = sponsorTimes[UUIDs.indexOf(UUID)][0] + 0.001;
-
-    closeSkipNotice(UUID);
    }
 }

-//Adds a sponsorship starts button to the player controls
-function addPlayerControlsButton() {
-  if (document.getElementById("startSponsorButton") != null) {
-    //it's already added
-    return;
+function reskipSponsorTime(UUID) {
+    if (sponsorTimes != null) {
+        //add a tiny bit of time to make sure it is not skipped again
+        v.currentTime = sponsorTimes[UUIDs.indexOf(UUID)][1];
    }
-
-  let startSponsorButton = document.createElement("button");
-  startSponsorButton.id = "startSponsorButton";
-  startSponsorButton.className = "ytp-button playerButton";
-  startSponsorButton.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
-  startSponsorButton.addEventListener("click", startSponsorClicked);
-
-  let startSponsorImage = document.createElement("img");
-  startSponsorImage.id = "startSponsorImage";
-  startSponsorImage.className = "playerButtonImage";
-  startSponsorImage.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
-
-  //add the image to the button
-  startSponsorButton.appendChild(startSponsorImage);
-
-  let controls = document.getElementsByClassName("ytp-right-controls");
-  let referenceNode = controls[controls.length - 1];
-
-  if (referenceNode == undefined) {
-    //page not loaded yet
-    setTimeout(addPlayerControlsButton, 100);
-    return;
-  }
-
-  referenceNode.prepend(startSponsorButton);
 }

 function removePlayerControlsButton() {
+    if (!sponsorVideoID) return;
+
    document.getElementById("startSponsorButton").style.display = "none";
    document.getElementById("submitButton").style.display = "none";
 }

+function createButton(baseID, title, callback, imageName, isDraggable=false) {
+    if (document.getElementById(baseID + "Button") != null) return;
+
+    // Button HTML
+    let newButton = document.createElement("button");
+    newButton.draggable = isDraggable;
+    newButton.id = baseID + "Button";
+    newButton.className = "ytp-button playerButton";
+    newButton.setAttribute("title", chrome.i18n.getMessage(title));
+    newButton.addEventListener("click", callback);
+
+    // Image HTML
+    let newButtonImage = document.createElement("img");
+    newButton.draggable = isDraggable;
+    newButtonImage.id = baseID + "Image";
+    newButtonImage.className = "playerButtonImage";
+    newButtonImage.src = chrome.extension.getURL("icons/" + imageName);
+
+    // Append image to button
+    newButton.appendChild(newButtonImage);
+
+    // Add the button to player
+    controls.prepend(newButton);
+}
+
+function getControls() {
+    let controls = document.getElementsByClassName("ytp-right-controls");
+    return (!controls || controls.length === 0) ? false : controls[controls.length - 1]
+};
+
+//adds all the player controls buttons
+function createButtons() {
+    wait(getControls).then(result => {
+        //set global controls variable
+        controls = result;
+
+        // Add button if does not already exist in html
+        createButton("startSponsor", "sponsorStart", startSponsorClicked, "PlayerStartIconSponsorBlocker256px.png");	  
+        createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker256px.png")
+        createButton("delete", "clearTimes", clearSponsorTimes, "PlayerDeleteIconSponsorBlocker256px.png");
+        createButton("submit", "SubmitTimes", submitSponsorTimes, "PlayerUploadIconSponsorBlocker256px.png");
+    });
+}
 //adds or removes the player controls button to what it should be
 function updateVisibilityOfPlayerControlsButton() {
    //not on a proper video yet
-  if (!getYouTubeVideoID(document.URL)) return;
+    if (!sponsorVideoID) return;
+
+    createButtons();
 	
-  addPlayerControlsButton();
-  addInfoButton();
-  addDeleteButton();
-  addSubmitButton();
    if (hideVideoPlayerControls) {
        removePlayerControlsButton();
    }
@@ -600,7 +638,7 @@ function startSponsorClicked() {
    chrome.runtime.sendMessage({
        message: "addSponsorTime",
        time: v.currentTime,
-    videoID: getYouTubeVideoID(document.URL)
+        videoID: sponsorVideoID
    }, function(response) {
        //see if the sponsorTimesSubmitting needs to be updated
        updateSponsorTimesSubmitting();
@@ -610,7 +648,7 @@ function startSponsorClicked() {
 function updateSponsorTimesSubmitting() {
    chrome.runtime.sendMessage({
        message: "getSponsorTimes",
-    videoID: getYouTubeVideoID(document.URL)
+        videoID: sponsorVideoID
    }, function(response) {
        if (response != undefined) {
            let sponsorTimes = response.sponsorTimes;
@@ -618,18 +656,27 @@ function updateSponsorTimesSubmitting() {
            //see if this data should be saved in the sponsorTimesSubmitting variable
            if (sponsorTimes != undefined) {
                sponsorTimesSubmitting = sponsorTimes;
+
+                updatePreviewBar();
            }
        }
    });
 }

-function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+//is the submit button on the player loaded yet
+function isSubmitButtonLoaded() {
+    return document.getElementById("submitButton") !== null;
+}
+
+async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+    if(!sponsorVideoID) return false;
+    
+    //make sure submit button is loaded
+    await wait(isSubmitButtonLoaded);
+    
    //if it isn't visible, there is no data
-  if (uploadButtonVisible && !hideDeleteButtonPlayerControls) {
-    document.getElementById("deleteButton").style.display = "unset";
-  } else {
-    document.getElementById("deleteButton").style.display = "none";
-  }
+    let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none"
+    document.getElementById("deleteButton").style.display = shouldHide;

    if (showStartSponsor) {
        showingStartSponsor = true;
@@ -656,112 +703,6 @@ function toggleStartSponsorButton() {
    changeStartSponsorButton(!showingStartSponsor, true);
 }

-//shows the info button on the video player
-function addInfoButton() {
-  if (document.getElementById("infoButton") != null) {
-    //it's already added
-    return;
-  }
-  
-  //make a submit button
-  let infoButton = document.createElement("button");
-  infoButton.id = "infoButton";
-  infoButton.className = "ytp-button playerButton";
-  infoButton.setAttribute("title", "Open SponsorBlock Popup");
-  infoButton.addEventListener("click", openInfoMenu);
-
-  let infoImage = document.createElement("img");
-  infoImage.id = "infoButtonImage";
-  infoImage.className = "playerButtonImage";
-  infoImage.src = chrome.extension.getURL("icons/PlayerInfoIconSponsorBlocker256px.png");
-
-  //add the image to the button
-  infoButton.appendChild(infoImage);
-
-  let controls = document.getElementsByClassName("ytp-right-controls");
-  let referenceNode = controls[controls.length - 1];
-
-  if (referenceNode == undefined) {
-    //page not loaded yet
-    setTimeout(addInfoButton, 100);
-    return;
-  }
-
-  referenceNode.prepend(infoButton);
-}
-
-//shows the delete button on the video player
-function addDeleteButton() {
-  if (document.getElementById("deleteButton") != null) {
-    //it's already added
-    return;
-  }
-  
-  //make a submit button
-  let deleteButton = document.createElement("button");
-  deleteButton.id = "deleteButton";
-  deleteButton.className = "ytp-button playerButton";
-  deleteButton.setAttribute("title", "Clear Sponsor Times");
-  deleteButton.addEventListener("click", clearSponsorTimes);
-  //hide it at the start
-  deleteButton.style.display = "none";
-
-  let deleteImage = document.createElement("img");
-  deleteImage.id = "deleteButtonImage";
-  deleteImage.className = "playerButtonImage";
-  deleteImage.src = chrome.extension.getURL("icons/PlayerDeleteIconSponsorBlocker256px.png");
-
-  //add the image to the button
-  deleteButton.appendChild(deleteImage);
-
-  let controls = document.getElementsByClassName("ytp-right-controls");
-  let referenceNode = controls[controls.length - 1];
-  
-  if (referenceNode == undefined) {
-    //page not loaded yet
-    setTimeout(addDeleteButton, 100);
-    return;
-  }
-
-  referenceNode.prepend(deleteButton);
-}
-
-//shows the submit button on the video player
-function addSubmitButton() {
-  if (document.getElementById("submitButton") != null) {
-    //it's already added
-    return;
-  }
-  
-  //make a submit button
-  let submitButton = document.createElement("button");
-  submitButton.id = "submitButton";
-  submitButton.className = "ytp-button playerButton";
-  submitButton.setAttribute("title", "Submit Sponsor Times");
-  submitButton.addEventListener("click", submitSponsorTimes);
-  //hide it at the start
-  submitButton.style.display = "none";
-
-  let submitImage = document.createElement("img");
-  submitImage.id = "submitButtonImage";
-  submitImage.className = "playerButtonImage";
-  submitImage.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
-
-  //add the image to the button
-  submitButton.appendChild(submitImage);
-
-  let controls = document.getElementsByClassName("ytp-right-controls");
-  let referenceNode = controls[controls.length - 1];
-
-  if (referenceNode == undefined) {
-    //page not loaded yet
-    setTimeout(addSubmitButton, 100);
-    return;
-  }
-  
-  referenceNode.prepend(submitButton);
-}
-
 function openInfoMenu() {
    if (document.getElementById("sponsorBlockPopupContainer") != null) {
        //it's already added
@@ -826,7 +767,7 @@ function clearSponsorTimes() {
    //it can't update to this info yet
    closeInfoMenu();

-  let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
    chrome.storage.sync.get([sponsorTimeKey], function(result) {
@@ -844,235 +785,20 @@ function clearSponsorTimes() {
            //clear sponsor times submitting
            sponsorTimesSubmitting = [];

+            updatePreviewBar();
+
            //set buttons to be correct
            changeStartSponsorButton(true, false);
        }
    });
 }

-//Opens the notice that tells the user that a sponsor was just skipped
-function openSkipNotice(UUID){
-  if (dontShowNotice) {
-    //don't show, return
-    return;
-  }
-
-  let amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
-
-  if (amountOfPreviousNotices > 0) {
-    //already exists
-
-    let previousNotice = document.getElementsByClassName("sponsorSkipNotice")[0];
-    previousNotice.classList.add("secondSkipNotice")
-  }
-
-  let noticeElement = document.createElement("div");
-  //what sponsor time this is about
-  noticeElement.id = "sponsorSkipNotice" + UUID;
-  noticeElement.classList.add("sponsorSkipObject");
-  noticeElement.classList.add("sponsorSkipNotice");
-  noticeElement.style.zIndex = 50 + amountOfPreviousNotices;
-
-  //the row that will contain the info
-  let firstRow = document.createElement("tr");
-  firstRow.id = "sponsorSkipNoticeFirstRow" + UUID;
-
-  let logoColumn = document.createElement("td");
-
-  let logoElement = document.createElement("img");
-  logoElement.id = "sponsorSkipLogo" + UUID;
-  logoElement.className = "sponsorSkipLogo sponsorSkipObject";
-  logoElement.src = chrome.extension.getURL("icons/IconSponsorBlocker256px.png");
-
-  let noticeMessage = document.createElement("span");
-  noticeMessage.id = "sponsorSkipMessage" + UUID;
-  noticeMessage.classList.add("sponsorSkipMessage");
-  noticeMessage.classList.add("sponsorSkipObject");
-  noticeMessage.innerText = chrome.i18n.getMessage("noticeTitle");
-
-  //create the first column
-  logoColumn.appendChild(logoElement);
-  logoColumn.appendChild(noticeMessage);
-
-  //add the x button
-  let closeButtonContainer = document.createElement("td");
-  closeButtonContainer.className = "sponsorSkipNoticeRightSection";
-  closeButtonContainer.style.top = "11px";
-
-  let timeLeft = document.createElement("span");
-  timeLeft.innerText = chrome.i18n.getMessage("noticeClosingMessage");
-  timeLeft.className = "sponsorSkipObject sponsorSkipNoticeTimeLeft";
-
-  let hideButton = document.createElement("img");
-  hideButton.src = chrome.extension.getURL("icons/close.png");
-  hideButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton";
-  hideButton.addEventListener("click", () => closeSkipNotice(UUID));
-
-  closeButtonContainer.appendChild(timeLeft);
-  closeButtonContainer.appendChild(hideButton);
-
-  //add all objects to first row
-  firstRow.appendChild(logoColumn);
-  firstRow.appendChild(closeButtonContainer);
-
-  let spacer = document.createElement("hr");
-  spacer.id = "sponsorSkipNoticeSpacer" + UUID;
-  spacer.className = "sponsorBlockSpacer";
-
-  //the row that will contain the buttons
-  let secondRow = document.createElement("tr");
-  secondRow.id = "sponsorSkipNoticeSecondRow" + UUID;
-  
-  //thumbs up and down buttons
-  let voteButtonsContainer = document.createElement("td");
-  voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + UUID;
-
-  let downvoteButton = document.createElement("img");
-  downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + UUID;
-  downvoteButton.className = "sponsorSkipObject voteButton";
-  downvoteButton.src = chrome.extension.getURL("icons/report.png");
-  downvoteButton.addEventListener("click", () => vote(0, UUID));
-
-  //add thumbs up and down buttons to the container
-  voteButtonsContainer.appendChild(downvoteButton);
-
-  //add unskip button
-  let unskipContainer = document.createElement("td");
-  unskipContainer.className = "sponsorSkipNoticeUnskipSection";
-
-  let unskipButton = document.createElement("button");
-  unskipButton.innerText = chrome.i18n.getMessage("goBack");
-  unskipButton.className = "sponsorSkipObject sponsorSkipNoticeButton";
-  unskipButton.addEventListener("click", () => goBackToPreviousTime(UUID));
-
-  unskipContainer.appendChild(unskipButton);
-
-  //add don't show again button
-  let dontshowContainer = document.createElement("td");
-  dontshowContainer.className = "sponsorSkipNoticeRightSection";
-
-  let dontShowAgainButton = document.createElement("button");
-  dontShowAgainButton.innerText = chrome.i18n.getMessage("Hide");
-  dontShowAgainButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton";
-  dontShowAgainButton.addEventListener("click", dontShowNoticeAgain);
-
-  dontshowContainer.appendChild(dontShowAgainButton);
-
-  //add to row
-  secondRow.appendChild(voteButtonsContainer);
-  secondRow.appendChild(unskipContainer);
-  secondRow.appendChild(dontshowContainer);
-
-  noticeElement.appendChild(firstRow);
-  noticeElement.appendChild(spacer);
-  noticeElement.appendChild(secondRow);
-
-  let referenceNode = document.getElementById("movie_player");
-  if (referenceNode == null) {
-    //for embeds
-    let player = document.getElementById("player");
-    referenceNode = player.firstChild;
-    let index = 1;
-
-    //find the child that is the video player (sometimes it is not the first)
-    while (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed")) {
-      referenceNode = player.children[index];
-
-      index++;
-    }
-  }
-
-  referenceNode.prepend(noticeElement);
-}
-
-function afterDownvote(UUID) {
-  addVoteButtonInfo(chrome.i18n.getMessage("Voted"), UUID);
-  addNoticeInfoMessage(chrome.i18n.getMessage("hitGoBack"), UUID);
-
-  //remove this sponsor from the sponsors looked up
-  //find which one it is
-  for (let i = 0; i < sponsorTimes.length; i++) {
-    if (UUIDs[i] == UUID) {
-      //this one is the one to hide
-      
-      //add this as a hidden sponsorTime
-      hiddenSponsorTimes.push(i);
-
-      let sponsorTimesLeft = sponsorTimes.slice();
-      for (let j = 0; j < hiddenSponsorTimes.length; j++) {
-        //remove this sponsor time
-        sponsorTimesLeft.splice(hiddenSponsorTimes[j], 1);
-      }
-
-      //update the preview
-      previewBar.set(sponsorTimesLeft, [], v.duration);
-
-      break;
-    }
-  }
-}
-
-function addNoticeInfoMessage(message, UUID) {
-  let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + UUID);
-  if (previousInfoMessage != null) {
-    //remove it
-    document.getElementById("sponsorSkipNotice" + UUID).removeChild(previousInfoMessage);
-  }
-
-  //add info
-  let thanksForVotingText = document.createElement("p");
-  thanksForVotingText.id = "sponsorTimesInfoMessage" + UUID;
-  thanksForVotingText.className = "sponsorTimesInfoMessage";
-  thanksForVotingText.innerText = message;
-
-  //add element to div
-  document.getElementById("sponsorSkipNotice" + UUID).insertBefore(thanksForVotingText, document.getElementById("sponsorSkipNoticeSpacer" + UUID));
-}
-
-function resetNoticeInfoMessage(UUID) {
-  let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + UUID);
-  if (previousInfoMessage != null) {
-    //remove it
-    document.getElementById("sponsorSkipNotice" + UUID).removeChild(previousInfoMessage);
-  }
-}
-
-function addVoteButtonInfo(message, UUID) {
-  resetVoteButtonInfo(UUID);
-
-  //hide vote button
-  let downvoteButton = document.getElementById("sponsorTimesDownvoteButtonsContainer" + UUID);
-  if (downvoteButton != null) {
-    document.getElementById("sponsorTimesDownvoteButtonsContainer" + UUID).style.display = "none";
-  }
-
-  //add info
-  let thanksForVotingText = document.createElement("td");
-  thanksForVotingText.id = "sponsorTimesVoteButtonInfoMessage" + UUID;
-  thanksForVotingText.className = "sponsorTimesInfoMessage sponsorTimesVoteButtonMessage";
-  thanksForVotingText.innerText = message;
-
-  //add element to div
-  document.getElementById("sponsorSkipNoticeSecondRow" + UUID).prepend(thanksForVotingText);
-}
-
-function resetVoteButtonInfo(UUID) {
-  let previousInfoMessage = document.getElementById("sponsorTimesVoteButtonInfoMessage" + UUID);
-  if (previousInfoMessage != null) {
-    //remove it
-    document.getElementById("sponsorSkipNoticeSecondRow" + UUID).removeChild(previousInfoMessage);
-  }
-
-  //show button again
-  document.getElementById("sponsorTimesDownvoteButtonsContainer" + UUID).style.removeProperty("display");
-}
-
-//if inTheBackground is true, then no UI methods will be called
-function vote(type, UUID, inTheBackground = false) {
-  if (!inTheBackground) {
+//if skipNotice is null, it will not affect the UI
+function vote(type, UUID, skipNotice) {
+    if (skipNotice != null) {
        //add loading info
-    addVoteButtonInfo("Loading...", UUID)
-    resetNoticeInfoMessage(UUID);
+        skipNotice.addVoteButtonInfo.bind(skipNotice)("Loading...")
+        skipNotice.resetNoticeInfoMessage.bind(skipNotice)();
    }

    chrome.runtime.sendMessage({
@@ -1082,24 +808,24 @@ function vote(type, UUID, inTheBackground = false) {
    }, function(response) {
        if (response != undefined) {
            //see if it was a success or failure
-      if (!inTheBackground) {
+            if (skipNotice != null) {
                if (response.successType == 1) {
                    //success
                    if (type == 0) {
-            afterDownvote(UUID);
+                        skipNotice.afterDownvote.bind(skipNotice)();
                    }
                } else if (response.successType == 0) {
                    //failure: duplicate vote
-          addNoticeInfoMessage(chrome.i18n.getMessage("voteFAIL"), UUID)
-          resetVoteButtonInfo(UUID);
+                    skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("voteFail"))
+                    skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                } else if (response.successType == -1) {
                    if (response.statusCode == 502) {
-            addNoticeInfoMessage(chrome.i18n.getMessage("serverDown"), UUID)
-            resetVoteButtonInfo(UUID);
+                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("serverDown"))
+                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                    } else {
                        //failure: unknown error
-            addNoticeInfoMessage(chrome.i18n.getMessage("connectionError") + response.statusCode, UUID);
-            resetVoteButtonInfo(UUID);
+                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("connectionError") + response.statusCode);
+                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                    }
                }
            }
@@ -1107,14 +833,6 @@ function vote(type, UUID, inTheBackground = false) {
    });
 }

-//Closes the notice that tells the user that a sponsor was just skipped for this UUID
-function closeSkipNotice(UUID){
-  let notice = document.getElementById("sponsorSkipNotice" + UUID);
-  if (notice != null) {
-    notice.remove();
-  }
-}
-
 //Closes all notices that tell the user that a sponsor was just skipped
 function closeAllSkipNotices(){
    let notices = document.getElementsByClassName("sponsorSkipNotice");
@@ -1152,15 +870,24 @@ function submitSponsorTimes() {
    //it can't update to this info yet
    closeInfoMenu();

-  let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
    chrome.storage.sync.get([sponsorTimeKey], function(result) {
        let sponsorTimes = result[sponsorTimeKey];

        if (sponsorTimes != undefined && sponsorTimes.length > 0) {
-      let confirmMessage = "Are you sure you want to submit this?\n\n" + getSponsorTimesMessage(sponsorTimes);
-      confirmMessage += "\n\nTo edit or delete values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+            //check if a sponsor exceeds the duration of the video
+            for (let i = 0; i < sponsorTimes.length; i++) {
+                if (sponsorTimes[i][1] > v.duration) {
+                    sponsorTimes[i][1] = v.duration;
+                }
+            }
+            //update sponsorTimes
+            chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
+
+            let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes);
+            confirmMessage += "\n\n" + chrome.i18n.getMessage("confirmMSG");
            if(!confirm(confirmMessage)) return;

            sendSubmitMessage();
@@ -1173,10 +900,10 @@ function submitSponsorTimes() {
 //called after all the checks have been made that it's okay to do so
 function sendSubmitMessage(){
    //add loading animation
-  document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
+    document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
    document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite";

-  let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    chrome.runtime.sendMessage({
        message: "submitTimes",
@@ -1206,10 +933,9 @@ function sendSubmitMessage(){
                //request the sponsors from the server again
                sponsorsLookup(currentVideoID);
            } else {
-        //for a more detailed error message, they should check the popup
                //show that the upload failed
                document.getElementById("submitButton").style.animation = "unset";
-        document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");
+                document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");

                if([400,429,409,502].includes(response.statusCode)) {
                    alert(chrome.i18n.getMessage(response.statusCode));
--- a/firefox_manifest-extra.json
+++ b/firefox_manifest-extra.json
@@ -0,0 +1,8 @@
+{
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "sponsorBlocker@ajay.app",
+      "strict_min_version": "57.0"
+    }
+  }
+}
--- a/firefox_manifest.json
+++ b/firefox_manifest.json
@@ -1,68 +0,0 @@
-{
-  "name": "SponsorBlock - YouTube Sponsorship Blocker",
-  "short_name": "SponsorBlock",
-  "version": "1.0.12",
-  "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.",
-  "content_scripts": [
-    {
-      "matches": [
-        "https://*.youtube.com/*"
-      ],
-      "js": [
-        "config.js",
-        "content.js",
-        "popup.js"
-      ],
-      "css": [
-        "content.css",
-        "./libs/Source+Sans+Pro.css",
-        "popup.css"
-      ]
-    }
-  ],
-  "web_accessible_resources": [
-    "icons/LogoSponsorBlocker256px.png",
-    "icons/IconSponsorBlocker256px.png",
-    "icons/PlayerStartIconSponsorBlocker256px.png",
-    "icons/PlayerStopIconSponsorBlocker256px.png",
-    "icons/PlayerUploadIconSponsorBlocker256px.png",
-    "icons/PlayerUploadFailedIconSponsorBlocker256px.png",
-    "icons/upvote.png",
-    "icons/downvote.png",
-    "icons/PlayerInfoIconSponsorBlocker256px.png",
-    "icons/PlayerDeleteIconSponsorBlocker256px.png",
-    "popup.html",
-    "help/index.html",
-    "help/style.css"
-  ],
-  "permissions": [
-    "tabs",
-    "storage",
-    "notifications",
-    "https://sponsor.ajay.app/*"
-  ],
-  "browser_action": {
-    "default_title": "SponsorBlock",
-    "default_popup": "popup.html"
-  }, 
-  "background": {
-    "scripts":[
-      "config.js",
-      "background.js"
-    ]
-  },
-  "icons": {
-    "16": "icons/IconSponsorBlocker16px.png",
-    "32": "icons/IconSponsorBlocker32px.png",
-    "64": "icons/LogoSponsorBlocker64px.png",
-    "128": "icons/LogoSponsorBlocker128px.png",
-    "256": "icons/LogoSponsorBlocker256px.png"
-  },
-  "browser_specific_settings": {
-    "gecko": {
-      "id": "sponsorBlocker@ajay.app",
-      "strict_min_version": "57.0"
-    }
-  },
-  "manifest_version": 2
-}
--- a/manifest.json
+++ b/manifest.json
@@ -1,18 +1,20 @@
 {
  "name": "__MSG_fullName__",
  "short_name": "__MSG_Name__",
-  "version": "1.0.37",
+  "version": "1.1.7",
  "default_locale": "en",
  "description": "__MSG_Description__",
  "content_scripts": [
    {
      "matches": [
-        "https://*.youtube.com/*"
+        "https://*.youtube.com/*",
+        "https://www.youtube-nocookie.com/embed/*"
      ],
      "all_frames": true,
      "js": [
        "config.js",
        "utils/previewBar.js",
+        "utils/skipNotice.js",
        "utils.js",
        "content.js",
        "popup.js"
--- a/popup.css
+++ b/popup.css
@@ -110,17 +110,17 @@ h1.popupElement {
 	text-decoration:none;
 	text-shadow:0px 0px 0px #27663c;
    }
-  .whitelistButton:hover.popupElement {
+.whitelistButton:hover.popupElement {
    background-color:#218b26;
-  }
-  .whitelistButton:focus.popupElement {
+}
+.whitelistButton:focus.popupElement {
    outline: none;
    background-color:#218b26;
-  }
-  .whitelistButton:active.popupElement {
+}
+.whitelistButton:active.popupElement {
    position:relative;
    top:1px;
-  }
+}

 .greenButton.popupElement {
    background-color:#ec1c1c;
--- a/popup.js
+++ b/popup.js
@@ -799,7 +799,13 @@ function runThePopup() {

                        clearTimes();
                    } else {
-            let errorMessage = getErrorMessage(response.statusCode);
+                        let errorMessage = "";
+                        
+                        if([400,429,409,502].includes(response.statusCode)) {
+                            errorMessage = chrome.i18n.getMessage(response.statusCode);
+                        } else {
+                            errorMessage = chrome.i18n.getMessage("connectionError") + response.statusCode;
+                        }

                        document.getElementById("submitTimesInfoMessage").innerText = errorMessage;
                        document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
@@ -975,7 +981,7 @@ function runThePopup() {
    //set it to false
    function resetStartTimeChosen() {
        startTimeChosen = false;
-    SB.sponsorStart.innerHTML = "SP_START";
+        SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorStart");
    }
  
    //hides and shows the submit times button when needed
@@ -1010,11 +1016,14 @@ function runThePopup() {

                    SB.setUsernameContainer.style.display = "none";
                    SB.setUsername.style.display = "unset";
-        } else {
+                    
+                    SB.setUsernameStatusContainer.style.display = "none";
+                } else if (xmlhttp.readyState == 4) {
                    SB.setUsername.style.display = "unset";
                    SB.submitUsername.style.display = "none";
                    SB.usernameInput.style.display = "none";

+                    SB.setUsernameStatusContainer.style.display = "unset";
                    SB.setUsernameStatus.innerText = "Couldn't connect to server. Error code: " + xmlhttp.status;
                }
            });
@@ -1035,11 +1044,17 @@ function runThePopup() {
                    SB.submitUsername.style.display = "none";
                    SB.usernameInput.style.display = "none";

-          SB.setUsernameStatus.innerText = "Success!";
-        } else if (xmlhttp.readyState == 4 && xmlhttp.status == 400) {
-          SB.setUsernameStatus.innerText = "Bad Request";
+                    SB.setUsernameStatus.innerText = chrome.i18n.getMessage("success");
+                } else if (xmlhttp.readyState == 4) {
+                    let errorMessage = "";
+                        
+                    if([400, 429, 409, 502].includes(xmlhttp.status)) {
+                        errorMessage = chrome.i18n.getMessage(xmlhttp.status);
                    } else {
-          SB.setUsernameStatus.innerText = getErrorMessage(EN_US, xmlhttp.status);
+                        errorMessage = chrome.i18n.getMessage("connectionError") + xmlhttp.status;
+                    }
+
+                    SB.setUsernameStatus.innerText = errorMessage;
                }
            });
        });
@@ -1088,7 +1103,7 @@ function runThePopup() {
                //see if it was a success or failure
                if (response.successType == 1) {
                    //success
-          addVoteMessage(chrome.i18n.getMessage("Voted"), UUID)
+                    addVoteMessage(chrome.i18n.getMessage("voted"), UUID)
                } else if (response.successType == 0) {
                    //failure: duplicate vote
                    addVoteMessage(chrome.i18n.getMessage("voteFail"), UUID)
@@ -1263,7 +1278,7 @@ function runThePopup() {

 if (chrome.tabs != undefined) {
    //add the width restriction (because Firefox)
-  document.getElementById("sponorBlockStyleSheet").sheet.insertRule('.popupBody { width: 300 }', 0);
+    document.getElementById("sponorBlockStyleSheet").sheet.insertRule('.popupBody { width: 325 }', 0);

    //this means it is actually opened in the popup
    runThePopup();
--- a/utils.js
+++ b/utils.js
@@ -1,3 +1,23 @@
+// Function that can be used to wait for a condition before returning
+async function wait(condition, timeout = 5000, check = 100) { 
+    return await new Promise((resolve, reject) => {
+        setTimeout(() => reject("TIMEOUT"), timeout);
+
+        let intervalCheck = () => {
+            let result = condition();
+            if (result !== false) {
+                resolve(result);
+                clearInterval(interval);
+            };
+        };
+
+        let interval = setInterval(intervalCheck, check);
+        
+        //run the check once first, this speeds it up a lot
+        intervalCheck();
+    });
+}
+
 function getYouTubeVideoID(url) {
    //Attempt to parse url
    let urlObject = null;
@@ -5,7 +25,7 @@ function getYouTubeVideoID(url) {
            urlObject = new URL(url);
    } catch (e) {      
            console.error("[SB] Unable to parse URL: " + url);
-        return false
+            return false;
    }

    //Check if valid hostname
@@ -23,15 +43,6 @@ function getYouTubeVideoID(url) {
            return false;
        }
    }
-}

-//returns the start time of the video if there was one specified (ex. ?t=5s)
-function getYouTubeVideoStartTime(url) {
-  let searchParams = new URL(url).searchParams;
-  let startTime = searchParams.get("t");
-  if (startTime == null) {
-    startTime = searchParams.get("time_continue");
-  }
-
-  return startTime;
+    return false;
 }
--- a/utils/previewBar.js
+++ b/utils/previewBar.js
@@ -13,6 +13,10 @@ let barTypes = {
 	"sponsor": {
 		color: "#00d400",
 		opacity: "0.5"
+	},
+	"previewSponsor": {
+		color: "#0000d4",
+		opacity: "0.5"
 	}
 };

--- a/utils/skipNotice.js
+++ b/utils/skipNotice.js
@@ -0,0 +1,367 @@
+'use strict';
+
+//The notice that tells the user that a sponsor was just skipped
+class SkipNotice {
+	constructor(parent, UUID) {
+        this.parent = parent;
+        this.UUID = UUID;
+
+        this.maxCountdownTime = () => 4;
+        //the countdown until this notice closes
+        this.countdownTime = this.maxCountdownTime();
+        //the id for the setInterval running the countdown
+        this.countdownInterval = -1;
+
+        //the unskip button's callback
+        this.unskipCallback = this.unskip.bind(this);
+
+        //add notice
+        let amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
+
+        //this is the suffix added at the end of every id
+        this.idSuffix = this.UUID + amountOfPreviousNotices;
+
+        if (amountOfPreviousNotices > 0) {
+            //already exists
+
+            let previousNotice = document.getElementsByClassName("sponsorSkipNotice")[0];
+            previousNotice.classList.add("secondSkipNotice")
+        }
+
+        let noticeElement = document.createElement("div");
+        //what sponsor time this is about
+        noticeElement.id = "sponsorSkipNotice" + this.idSuffix;
+        noticeElement.classList.add("sponsorSkipObject");
+        noticeElement.classList.add("sponsorSkipNotice");
+        noticeElement.style.zIndex = 50 + amountOfPreviousNotices;
+
+        //add mouse enter and leave listeners
+        noticeElement.addEventListener("mouseenter", this.pauseCountdown.bind(this));
+        noticeElement.addEventListener("mouseleave", this.startCountdown.bind(this));
+
+        //the row that will contain the info
+        let firstRow = document.createElement("tr");
+        firstRow.id = "sponsorSkipNoticeFirstRow" + this.idSuffix;
+
+        let logoColumn = document.createElement("td");
+
+        let logoElement = document.createElement("img");
+        logoElement.id = "sponsorSkipLogo" + this.idSuffix;
+        logoElement.className = "sponsorSkipLogo sponsorSkipObject";
+        logoElement.src = chrome.extension.getURL("icons/IconSponsorBlocker256px.png");
+
+        let noticeMessage = document.createElement("span");
+        noticeMessage.id = "sponsorSkipMessage" + this.idSuffix;
+        noticeMessage.classList.add("sponsorSkipMessage");
+        noticeMessage.classList.add("sponsorSkipObject");
+        noticeMessage.innerText = chrome.i18n.getMessage("noticeTitle");
+
+        //create the first column
+        logoColumn.appendChild(logoElement);
+        logoColumn.appendChild(noticeMessage);
+
+        //add the x button
+        let closeButtonContainer = document.createElement("td");
+        closeButtonContainer.className = "sponsorSkipNoticeRightSection";
+        closeButtonContainer.style.top = "11px";
+
+        let timeLeft = document.createElement("span");
+        timeLeft.id = "sponsorSkipNoticeTimeLeft" + this.idSuffix;
+        timeLeft.innerText = this.countdownTime + "s";
+        timeLeft.className = "sponsorSkipObject sponsorSkipNoticeTimeLeft";
+
+        let hideButton = document.createElement("img");
+        hideButton.src = chrome.extension.getURL("icons/close.png");
+        hideButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton";
+        hideButton.addEventListener("click", this.close.bind(this));
+
+        closeButtonContainer.appendChild(timeLeft);
+        closeButtonContainer.appendChild(hideButton);
+
+        //add all objects to first row
+        firstRow.appendChild(logoColumn);
+        firstRow.appendChild(closeButtonContainer);
+
+        let spacer = document.createElement("hr");
+        spacer.id = "sponsorSkipNoticeSpacer" + this.idSuffix;
+        spacer.className = "sponsorBlockSpacer";
+
+        //the row that will contain the buttons
+        let secondRow = document.createElement("tr");
+        secondRow.id = "sponsorSkipNoticeSecondRow" + this.idSuffix;
+        
+        //thumbs up and down buttons
+        let voteButtonsContainer = document.createElement("td");
+        voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + this.idSuffix;
+        voteButtonsContainer.className = "sponsorTimesVoteButtonsContainer"
+
+        let reportText = document.createElement("span");
+        reportText.id = "sponsorTimesReportText" + this.idSuffix;
+        reportText.className = "sponsorTimesInfoMessage sponsorTimesVoteButtonMessage";
+        reportText.innerText = chrome.i18n.getMessage("reportButtonTitle");
+        reportText.style.marginRight = "5px";
+        reportText.setAttribute("title", chrome.i18n.getMessage("reportButtonInfo"));
+
+        let downvoteButton = document.createElement("img");
+        downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + this.idSuffix;
+        downvoteButton.className = "sponsorSkipObject voteButton";
+        downvoteButton.src = chrome.extension.getURL("icons/report.png");
+        downvoteButton.addEventListener("click", () => vote(0, this.UUID, this));
+        downvoteButton.setAttribute("title", chrome.i18n.getMessage("reportButtonInfo"));
+
+        //add downvote and report text to container
+        voteButtonsContainer.appendChild(reportText);
+        voteButtonsContainer.appendChild(downvoteButton);
+
+        //add unskip button
+        let unskipContainer = document.createElement("td");
+        unskipContainer.className = "sponsorSkipNoticeUnskipSection";
+
+        let unskipButton = document.createElement("button");
+        unskipButton.id = "sponsorSkipUnskipButton" + this.idSuffix;
+        unskipButton.innerText = chrome.i18n.getMessage("unskip");
+        unskipButton.className = "sponsorSkipObject sponsorSkipNoticeButton";
+        unskipButton.addEventListener("click", this.unskipCallback);
+
+        unskipButton.style.marginLeft = "4px";
+
+        unskipContainer.appendChild(unskipButton);
+
+        //add don't show again button
+        let dontshowContainer = document.createElement("td");
+        dontshowContainer.className = "sponsorSkipNoticeRightSection";
+
+        let dontShowAgainButton = document.createElement("button");
+        dontShowAgainButton.innerText = chrome.i18n.getMessage("Hide");
+        dontShowAgainButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton";
+        dontShowAgainButton.addEventListener("click", dontShowNoticeAgain);
+
+        dontshowContainer.appendChild(dontShowAgainButton);
+
+        //add to row
+        secondRow.appendChild(voteButtonsContainer);
+        secondRow.appendChild(unskipContainer);
+        secondRow.appendChild(dontshowContainer);
+
+        noticeElement.appendChild(firstRow);
+        noticeElement.appendChild(spacer);
+        noticeElement.appendChild(secondRow);
+
+        //get reference node
+        let referenceNode = document.getElementById("movie_player");
+        if (referenceNode == null) {
+            //for embeds
+            let player = document.getElementById("player");
+            referenceNode = player.firstChild;
+            let index = 1;
+
+            //find the child that is the video player (sometimes it is not the first)
+            while (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed")) {
+                referenceNode = player.children[index];
+
+                index++;
+            }
+        }
+
+        referenceNode.prepend(noticeElement);
+
+        this.startCountdown();
+    }
+
+    //called every second to lower the countdown before hiding the notice
+    countdown() {
+        this.countdownTime--;
+
+        if (this.countdownTime <= 0) {
+            //remove this from setInterval
+            clearInterval(this.countdownInterval);
+
+            //time to close this notice
+            this.close();
+
+            return;
+        }
+
+        if (this.countdownTime == 3) {
+            //start fade out animation
+            let notice = document.getElementById("sponsorSkipNotice" + this.idSuffix);
+            notice.style.removeProperty("animation");
+            notice.classList.add("sponsorSkipNoticeFadeOut");
+        }
+
+        this.updateTimerDisplay();
+    }
+
+    pauseCountdown() {
+        //remove setInterval
+        clearInterval(this.countdownInterval);
+        this.countdownInterval = -1;
+
+        //reset countdown
+        this.countdownTime = this.maxCountdownTime();
+        
+        //inform the user
+        let timeLeft = document.getElementById("sponsorSkipNoticeTimeLeft" + this.idSuffix);
+        timeLeft.innerText = chrome.i18n.getMessage("paused");
+
+        //remove the fade out class if it exists
+        let notice = document.getElementById("sponsorSkipNotice" + this.idSuffix);
+        notice.classList.remove("sponsorSkipNoticeFadeOut");
+        notice.style.animation = "none";
+    }
+
+    startCountdown() {
+        //if it has already started, don't start it again
+        if (this.countdownInterval != -1) return;
+
+        this.countdownInterval = setInterval(this.countdown.bind(this), 1000);
+
+        this.updateTimerDisplay();
+    }
+
+    updateTimerDisplay() {
+        //update the timer display
+        let timeLeft = document.getElementById("sponsorSkipNoticeTimeLeft" + this.idSuffix);
+        timeLeft.innerText = this.countdownTime + "s";
+    }
+
+    unskip() {
+        unskipSponsorTime(this.UUID);
+
+        //change unskip button to a reskip button
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
+        unskipButton.innerText = chrome.i18n.getMessage("reskip");
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        //setup new callback
+        this.unskipCallback = this.reskip.bind(this);
+        unskipButton.addEventListener("click", this.unskipCallback);
+
+        //change max duration to however much of the sponsor is left
+        this.maxCountdownTime = function() {
+            let sponsorTime = sponsorTimes[UUIDs.indexOf(this.UUID)];
+            let duration = Math.round(sponsorTime[1] - v.currentTime);
+
+            return Math.max(duration, 4);
+        };
+
+        this.countdownTime = this.maxCountdownTime();
+        this.updateTimerDisplay();
+    }
+
+    reskip() {
+        reskipSponsorTime(this.UUID);
+
+        //change unskip button to a reskip button
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
+        unskipButton.innerText = chrome.i18n.getMessage("unskip");
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        //setup new callback
+        this.unskipCallback = this.unskip.bind(this);
+        unskipButton.addEventListener("click", this.unskipCallback);
+
+        //reset duration
+        this.maxCountdownTime = () => 4;
+        this.countdownTime = this.maxCountdownTime();
+        this.updateTimerDisplay();
+    }
+
+    afterDownvote() {
+        this.addVoteButtonInfo(chrome.i18n.getMessage("voted"));
+        this.addNoticeInfoMessage(chrome.i18n.getMessage("hitGoBack"));
+        
+        //remove this sponsor from the sponsors looked up
+        //find which one it is
+        for (let i = 0; i < sponsorTimes.length; i++) {
+            if (UUIDs[i] == this.UUID) {
+                //this one is the one to hide
+                
+                //add this as a hidden sponsorTime
+                hiddenSponsorTimes.push(i);
+            
+                let sponsorTimesLeft = sponsorTimes.slice();
+                for (let j = 0; j < hiddenSponsorTimes.length; j++) {
+                    //remove this sponsor time
+                    sponsorTimesLeft.splice(hiddenSponsorTimes[j], 1);
+                }
+            
+                //update the preview
+                previewBar.set(sponsorTimesLeft, [], v.duration);
+            
+                break;
+            }
+        }
+    }
+    
+    addNoticeInfoMessage(message) {
+        let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + this.idSuffix);
+        if (previousInfoMessage != null) {
+            //remove it
+            document.getElementById("sponsorSkipNotice" + this.idSuffix).removeChild(previousInfoMessage);
+        }
+        
+        //add info
+        let thanksForVotingText = document.createElement("p");
+        thanksForVotingText.id = "sponsorTimesInfoMessage" + this.idSuffix;
+        thanksForVotingText.className = "sponsorTimesInfoMessage";
+        thanksForVotingText.innerText = message;
+        
+        //add element to div
+        document.getElementById("sponsorSkipNotice" + this.idSuffix).insertBefore(thanksForVotingText, document.getElementById("sponsorSkipNoticeSpacer" + this.idSuffix));
+    }
+    
+    resetNoticeInfoMessage() {
+        let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + this.idSuffix);
+        if (previousInfoMessage != null) {
+            //remove it
+            document.getElementById("sponsorSkipNotice" + this.idSuffix).removeChild(previousInfoMessage);
+        }
+    }
+    
+    addVoteButtonInfo(message) {
+        this.resetVoteButtonInfo();
+        
+        //hide report button and text for it
+        let downvoteButton = document.getElementById("sponsorTimesDownvoteButtonsContainer" + this.idSuffix);
+        if (downvoteButton != null) {
+            downvoteButton.style.display = "none";
+        }
+        let downvoteButtonText = document.getElementById("sponsorTimesReportText" + this.idSuffix);
+        if (downvoteButtonText != null) {
+            downvoteButtonText.style.display = "none";
+        }
+        
+        //add info
+        let thanksForVotingText = document.createElement("td");
+        thanksForVotingText.id = "sponsorTimesVoteButtonInfoMessage" + this.idSuffix;
+        thanksForVotingText.className = "sponsorTimesInfoMessage sponsorTimesVoteButtonMessage";
+        thanksForVotingText.innerText = message;
+        
+        //add element to div
+        document.getElementById("sponsorSkipNoticeSecondRow" + this.idSuffix).prepend(thanksForVotingText);
+    }
+    
+    resetVoteButtonInfo() {
+        let previousInfoMessage = document.getElementById("sponsorTimesVoteButtonInfoMessage" + this.idSuffix);
+        if (previousInfoMessage != null) {
+            //remove it
+            document.getElementById("sponsorSkipNoticeSecondRow" + this.idSuffix).removeChild(previousInfoMessage);
+        }
+        
+        //show button again
+        document.getElementById("sponsorTimesDownvoteButtonsContainer" + this.idSuffix).style.removeProperty("display");
+    }
+    
+    //close this notice
+    close() {
+        let notice = document.getElementById("sponsorSkipNotice" + this.idSuffix);
+        if (notice != null) {
+            notice.remove();
+        }
+
+        //remove setInterval
+        if (this.countdownInterval != -1) clearInterval(this.countdownInterval);
+    }
+
+}
Author	SHA1	Message	Date
Ajay Ramachandran	4e795c8fb1	Merge pull request #139 from ajayyy/experimental-ajay Fixed preview bar causing issues	2019-08-27 21:01:48 -04:00
Ajay Ramachandran	c83eb589ea	Updated version number.	2019-08-27 21:00:00 -04:00
Ajay Ramachandran	7cd6b324b9	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-27 20:59:36 -04:00
Ajay Ramachandran	5891fccacb	Updated shield links	2019-08-26 16:10:25 -04:00
Ajay Ramachandran	59233f3307	Update README.md	2019-08-26 16:09:26 -04:00
Ajay Ramachandran	796466a72a	Added some shields	2019-08-26 16:08:33 -04:00
Ajay Ramachandran	3f35642010	Made the preview bar wait for it to not be null.	2019-08-26 14:35:49 -04:00
Ajay Ramachandran	5bbfcf742d	Fixed preview bar bar loading too early	2019-08-26 14:30:55 -04:00
Ajay Ramachandran	aaf79fda0d	Added more language strings	2019-08-25 23:22:35 -04:00
Ajay Ramachandran	519a822751	Merge pull request #138 from ajayyy/experimental-ajay Improved away function	2019-08-24 14:01:35 -04:00
Ajay Ramachandran	fef31c399b	Update version number.	2019-08-24 14:00:15 -04:00
Ajay Ramachandran	da21081a12	Merge branch 'patch-21' into experimental-ajay	2019-08-24 13:54:24 -04:00
Ajay Ramachandran	896357a943	Merge pull request #136 from ajayyy/experimental-ajay Fixed submissions being broken on the video player	2019-08-24 12:32:56 -04:00
Ajay Ramachandran	2d96c24b13	Update version number	2019-08-24 12:30:03 -04:00
Ajay Ramachandran	1753f58120	Fixed submissions being broken.	2019-08-24 12:29:51 -04:00
Ajay Ramachandran	f0888faf78	Merge pull request #133 from ajayyy/experimental Update master	2019-08-23 23:30:11 -04:00
Ajay Ramachandran	23fbbebc9e	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-23 23:28:56 -04:00
Ajay Ramachandran	9951a19478	Updated version number.	2019-08-23 23:27:42 -04:00
Ajay Ramachandran	dd4ab2f38a	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-23 21:13:37 -04:00
Ajay Ramachandran	6bcdb3e272	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-23 21:13:23 -04:00
Ajay Ramachandran	227bec4d8e	Merge pull request #83 from OfficialNoob/patch-16 Added youtube-nocookie.com	2019-08-23 21:13:03 -04:00
Ajay Ramachandran	556b4f88d2	Merge pull request #122 from OfficialNoob/patch-21 Added addButtons	2019-08-23 21:11:04 -04:00
Ajay Ramachandran	2d12f957bc	Improved await function.	2019-08-23 21:10:28 -04:00
Ajay Ramachandran	c1efe02614	Improved promise calling in button updating function.	2019-08-23 21:06:00 -04:00
Ajay Ramachandran	f0e1979aab	Renamed addButtons and defined controls.	2019-08-23 21:03:43 -04:00
Ajay Ramachandran	989db6d6b6	Added more spacing.	2019-08-23 21:02:17 -04:00
Ajay Ramachandran	781096c290	Fixed cut off text.	2019-08-23 21:01:31 -04:00
Ajay Ramachandran	536c6e3e41	Removed new line from messages.	2019-08-23 21:00:07 -04:00
Ajay Ramachandran	de376176db	Fixed preview bar being added too soon.	2019-08-23 20:59:13 -04:00
Ajay Ramachandran	e63389cfa3	Fixed buttons appearing too early not hidden (submit and clear button).	2019-08-23 20:52:12 -04:00
Ajay Ramachandran	1c4ca8da26	Fixed formatting issues + previewBar not displaying. Also changed the isSubmitButtonLoaded function to be checking for the right button and fixed the startSponsorButton not hiding. Useless function was removed.	2019-08-23 20:50:10 -04:00
Ajay Ramachandran	dcbd7ba4cd	Merge pull request #132 from ajayyy/experimental-ajay More checks + popup fix	2019-08-23 20:31:29 -04:00
Ajay Ramachandran	9fc8d385ab	Fixed popup getting cut off.	2019-08-23 14:23:34 -04:00
Ajay Ramachandran	07e878e065	Fixed missing language call.	2019-08-23 14:22:16 -04:00
Official Noob	a2af4dba52	Added back getYouTubeVideoStartTime	2019-08-23 17:19:44 +01:00
Ajay Ramachandran	2fbafb6b10	Added duration check to popup as well.	2019-08-22 23:12:30 -04:00
Ajay Ramachandran	98eb72ef1f	Made sure rechecks didn't happen twice.	2019-08-22 22:43:55 -04:00
Ajay Ramachandran	89d127c5c5	Added a check to make sure the time doesn't exceed the duration of the video.	2019-08-22 22:43:19 -04:00
Ajay Ramachandran	a784c8a850	Merge pull request #130 from doubouil/patch-1 Better french translation	2019-08-22 21:29:45 -04:00
Ajay Ramachandran	a533aaf5cf	Updated French translation	2019-08-22 21:28:52 -04:00
doubouil	434b5bdbad	Better french translation Native speaker here, the machine based translation was not great so here's a first draft. I choose to use "message commercial" (commercial message) and not "publicité" (advertisement) since ads feels to me to be more a legal status than a definite thing. "Endossement" is not a valid french word in this context, and endorsements would be translated to "sponsors" or "mécénat" in fr_FR, but again this are more legal category than pure identifying terms and fr_CA strongly dislikes frenglish. But I left it in the extension name since this is a good keyword for people looking for adblocking-related extensions.	2019-08-22 21:10:41 +00:00
Ajay Ramachandran	d1f1f9213e	Merge pull request #129 from ajayyy/experimental-ajay UserID undefined checks	2019-08-22 16:10:50 -04:00
Ajay Ramachandran	d498c107a8	Update version number.	2019-08-22 16:08:38 -04:00
Ajay Ramachandran	f12b44762e	Added new check to setup a proper userID if undefined while voting.	2019-08-22 16:08:16 -04:00
Official Noob	fc4da038e9	Merge branch 'experimental' into patch-21	2019-08-22 19:48:59 +01:00
Official Noob	d5999ad330	Added isDraggable	2019-08-22 19:39:17 +01:00
Official Noob	146ece3bff	Fixed JSON error	2019-08-22 19:36:30 +01:00
Ajay Ramachandran	92095acf36	Merge pull request #128 from Revadike/fix-draggable Disallow dragging of button	2019-08-22 12:34:18 -04:00
Revadike	279c10d555	Disallow dragging of button	2019-08-22 15:52:45 +02:00
Ajay Ramachandran	0ae3820681	Merge pull request #127 from ajayyy/experimental Update master	2019-08-21 20:01:43 -04:00
Ajay Ramachandran	283e4d053e	Merge pull request #126 from ajayyy/experimental-ajay Translations + Unsubmitted sponsor preview	2019-08-21 20:01:18 -04:00
Ajay Ramachandran	6dbb2f9d10	Update version number.	2019-08-21 19:58:44 -04:00
Ajay Ramachandran	c657bb763b	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-21 19:57:40 -04:00
Ajay Ramachandran	259cdb1abe	Merge pull request #123 from bershanskiy/russian Russian translation	2019-08-21 19:57:30 -04:00
Ajay Ramachandran	86e96e59af	Update README.md	2019-08-21 19:21:06 -04:00
Official Noob	9ba30dbafa	Moved to bottom	2019-08-21 20:21:39 +01:00
Anton Bershanskiy	2907db705c	Update messages.json	2019-08-21 14:03:46 -05:00
Ajay Ramachandran	a6a0f917e0	Fixed preview not working when no sponsors are found.	2019-08-21 14:35:46 -04:00
Official Noob	bcdba798d9	Added locals for buttons	2019-08-21 19:29:24 +01:00
Ajay Ramachandran	32884372fa	Unsubmitted sponsors are now in the preview.	2019-08-21 14:27:25 -04:00
Official Noob	9b2364cfb7	fixed isSubmitLoaded	2019-08-21 19:22:59 +01:00
Ajay Ramachandran	c1aebf45c8	Removed the need for getYouTubeVideoStartTime and made it check the current video time instead.	2019-08-21 14:16:52 -04:00
Official Noob	6e0c6332cc	Fixed title in createButton	2019-08-21 19:15:35 +01:00
Official Noob	47d0d340d4	Requested changes	2019-08-21 19:10:49 +01:00
Ajay Ramachandran	118804e139	Added confirm language to translations. Increased size of notice. Updated translations.	2019-08-21 14:04:05 -04:00
Ajay Ramachandran	0bef50e259	Merge pull request #121 from OfficialNoob/patch-18 Added wait function	2019-08-21 13:47:57 -04:00
Official Noob	bfb876af8b	Changed button exists check	2019-08-21 18:29:41 +01:00
Official Noob	84d5d3124c	Update content.js	2019-08-21 18:17:30 +01:00
Official Noob	825d997d6d	Update content.js	2019-08-20 23:37:40 +01:00
Official Noob	8e9e5bfddb	Update content.js	2019-08-20 23:26:35 +01:00
Official Noob	05765682a5	Update content.js	2019-08-20 23:11:18 +01:00
Official Noob	2b5d56942a	Update content.js	2019-08-20 22:59:34 +01:00
Ajay Ramachandran	f097ff60aa	Fixed indentation	2019-08-20 17:47:31 -04:00
Anton Bershanskiy	655691a28f	Russian translation	2019-08-20 15:10:21 -05:00
Ajay Ramachandran	7ddef8d519	Update README.md	2019-08-20 16:09:47 -04:00
Ajay Ramachandran	2fb79f0066	Update README.md	2019-08-20 16:09:22 -04:00
Ajay Ramachandran	655d87ce0f	Update README.md	2019-08-20 16:08:27 -04:00
Ajay Ramachandran	ed7c98afa8	Update README.md	2019-08-20 16:06:29 -04:00
Ajay Ramachandran	41bf0c9697	Update README.md	2019-08-20 16:05:47 -04:00
Ajay Ramachandran	5eb0132660	Update README.md	2019-08-20 16:05:25 -04:00
Ajay Ramachandran	c43695e596	Update README.md	2019-08-20 16:04:47 -04:00
Ajay Ramachandran	9aeda25136	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-20 15:54:51 -04:00
Ajay Ramachandran	90e671ebf8	Updated french translation	2019-08-20 15:54:40 -04:00
Ajay Ramachandran	3ecc180d06	Added french translation + fixed i18n not being used for the notification.	2019-08-20 15:46:00 -04:00
Official Noob	7ac9ec37ef	Adding addButtons and using sponsorVideoID more	2019-08-20 20:27:30 +01:00
Ajay Ramachandran	e176a9f241	Fixed it linking to non existent file	2019-08-20 15:07:36 -04:00
Ajay Ramachandran	91bd910c40	Added Brazilian Portuguese translation by @Geroyuni Co-authored-by: Geroyuni <Geroyuni@users.noreply.github.com>	2019-08-20 15:04:13 -04:00
Official Noob	a6c77185de	Added wait function	2019-08-20 17:46:05 +01:00
Ajay Ramachandran	b871d721db	Update version number.	2019-08-19 22:27:42 -04:00
Ajay Ramachandran	85f9bb1d34	Removed setInterval when removing the notice.	2019-08-19 22:26:49 -04:00
Ajay Ramachandran	adb60c6357	Update README.md	2019-08-19 20:57:31 -04:00
Ajay Ramachandran	90046aed53	Merge pull request #120 from ajayyy/experimental-ajay Update version number	2019-08-19 20:25:52 -04:00
Ajay Ramachandran	7adef119d3	Update version number	2019-08-19 20:23:42 -04:00
Ajay Ramachandran	4db6593681	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-19 20:20:08 -04:00
Ajay Ramachandran	f4c7e11ae1	Merge pull request #119 from ajayyy/experimental-ajay Notice countdown counter, reskip, formatting fixes + sponsor check fixes	2019-08-19 20:19:48 -04:00
Ajay Ramachandran	b1393a563f	Added language support to setUsername. Fixed error messages not appearing. Reset error messages properly. Resolves https://github.com/ajayyy/SponsorBlock/issues/111	2019-08-19 20:17:32 -04:00
Ajay Ramachandran	279e49a143	Fixed more indentation	2019-08-19 20:05:33 -04:00
Ajay Ramachandran	db4182d074	Fixed indentation	2019-08-19 19:21:19 -04:00
Ajay Ramachandran	cc2d1405b6	Made the notice id suffix not just the sponsor UUID.	2019-08-19 19:19:33 -04:00
Ajay Ramachandran	19802a7a31	Made the notice stay open after an unskip and allow to reskip. The time remaining of the popup becomes the time remaining of the sponsor.	2019-08-19 19:07:14 -04:00
Ajay Ramachandran	50f929c11a	Adjusted fade out animation to feel much better	2019-08-19 17:57:10 -04:00
Ajay Ramachandran	e5e250ff36	Added fade out animation	2019-08-19 17:39:22 -04:00
Ajay Ramachandran	6fe94a70a7	Countdown timer now pauses after hovering. Also lowered countdown time.	2019-08-19 17:24:17 -04:00
Ajay Ramachandran	db2af83a34	Added countdown to skip notice	2019-08-19 17:08:31 -04:00
Ajay Ramachandran	cbab026f27	Added new button backgrounds. Centered report button	2019-08-19 16:49:22 -04:00
Ajay Ramachandran	0c2c868e5c	Made report text disappear after voting.	2019-08-19 16:13:18 -04:00
Ajay Ramachandran	175cf62201	Refractored skipNotice to use a class now	2019-08-19 16:09:54 -04:00
Ajay Ramachandran	761ae63845	Fixed css issues on old YouTube on the notice.	2019-08-19 12:11:19 -04:00
Ajay Ramachandran	70948d9b36	Update version number	2019-08-15 23:56:35 -04:00
Ajay Ramachandran	3e0638d811	Updated sponsor check to support slower PCs	2019-08-15 15:16:24 -04:00
Ajay Ramachandran	096bf0d750	Merge pull request #118 from ajayyy/experimental-ajay Report button additions	2019-08-15 11:26:01 -04:00
Ajay Ramachandran	c81d4cc2a1	Update version number	2019-08-15 11:23:38 -04:00
Ajay Ramachandran	628f1043fa	Added text to the report button.	2019-08-15 11:23:19 -04:00
Ajay Ramachandran	73b8d82b0f	Made view count tracking work when the notice is disabled	2019-08-15 11:12:46 -04:00
Ajay Ramachandran	d6ba6c83e8	Update README.md	2019-08-15 00:54:45 -04:00
Official Noob	d75a7ca897	Added youtube-nocookie.com	2019-08-06 21:40:23 +01:00