Merge pull request #399 from ajayyy/react

Save category in preview submissions and other fixes

README.md

@@ -11,18 +11,21 @@
   <b>Download:</b>
   <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://github.com/ajayyy/SponsorBlock/wiki/Android">Android</a> |
   <a href="https://sponsor.ajay.app">Website</a> |
   <a href="https://sponsor.ajay.app/stats">Stats</a>
 </p>
 
 <p align="center">
   <b>Unofficial Ports:</b>
-  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</a>
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</a> |
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#kodi">Kodi</a> |
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#ios">iOS</a>
 </p>
 
 <p align="center">
     <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github"><img src="https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users" alt="Badge"></img></a>
-    <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users" alt="Badge"></img></a>
+    <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chrome%20Users" alt="Badge"></img></a>
     <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Sponsors%20Submitted&query=totalSubmissions&suffix=%20sponsors&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkred" alt="Badge"></img></a>
     <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Contributing%20Users&query=userCount&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkblue" alt="Badge"></img></a>
     <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Time%20Saved%20From%20Skips&query=daysSaved&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetDaysSavedFormatted&color=darkgreen&suffix=%20days" alt="Badge"></img></a>
@@ -32,7 +35,7 @@
 
 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.
 
-Also support Invidio.us.
+Also supports Invidio.us.
 
 **Translate:** [![Crowdin](https://badges.crowdin.net/sponsorblock/localized.svg)](https://crowdin.com/project/sponsorblock)
 
@@ -46,7 +49,7 @@ The backend server code is available here: https://github.com/ajayyy/SponsorBloc
 
 It is a simple SQLite database that will hold all the timing data.
 
-To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db. If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information.
+To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db ([License](https://github.com/ajayyy/SponsorBlock/wiki/Database-and-API-License)). If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information.
 
 The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock).
 

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
-    "short_name": "__MSG_Name__",
+    "short_name": "SponsorBlock",
-    "version": "2.0",
+    "version": "2.0.3",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "content_scripts": [{
@@ -50,7 +50,7 @@
         "*://*/*"
     ],
     "browser_action": {
-        "default_title": "__MSG_Name__",
+        "default_title": "SponsorBlock",
         "default_popup": "popup.html"
     }, 
     "background": {

public/_locales/bg/messages.json

@@ -124,5 +124,29 @@
     },
     "voteOnTime": {
         "message": "Гласуване за спонсорства"
+    },
+    "savedPeopleFrom": {
+        "message": "Вие сте помогнали на хора да пропуснат "
+    },
+    "viewLeaderboard": {
+        "message": "Вижте leaderboard-а"
+    },
+    "here": {
+        "message": "тук"
+    },
+    "discordAdvert": {
+        "message": "Елате в официалния Discord сървър за да давате предложения!"
+    },
+    "hideThis": {
+        "message": "Скрий това"
+    },
+    "Options": {
+        "message": "Настройки"
+    },
+    "showButtons": {
+        "message": "Показване на бутоните в YouTube Player-а"
+    },
+    "hideButtons": {
+        "message": "Скриване на бутоните в YouTube Player-а"
     }
 }

public/_locales/de/messages.json

@@ -33,11 +33,17 @@
         "message": "gesponsorter Inhalt"
     },
     "Segments": {
-        "message": "gesponsorte Inhalte"
+        "message": "gesponserten Inhalten"
+    },
+    "upvoteButtonInfo": {
+        "message": "Diesen Beitrag aufwerten"
     },
     "reportButtonTitle": {
         "message": "Melden"
     },
+    "reportButtonInfo": {
+        "message": "Beitrag als unzulässig melden."
+    },
     "Dismiss": {
         "message": "Abbrechen"
     },
@@ -98,6 +104,9 @@
     "voted": {
         "message": "Abgestimmt!"
     },
+    "serverDown": {
+        "message": "Der Server ist scheinbar offline. Bitte unverzüglich dem Entwickler melden."
+    },
     "connectionError": {
         "message": "Ein Verbindungsfehler ist aufgetreten. Fehlermeldung: "
     },
@@ -501,6 +510,9 @@
     "category_interaction_short": {
         "message": "Interaktions-Erinnerung"
     },
+    "category_selfpromo": {
+        "message": "Unbezahlt/Eigenwerbung"
+    },
     "category_selfpromo_description": {
         "message": "Ähnlich wie bei \"Sponsor\" mit Ausnahme von unbezahlten oder Selbstpromotion. Dies beinhaltet Abschnitte über Waren, Spenden oder Informationen darüber, mit wem sie zusammengearbeitet haben."
     },
@@ -523,7 +535,7 @@
         "message": "Deaktivieren"
     },
     "manualSkip": {
-        "message": "Manueller Überspringen"
+        "message": "Manuelles Überspringen"
     },
     "showOverlay": {
         "message": "Vor-/Rücklaufleiste anzeigen"
@@ -546,7 +558,7 @@
         "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
     },
     "enableTestingServer": {
-        "message": "Beta Testing Server aktivieren"
+        "message": "Beta-Testing Server aktivieren"
     },
     "whatEnableTestingServer": {
         "message": "Deine Einreichungen und Stimmen werden NICHT für den Hauptserver geltend. Benutze dies nur für Tests."
@@ -573,7 +585,7 @@
         "message": "Kanal-ID wurde noch nicht geladen."
     },
     "adblockerIssue": {
-        "message": "Irgendwas hält SponsorBlock davon ab, die Videodaten abzurufen. Möglicherweise ist das dein Werbeblocker. Mehr Infos: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+        "message": "Irgendetwas hält SponsorBlock davon ab, die Videodaten abzurufen. Möglicherweise ist es dein Werbeblocker. Mehr Infos: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
     },
     "itCouldBeAdblockerIssue": {
         "message": "Falls dies weiterhin geschieht, könnte dies durch Ihren Werbeblocker verursacht werden. Bitte überprüfen Sie https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
@@ -596,6 +608,9 @@
     "nonMusicCategoryOnMusic": {
         "message": "Dieses Video ist als Musik kategorisiert. Sind Sie sicher, dass Sie Segmente mit Nicht-Musikkategorien einreichen möchten? Wenn dieses Video nicht wirklich Musik ist, sollten Sie dieses Segment nicht einreichen. Bitte lesen Sie die Richtlinien, wenn Sie verwirrt sind."
     },
+    "multipleSegments": {
+        "message": "Mehrere Segmente"
+    },
     "guidelines": {
         "message": "Richtlinien"
     },

public/_locales/en/messages.json

@@ -1,8 +1,4 @@
 {
-    "Name": {
-        "message": "SponsorBlock",
-        "description": "Name of the extension."
-    },
     "fullName": {
         "message": "SponsorBlock for YouTube - Skip Sponsorships",
         "description": "Name of the extension."
@@ -222,7 +218,7 @@
         "message": "Show Notice Again"
     },
     "longDescription": {
-        "message": "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.",
+        "message": "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. \n\n You can also skip intros, outros, reminders to subscribe and other categories.",
         "description": "Full description of the extension on the store pages."
     },
     "website": {
@@ -293,6 +289,12 @@
     "audioNotificationDescription": {
         "message": "Audio notification on skip will play a sound whenever a sponsor is skipped. If disabled (or auto skip is disabled), no sound will be played."
     },
+    "showTimeWithSkips": {
+        "message": "Show Time With Skips Removed"
+    },
+    "showTimeWithSkipsDescription": {
+        "message": "This time appears in brackets next to the current time on below the seekbar. This shows the total video duration minus any segments. This includes segments marked as only \"Show In Seekbar\"."
+    },
     "youHaveSkipped": {
         "message": "You have skipped "
     },
@@ -470,9 +472,6 @@
     "theKey": {
         "message": "The key"
     },
-    "keyAlreadyUsedByYouTube": {
-        "message": "is already used by youtube. Please select another key."
-    },
     "keyAlreadyUsed": {
         "message": "is bound to another action. Please select another key."
     },
@@ -487,13 +486,13 @@
         "message": "Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shoutouts to causes/creators/websites/products they like."
     },
     "category_intro": {
-        "message": "Intro Animation"
+        "message": "Intermission/Intro Animation"
     },
     "category_intro_description": {
-        "message": "Intro animations that are recurring in the series or provide no direct value. This should not be used on music videos."
+        "message": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information or be used on music videos."
     },
     "category_intro_short": {
-        "message": "Intro"
+        "message": "Intermission"
     },
     "category_outro": {
         "message": "Endcards/Credits"

public/_locales/fr/messages.json

@@ -81,10 +81,10 @@
         "message": "Êtes-vous certain(e) de vouloir supprimer vos soumissions ?\n\n"
     },
     "Unknown": {
-        "message": "Une erreur s'est produite lors de la soumission, veuillez ré-essayer plus tard."
+        "message": "Une erreur s'est produite lors de la soumission, veuillez réessayer plus tard."
     },
     "sponsorFound": {
-        "message": "Les messages commerciaux pour cette vidéo sont déjà dans notre base de donnée !"
+        "message": "Les messages commerciaux pour cette vidéo sont déjà dans notre base de données !"
     },
     "sponsor404": {
         "message": "Pas de messages commerciaux trouvés"
@@ -168,10 +168,10 @@
         "message": "Soumettre les temps"
     },
     "publicStats": {
-        "message": "Affiché sur le classement public pour montrer vos contributions. Voir sur"
+        "message": "Votre pseudo est inscrit dans le classement public pour afficher vos contributions. Le consulter"
     },
     "setUsername": {
-        "message": "Choisir pseudo"
+        "message": "Choisir un pseudonyme"
     },
     "discordAdvert": {
         "message": "Rejoignez le serveur Discord officiel pour toutes suggestions ou remarques!"
@@ -297,7 +297,7 @@
         "message": "Vous avez passé "
     },
     "youHaveSaved": {
-        "message": "Vous avez économisé "
+        "message": "Vous vous êtes économisé "
     },
     "minLower": {
         "message": "minute"
@@ -342,13 +342,13 @@
         "message": "Passage automatique"
     },
     "showSkipNotice": {
-        "message": "Afficher l'avis après le passage d'un sponsor"
+        "message": "Notifier après qu'un sponsor ait été sauté"
     },
     "keybindCurrentlySet": {
         "message": ". Il est actuellement réglé sur :"
     },
     "supportInvidious": {
-        "message": "Soutenir Invidious"
+        "message": "Supporter Invidious"
     },
     "supportInvidiousDescription": {
         "message": "Invidious (invidio.us) est un client tiers pour YouTube. Vous devez accepter des permissions supplémentaires pour activer son support. Cette fonctionnalité ne fonctionne pas en mode incognito sur Chrome et les autres variantes de Chromium."
@@ -483,18 +483,48 @@
     "category_sponsor": {
         "message": "Message commercial"
     },
+    "category_sponsor_description": {
+        "message": "Promotion rémunérée, parrainage rémunéré et publicité directe. Pas pour l'autopromotion ou les présentations gratuites de causes, de créateurs, de sites web ou de produits qu'ils aiment."
+    },
     "category_intro": {
         "message": "Générique d'introduction"
     },
+    "category_intro_description": {
+        "message": "Introductions animées qui sont récurrentes ou qui n'ont pas de valeur ajoutée directe dans la série. Ne doit pas être utilisé pour les vidéos musicales."
+    },
+    "category_intro_short": {
+        "message": "Introduction"
+    },
     "category_outro": {
         "message": "Générique de fin"
     },
+    "category_outro_description": {
+        "message": "Générique de fin ou quand les fiches de fin de vidéo apparaissent. Ne pas utiliser pour les conclusions orales. Ne doit pas inclure de contenu utile. Ne pas utiliser sur les vidéos de musique."
+    },
     "category_interaction": {
         "message": "Rappel d'interaction (abonnement)"
     },
+    "category_interaction_description": {
+        "message": "Lorsqu'il y a un bref rappel pour liker, s'abonner ou les follow parmi le contenu. Si le message est long ou porte sur quelque chose de spécifique, cela devrait plutôt être classé comme une autopromotion."
+    },
+    "category_interaction_short": {
+        "message": "Rappel d'interaction"
+    },
+    "category_selfpromo": {
+        "message": "Non rémunéré/autopromotion"
+    },
+    "category_selfpromo_description": {
+        "message": "Semblable au \"sponsor\", excepté pour la promotion non rémunérée ou l'auto-promotion. Cela inclut les marchandises, les dons et les informations sur leurs collaborateurs."
+    },
     "category_music_offtopic": {
         "message": "Musique : Segment non-musicale"
     },
+    "category_music_offtopic_description": {
+        "message": "A utiliser uniquement dans les vidéos musicales. Cela inclut les introductions ou les fins dans les vidéos."
+    },
+    "category_music_offtopic_short": {
+        "message": "Hors musique"
+    },
     "category_livestream_messages": {
         "message": "Stream : lecture de dons et messages"
     },
@@ -507,6 +537,23 @@
     "showOverlay": {
         "message": "Afficher dans la barre de progression"
     },
+    "colorFormatIncorrect": {
+        "message": "Votre couleur est mal formatée. Il devrait s'agir d'un code hexadécimal à 3 ou 6 chiffres avec un signe numérique au début."
+    },
+    "previewColor": {
+        "message": "Couleur en mode aperçu",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "seekBarColor": {
+        "message": "Couleur dans la barre de progression"
+    },
+    "category": {
+        "message": "Catégorie"
+    },
+    "skipOption": {
+        "message": "Option de saut",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
     "enableTestingServer": {
         "message": "Activer le serveur de test bêta"
     },
@@ -560,5 +607,24 @@
     },
     "multipleSegments": {
         "message": "Plusieurs segments"
+    },
+    "guidelines": {
+        "message": "Instructions"
+    },
+    "readTheGuidelines": {
+        "message": "Lisez les instructions !!",
+        "description": "Show the first time they submit or if they are \"high risk\""
+    },
+    "categoryUpdate1": {
+        "message": "Les catégories sont là !"
+    },
+    "categoryUpdate2": {
+        "message": "Ouvrir les options pour sauter les intros, outros, marchandises, etc."
+    },
+    "unsubmittedWarning": {
+        "message": "Notification de segments non soumis"
+    },
+    "unsubmittedWarningDescription": {
+        "message": "Envoyer une notification lorsque vous quittez une vidéo avec des segments qui ne sont pas téléversés"
     }
 }

public/_locales/hu/messages.json

@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
     "Loading": {
         "message": "Betöltés..."
     },

public/_locales/nl/messages.json

@@ -11,15 +11,39 @@
         "message": "Sla sponsoring over op YouTube video's. Rapporteer sponsors van video's die je bekijkt om tijd van anderen te besparen.",
         "description": "Description of the extension."
     },
+    "400": {
+        "message": "Server zegt dat het verzoek ongeldig is"
+    },
+    "429": {
+        "message": "Je hebt te veel sponsortijden voor deze video doorgegeven, weet je zeker dat het er zo veel zijn?"
+    },
+    "409": {
+        "message": "Dit is al een keer ingediend"
+    },
+    "channelWhitelisted": {
+        "message": "Kanaal gewhitelist!"
+    },
     "Sponsor": {
         "message": "sponsor"
     },
     "Sponsors": {
         "message": "sponsoren"
     },
+    "Segment": {
+        "message": "Sponsor segment"
+    },
+    "Segments": {
+        "message": "Sponsor segmenten"
+    },
+    "upvoteButtonInfo": {
+        "message": "Stem op deze indiening"
+    },
     "reportButtonTitle": {
         "message": "Melden"
     },
+    "reportButtonInfo": {
+        "message": "Rapporteer deze indiening als onjuist."
+    },
     "Dismiss": {
         "message": "Negeren"
     },
@@ -35,9 +59,21 @@
     "Hide": {
         "message": "Nooit weergeven"
     },
+    "hitGoBack": {
+        "message": "Druk op unskip om naar waar je vandaan komt te gaan."
+    },
+    "unskip": {
+        "message": "Unskip"
+    },
+    "reskip": {
+        "message": "Reskip"
+    },
     "paused": {
         "message": "Gepauzeerd"
     },
+    "manualPaused": {
+        "message": "Timer gestopt"
+    },
     "clearThis": {
         "message": "Weet je zeker dat je dit formulier wilt wissen?\n\n"
     },

public/_locales/pt_BR/messages.json

@@ -72,7 +72,7 @@
         "message": "Tem certeza que quer limpar isso?\n\n"
     },
     "Unknown": {
-        "message": "Teve um erro ao enviar seus segmentos, tente novamente depois."
+        "message": "Houve um erro ao enviar seus segmentos, tente novamente mais tarde."
     },
     "sponsorFound": {
         "message": "Os patrocinadores desse vídeo estão no banco de dados!"
@@ -87,7 +87,7 @@
         "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 feche esse popup e abra de novo."
+        "message": "Nenhum vídeo do YouTube foi encontrado nesta aba. Se você sabe que esta é uma aba do YouTube, feche este pop-up e abra-o novamente. Se isso não funcionar, tente recarregar a aba."
     },
     "success": {
         "message": "Sucesso!"
@@ -96,13 +96,13 @@
         "message": "Votado!"
     },
     "connectionError": {
-        "message": "Um erro de conexão aconteceu: Código: "
+        "message": "Ocorreu um erro de conexão. Código de erro: "
     },
     "wantToSubmit": {
         "message": "Quer enviar os segmentos para o vídeo de ID"
     },
     "leftTimes": {
-        "message": "Parece que você se esqueceu de enviar alguns segmentos. Volta pra página para os enviar (não foram deletados)."
+        "message": "Parece que você se esqueceu de enviar alguns segmentos. Volte para aquela página para enviá-los (eles não foram deletados)."
     },
     "clearTimes": {
         "message": "Apagar intervalos dos patrocínios"
@@ -111,25 +111,25 @@
         "message": "Abrir o Popup SponsorBlock"
     },
     "SubmitTimes": {
-        "message": "Submeter intervalos dos patrocínios"
+        "message": "Enviar intervalos de patrocínios"
     },
     "submitCheck": {
-        "message": "Tem a certeza que pretende submeter?"
+        "message": "Você tem certeza que deseja enviar isto?"
     },
     "whitelistChannel": {
-        "message": "Meter canal na Whitelist"
+        "message": "Colocar canal na lista branca"
     },
     "removeFromWhitelist": {
-        "message": "Remover canal da Whitelist"
+        "message": "Remover canal da lista branca"
     },
     "voteOnTime": {
         "message": "Vote num intervalo de patrocínio"
     },
     "recordTimes": {
-        "message": "Registe um intervalo de patrocínio"
+        "message": "Grave os intervalos de um patrocínio"
     },
     "soFarUHSubmited": {
-        "message": "Até agora submeteu"
+        "message": "Até agora, você já enviou"
     },
     "savedPeopleFrom": {
         "message": "Poupaste a outros de "
@@ -141,10 +141,10 @@
         "message": "aqui"
     },
     "recordTimesDescription": {
-        "message": "Clique no botão abaixo quando o patrocínio começar e quando terminar para registrar e submetê-lo à base de dados."
+        "message": "Clique no botão abaixo quando o patrocínio começa e termina para gravá-lo na base de dados."
     },
     "popupHint": {
-        "message": "Dica: Aperte a tecla ; enquanto reproduzir o vídeo para registar o começo/fim de um patrocínio e \" para enviar. (Essa configuração pode ser mudada em opções.)"
+        "message": "Dica: Aperte a tecla ponto e vírgula (;) com a janela focada em um vídeo para reportar o começo/fim de um patrocínio e aspas (\") para enviar. (Esta configuração pode ser mudada nas opções.)"
     },
     "lastTimes": {
         "message": "Últimos Intervalos de Patrocínios Seleciados"
@@ -159,10 +159,10 @@
         "message": "Isso é usado na página pública de estatísticas que mostra o quanto você já contríbuíu. Veja-a"
     },
     "setUsername": {
-        "message": "Criar nomde de utilizador"
+        "message": "Definir nome de usuário"
     },
     "discordAdvert": {
-        "message": "Junte-se ao discord oficial para sugerir dicas e sugestões!"
+        "message": "Junte-se ao servidor do discord oficial para dar dicas e sugestões!"
     },
     "hideThis": {
         "message": "Esconder isto"

public/_locales/sv/messages.json

@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
     "fullName": {
         "message": "SponsorBlock för YouTube - Hoppa över sponsring",
         "description": "Name of the extension."
@@ -19,6 +23,9 @@
     "channelWhitelisted": {
         "message": "Kanal vitlistad!"
     },
+    "Sponsor": {
+        "message": "sponsor"
+    },
     "Sponsors": {
         "message": "sponsorer"
     },
@@ -31,6 +38,9 @@
     "reportButtonTitle": {
         "message": "Rapportera"
     },
+    "reportButtonInfo": {
+        "message": "Rapportera det här segmentet som inkorrekt."
+    },
     "Dismiss": {
         "message": "Avfärda"
     },
@@ -58,6 +68,9 @@
     "paused": {
         "message": "Pausad"
     },
+    "manualPaused": {
+        "message": "Timern stoppad"
+    },
     "confirmMSG": {
         "message": "Klicka på infoknappen eller öppna popup-rutan genom att klicka på tilläggets ikon i hörnet uppe till höger för att redigera eller ta bort inviduella värden."
     },
@@ -88,6 +101,9 @@
     "voted": {
         "message": "Röstat!"
     },
+    "serverDown": {
+        "message": "Det verkar som att servern är nere. Kontakta utvecklaren omedelbart."
+    },
     "connectionError": {
         "message": "Anslutningsfel. Felkod: "
     },
@@ -130,6 +146,9 @@
     "viewLeaderboard": {
         "message": "Se leaderboarden"
     },
+    "here": {
+        "message": "här"
+    },
     "recordTimesDescription": {
         "message": "Klicka på knappen nedan när sponsormeddelandet börjar och slutar för att spela in och rapportera till databasen."
     },
@@ -253,6 +272,9 @@
     "skip": {
         "message": "Hoppa över"
     },
+    "skipped": {
+        "message": "Skippat"
+    },
     "disableAutoSkip": {
         "message": "Avaktivera Hoppa Över Automatiskt"
     },
@@ -325,6 +347,9 @@
     "supportInvidious": {
         "message": "Stöd Invidious"
     },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) är en tredjeparts YouTube-klient. För att aktivera stöd måste du acceptera de extra behörigheterna. Detta kommer INTE att fungera i incognito i Chrome och andra Cromium-varianter."
+    },
     "optionsInfo": {
         "message": "Aktivera Invidious stöd, avaktivera hoppa över automatiskt, dölj knappar och mer."
     },
@@ -455,6 +480,21 @@
     "category_sponsor": {
         "message": "Sponsormeddelande"
     },
+    "category_intro": {
+        "message": "Intro-animation"
+    },
+    "category_intro_description": {
+        "message": "Intro-animationer som är återkommande i serien eller inte ger direkt värde. Detta bör inte användas på musikvideor."
+    },
+    "category_intro_short": {
+        "message": "Intro"
+    },
+    "category_music_offtopic_description": {
+        "message": "Endast för användning i musikvideor. Detta inkluderar intros och outros i musikvideor."
+    },
+    "category_music_offtopic_short": {
+        "message": "Icke-musik"
+    },
     "disable": {
         "message": "Avaktivera"
     },
@@ -464,6 +504,9 @@
     "showOverlay": {
         "message": "Visa Lager Ovanpå Spelare"
     },
+    "category": {
+        "message": "Kategori"
+    },
     "enableTestingServer": {
         "message": "Aktivera Server För Betatestning"
     },
@@ -482,6 +525,9 @@
     "bracketEnd": {
         "message": "(Slut)"
     },
+    "hiddenDueToDuration": {
+        "message": "dold: för kort"
+    },
     "channelDataNotFound": {
         "message": "Kanal-ID är inte inladdat än."
     },
@@ -490,5 +536,24 @@
     },
     "itCouldBeAdblockerIssue": {
         "message": "Om detta fortsätter att inträffa, kan orsaken vara din annonsblockerare. Vänligen kontrollera https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "downvoteDescription": {
+        "message": "Fel timing"
+    },
+    "incorrectCategory": {
+        "message": "Fel kategori"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "Den här videon är kategoriserad som musik. Är du säker på att du vill skicka in segment med icke-musikkategorier? Om denna video faktiskt är musik, bör du inte skicka in detta segment. Vänligen läs riktlinjerna om du är förvirrad."
+    },
+    "multipleSegments": {
+        "message": "Flera segment"
+    },
+    "guidelines": {
+        "message": "Riktlinjer"
+    },
+    "readTheGuidelines": {
+        "message": "Läs riktlinjerna!!",
+        "description": "Show the first time they submit or if they are \"high risk\""
     }
 }

public/options/options.html

@@ -12,13 +12,13 @@
 
 <body class="sponsorBlockPageBody">
 
-	<div id="title">
+	<div id="title" class="titleBar">
 		<img src="../icons/LogoSponsorBlocker256px.png" height="80" class="profilepic"/>
 		SponsorBlock
 	</div>
 
 	<div class="center">
-		<p class="createdBy">__MSG_createdBy__ <a href="https://ajay.app">Ajay Ramachandran</a> <img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
+		<p class="createdBy titleBar">__MSG_createdBy__ <a href="https://ajay.app">Ajay Ramachandran</a> <img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
 
 		<h1>__MSG_Options__</h1>
 	
@@ -152,6 +152,40 @@
 			<br/>
 			<br/>
 
+			<div option-type="toggle" sync-option="unsubmittedWarning">
+				<label class="switch-container" label-name="__MSG_unsubmittedWarning__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_unsubmittedWarningDescription__</div>
+			</div>
+	
+			<br/>
+			<br/>
+
+			<div option-type="toggle" sync-option="forceChannelCheck">
+				<label class="switch-container" label-name="__MSG_forceChannelCheck__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_whatForceChannelCheck__</div>
+			</div>
+	
+			<br/>
+			<br/>
+	
 			<div option-type="toggle" toggle-type="reverse" sync-option="hideVideoPlayerControls">
 				<label class="switch-container" label-name="__MSG_showButtons__">
 					<label class="switch">
@@ -237,6 +271,23 @@
 			<br/>
 			<br/>
 
+			<div option-type="toggle" sync-option="showTimeWithSkips">
+				<label class="switch-container" label-name="__MSG_showTimeWithSkips__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_showTimeWithSkipsDescription__</div>
+			</div>
+
+			<br/>
+			<br/>
+	
 			<div option-type="toggle" sync-option="trackViewCount">
 				<label class="switch-container" label-name="__MSG_enableViewTracking__">
 					<label class="switch">

public/popup.html

@@ -10,7 +10,7 @@
       <div id="app" class="popupBody sponsorBlockPageBody">
           <h1 class="popupElement logoText">
             <img src="icons/IconSponsorBlocker256px.png" height="32px" id="sponsorBlockPopupLogo"/>
-            __MSG_Name__
+            SponsorBlock
           </h1>
 
           <!-- Loading text -->

src/background.ts

@@ -40,21 +40,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
                 });
             });
         
-            return true;
-        case "addSponsorTime":
-            addSponsorTime(request.time, request.videoID, callback);
-        
-            //this allows the callback to be called later
-            return true;
-        
-        case "getSponsorTimes":
-            getSponsorTimes(request.videoID, function(sponsorTimes) {
-                callback({
-                    sponsorTimes
-                });
-            });
-        
-            //this allows the callback to be called later
             return true;
         case "submitVote":
             submitVote(request.type, request.UUID, request.category).then(callback);
@@ -127,38 +112,6 @@ function unregisterFirefoxContentScript(id: string) {
     delete contentScriptRegistrations[id];
 }
 
-//gets the sponsor times from memory
-function getSponsorTimes(videoID, callback) {
-    let sponsorTimes = [];
-    let sponsorTimesStorage = Config.config.sponsorTimes.get(videoID);
-
-    if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) {
-        sponsorTimes = sponsorTimesStorage;
-    }
-	
-    callback(sponsorTimes);
-}
-
-function addSponsorTime(time, videoID, callback) {
-    getSponsorTimes(videoID, function(sponsorTimes) {
-        //add to sponsorTimes
-        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) {
-            //it is an end time
-            sponsorTimes[sponsorTimes.length - 1][1] = time;
-        } else {
-            //it is a start time
-            let sponsorTimesIndex = sponsorTimes.length;
-            sponsorTimes[sponsorTimesIndex] = [];
-
-            sponsorTimes[sponsorTimesIndex][0] = time;
-        }
-
-        //save this info
-		Config.config.sponsorTimes.set(videoID, sponsorTimes);
-		callback();
-    });
-}
-
 async function submitVote(type: number, UUID: string, category: string) {
     let userID = Config.config.userID;
 

src/components/SkipNoticeComponent.tsx

@@ -134,13 +134,6 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
             this.audio.volume = this.contentContainer().v.volume * 0.1;
             this.audio.play();
         }
-
-        if (Config.config.categoryUpdateShowCount < 3 && Config.config.categorySelections.length <= 1) {
-            this.setNoticeInfoMessageWithOnClick(() => chrome.runtime.sendMessage({"message": "openConfig"})
-                , chrome.i18n.getMessage("categoryUpdate1"), chrome.i18n.getMessage("categoryUpdate2"));
-
-            Config.config.categoryUpdateShowCount = Config.config.categoryUpdateShowCount + 1
-        }
     }
 
     render() {

src/components/SponsorTimeEditComponent.tsx

@@ -322,7 +322,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
         sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value;
 
-        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+        Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimesSubmitting);
 
         this.props.contentContainer().updatePreviewBar();
     }
@@ -354,7 +354,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         sponsorTimes.splice(index, 1);
   
         //save this
-        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimes);
 
         this.props.contentContainer().updatePreviewBar();
         

src/config.ts

@@ -1,12 +1,13 @@
 import * as CompileConfig from "../config.json";
-import { CategorySelection, CategorySkipOption, PreviewBarOption } from "./types";
+import { CategorySelection, CategorySkipOption, PreviewBarOption, SponsorTime } from "./types";
 
 import Utils from "./utils";
 const utils = new Utils();
 
 interface SBConfig {
     userID: string,
-    sponsorTimes: SBMap<string, any>,
+    // sponsorTimes: SBMap<string, SponsorTime[]>,
+    segmentTimes: SBMap<string, SponsorTime[]>,
     whitelistedChannels: string[],
     forceChannelCheck: boolean,
     startSponsorKeybind: string,
@@ -15,6 +16,7 @@ interface SBConfig {
     skipCount: number,
     sponsorTimesContributed: number,
     submissionCountSinceCategories: number, // New count used to show the "Read The Guidelines!!" message
+    showTimeWithSkips: boolean,
     unsubmittedWarning: boolean,
     disableSkipping: boolean,
     trackViewCount: boolean,
@@ -33,8 +35,6 @@ interface SBConfig {
     checkForUnlistedVideos: boolean,
     testingServer: boolean,
 
-    categoryUpdateShowCount: number,
-
     // What categories should be skipped
     categorySelections: CategorySelection[],
 
@@ -51,7 +51,7 @@ interface SBConfig {
         "selfpromo": PreviewBarOption,
         "preview-selfpromo": PreviewBarOption,
         "music_offtopic": PreviewBarOption,
-        "preview-music_offtopic": PreviewBarOption
+        "preview-music_offtopic": PreviewBarOption,
     }
 }
 
@@ -84,35 +84,39 @@ class SBMap<T, U> extends Map {
         }
     }
 
-    set(key, value) {
+    get(key): U {
-        const result = super.set(key, value);
+        return super.get(key);
+    }
 
+    rawSet(key, value) {
+        return super.set(key, value);
+    }
+
+    update() {
         // Store updated SBMap locally
         chrome.storage.sync.set({
             [this.id]: encodeStoredItem(this)
         });
+    }
 
+    set(key: T, value: U) {
+        const result = super.set(key, value);
+
+        this.update();
         return result;
     }
 	
     delete(key) {
         const result = super.delete(key);
 
-	    // Store updated SBMap locally
+	    this.update();
-	    chrome.storage.sync.set({
-            [this.id]: encodeStoredItem(this)
-        });
-
         return result;
     }
 
     clear() {
         const result = super.clear();
 
-	    chrome.storage.sync.set({
+        this.update();
-            [this.id]: encodeStoredItem(this)
-        });
-
         return result;
     }
 }
@@ -124,7 +128,7 @@ var Config: SBObject = {
     configListeners: [],
     defaults: {
         userID: null,
-        sponsorTimes: new SBMap("sponsorTimes"),
+        segmentTimes: new SBMap("segmentTimes"),
         whitelistedChannels: [],
         forceChannelCheck: false,
         startSponsorKeybind: ";",
@@ -133,6 +137,7 @@ var Config: SBObject = {
         skipCount: 0,
         sponsorTimesContributed: 0,
         submissionCountSinceCategories: 0,
+	    showTimeWithSkips: true,
         unsubmittedWarning: true,
         disableSkipping: false,
         trackViewCount: true,
@@ -151,8 +156,6 @@ var Config: SBObject = {
         checkForUnlistedVideos: false,
         testingServer: false,
 
-        categoryUpdateShowCount: 0,
-
         categorySelections: [{
             name: "sponsor",
             option: CategorySkipOption.AutoSkip
@@ -238,24 +241,13 @@ function encodeStoredItem<T>(data: T): T | Array<any>  {
  * 
  * @param {*} data 
  */
-function decodeStoredItem<T>(id: string, data: T): T | SBMap<string, any> {
+function decodeStoredItem<T>(id: string, data: T): T | SBMap<string, SponsorTime[]> {
     if (!Config.defaults[id]) return data;
 
     if (Config.defaults[id] instanceof SBMap) {
         try {
-            let jsonData: any = data;
+            if (!Array.isArray(data)) return data;
-
+            return new SBMap(id, data);
-            // Check if data is stored in the old format for SBMap (a JSON string)
-            if (typeof data === "string") {
-                try {	
-                    jsonData = JSON.parse(data);	   
-                } catch(e) {
-                    // Continue normally (out of this if statement)
-                }
-            }
-
-            if (!Array.isArray(jsonData)) return data;
-            return new SBMap(id, jsonData);
         } catch(e) {
             console.error("Failed to parse SBMap: " + id);
         }
@@ -313,9 +305,9 @@ function fetchConfig() {
     });
 }
 
-async function migrateOldFormats() {
+function migrateOldFormats(config: SBConfig) {
-    if (Config.config["disableAutoSkip"]) {
+    if (config["disableAutoSkip"]) {
-        for (const selection of Config.config.categorySelections) {
+        for (const selection of config.categorySelections) {
             if (selection.name === "sponsor") {
                 selection.option = CategorySkipOption.ManualSkip;
 
@@ -325,24 +317,30 @@ async function migrateOldFormats() {
     }
 
     // Auto vote removal
-    if (Config.config["autoUpvote"]) {
+    if (config["autoUpvote"]) {
         chrome.storage.sync.remove("autoUpvote");
     }
-
     // mobileUpdateShowCount removal
-    if (Config.config["mobileUpdateShowCount"] !== undefined) {
+    if (config["mobileUpdateShowCount"] !== undefined) {
         chrome.storage.sync.remove("mobileUpdateShowCount");
     }
+    // categoryUpdateShowCount removal
+    if (config["categoryUpdateShowCount"] !== undefined) {
+        chrome.storage.sync.remove("categoryUpdateShowCount");
+    }
 
     // Channel URLS
-    if (Config.config.whitelistedChannels.length > 0 && 
+    if (config.whitelistedChannels.length > 0 && 
-            (Config.config.whitelistedChannels[0] == null || Config.config.whitelistedChannels[0].includes("/"))) {
+            (config.whitelistedChannels[0] == null || config.whitelistedChannels[0].includes("/"))) {
+        const channelURLFixer = async() => {
             let newChannelList: string[] = [];
-        for (const item of Config.config.whitelistedChannels) {
+            for (const item of config.whitelistedChannels) {
                 if (item != null) {
                     if (item.includes("/channel/")) {
                         newChannelList.push(item.split("/")[2]);
                     } else if (item.includes("/user/") &&  utils.isContentScript()) {
+
+                        
                         // Replace channel URL with channelID
                         let response = await utils.asyncRequestToCustomServer("GET", "https://sponsor.ajay.app/invidious/api/v1/channels/" + item.split("/")[2] + "?fields=authorId");
                     
@@ -361,26 +359,66 @@ async function migrateOldFormats() {
                 }
             }
 
-        Config.config.whitelistedChannels = newChannelList;
+            config.whitelistedChannels = newChannelList;
+        }
+
+        channelURLFixer();
     }
 
     // Check if off-topic category needs to be removed
-    for (let i = 0; i < Config.config.categorySelections.length; i++) {
+    for (let i = 0; i < config.categorySelections.length; i++) {
-        if (Config.config.categorySelections[i].name === "offtopic") {
+        if (config.categorySelections[i].name === "offtopic") {
-            Config.config.categorySelections.splice(i, 1);
+            config.categorySelections.splice(i, 1);
             // Call set listener
-            Config.config.categorySelections = Config.config.categorySelections;
+            config.categorySelections = config.categorySelections;
             break;
         }
     }
+
+    // Migrate old "sponsorTimes"
+    if (config["sponsorTimes"]) {
+        let jsonData: any = config["sponsorTimes"];
+
+        // Check if data is stored in the old format for SBMap (a JSON string)
+        if (typeof jsonData === "string") {
+            try {	
+                jsonData = JSON.parse(jsonData);	   
+            } catch(e) {
+                // Continue normally (out of this if statement)
+            }
+        }
+
+        // Otherwise junk data
+        if (Array.isArray(jsonData)) {
+            let oldMap = new Map(jsonData);
+            oldMap.forEach((sponsorTimes: number[][], key) => {
+                let segmentTimes: SponsorTime[] = [];
+                for (const segment of sponsorTimes) {
+                    segmentTimes.push({
+                        segment: segment,
+                        category: "sponsor",
+                        UUID: null
+                    });
+                }
+
+                config.segmentTimes.rawSet(key, segmentTimes);
+            });
+
+            config.segmentTimes.update();
+        }
+
+        chrome.storage.sync.remove("sponsorTimes");
+    }
 }
 
 async function setupConfig() {
     await fetchConfig();
     addDefaults();
     convertJSON();
-    Config.config = configProxy();
+    const config = configProxy();
-    migrateOldFormats();
+    migrateOldFormats(config);
+
+    Config.config = config;
 }
 
 // Reset config
@@ -399,6 +437,12 @@ function addDefaults() {
     for (const key in Config.defaults) {
         if(!Config.localConfig.hasOwnProperty(key)) {
 	        Config.localConfig[key] = Config.defaults[key];
+        } else if (key === "barTypes") {
+            for (const key2 in Config.defaults[key]) {
+                if(!Config.localConfig[key].hasOwnProperty(key2)) {
+                    Config.localConfig[key][key2] = Config.defaults[key][key2];
+                }
+            }
         }
     }
 };

src/content.ts

@@ -323,13 +323,13 @@ async function videoIDChange(id) {
     //warn them if they had unsubmitted times
     if (previousVideoID != null) {
         //get the sponsor times from storage
-        let sponsorTimes = Config.config.sponsorTimes.get(previousVideoID);
+        let sponsorTimes = Config.config.segmentTimes.get(previousVideoID);
         if (sponsorTimes != undefined && sponsorTimes.length > 0) {
             //warn them that they have unsubmitted sponsor times
             chrome.runtime.sendMessage({
                 message: "alertPrevious",
                 previousVideoID: previousVideoID
-                })
+            });
         }
 
         //set the previous video id to the currentID
@@ -347,10 +347,10 @@ async function videoIDChange(id) {
     //make sure everything is properly added
     updateVisibilityOfPlayerControlsButton().then(() => {
         //see if the onvideo control image needs to be changed
-        let segments = Config.config.sponsorTimes.get(sponsorVideoID);
+        let segments = Config.config.segmentTimes.get(sponsorVideoID);
-        if (segments != null && segments.length > 0 && segments[segments.length - 1].length >= 2) {
+        if (segments != null && segments.length > 0 && segments[segments.length - 1].segment.length >= 2) {
             changeStartSponsorButton(true, true);
-        } else if (segments != null && segments.length > 0 && segments[segments.length - 1].length < 2) {
+        } else if (segments != null && segments.length > 0 && segments[segments.length - 1].segment.length < 2) {
             changeStartSponsorButton(false, true);
         } else {
             changeStartSponsorButton(true, false);
@@ -818,6 +818,10 @@ function updatePreviewBar() {
 
     previewBar.set(utils.getSegmentsFromSponsorTimes(allSponsorTimes), types, video.duration)
 
+    if (Config.config.showTimeWithSkips) {
+        showTimeWithoutSkips(allSponsorTimes);
+    }
+
     //update last video id
     lastPreviewBarUpdate = sponsorVideoID;
 }
@@ -1169,31 +1173,24 @@ function startSponsorClicked() {
         });
     }
 
-    // Create raw segment list
-    let segments: number[][] = [];
-    for (const sponsorTime of sponsorTimesSubmitting) {
-        segments.push(sponsorTime.segment);
-    }
-
     //save this info
-    Config.config.sponsorTimes.set(sponsorVideoID, segments);
+    Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);
 
     updateSponsorTimesSubmitting(false)
 }
 
 function updateSponsorTimesSubmitting(getFromConfig: boolean = true) {
-    let segments = Config.config.sponsorTimes.get(sponsorVideoID);
+    let segmentTimes = Config.config.segmentTimes.get(sponsorVideoID);
 
     //see if this data should be saved in the sponsorTimesSubmitting variable
-    if (getFromConfig && segments != undefined) {
+    if (getFromConfig && segmentTimes != undefined) {
         sponsorTimesSubmitting = [];
 
-        for (const segment of segments) {
+        for (const segmentTime of segmentTimes) {
             sponsorTimesSubmitting.push({
-                segment: segment,
+                segment: segmentTime.segment,
                 UUID: null,
-                // Default to sponsor
+                category: segmentTime.category
-                category: "sponsor"
             });
         }
     }
@@ -1317,7 +1314,7 @@ function clearSponsorTimes() {
 
     let currentVideoID = sponsorVideoID;
 
-    let sponsorTimes = Config.config.sponsorTimes.get(currentVideoID);
+    let sponsorTimes = Config.config.segmentTimes.get(currentVideoID);
 
     if (sponsorTimes != undefined && sponsorTimes.length > 0) {
         let confirmMessage = chrome.i18n.getMessage("clearThis") + getSegmentsMessage(sponsorTimes)
@@ -1325,7 +1322,7 @@ function clearSponsorTimes() {
         if(!confirm(confirmMessage)) return;
 
         //clear the sponsor times
-        Config.config.sponsorTimes.delete(currentVideoID);
+        Config.config.segmentTimes.delete(currentVideoID);
 
         //clear sponsor times submitting
         sponsorTimesSubmitting = [];
@@ -1447,14 +1444,14 @@ async function sendSubmitMessage(){
     }
 
     //update sponsorTimes
-    Config.config.sponsorTimes.set(sponsorVideoID, utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+    Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);
 
     // Check to see if any of the submissions are below the minimum duration set
     if (Config.config.minDuration > 0) {
         for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
             if (sponsorTimesSubmitting[i].segment[1] - sponsorTimesSubmitting[i].segment[0] < Config.config.minDuration) {
                 let confirmShort = chrome.i18n.getMessage("shortCheck") + "\n\n" + 
-                    getSegmentsMessage(utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+                    getSegmentsMessage(sponsorTimesSubmitting);
                 
                 if(!confirm(confirmShort)) return;
             }
@@ -1484,7 +1481,7 @@ async function sendSubmitMessage(){
         submitButton.addEventListener("animationend", animationEndListener);
 
         //clear the sponsor times
-        Config.config.sponsorTimes.delete(sponsorVideoID);
+        Config.config.segmentTimes.delete(sponsorVideoID);
 
         //add submissions to current sponsors list
         if (sponsorTimes === null) sponsorTimes = [];
@@ -1512,12 +1509,12 @@ async function sendSubmitMessage(){
 }
 
 //get the message that visually displays the video times
-function getSegmentsMessage(segments: number[][]): string {
+function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
     let sponsorTimesMessage = "";
 
-    for (let i = 0; i < segments.length; i++) {
+    for (let i = 0; i < sponsorTimes.length; i++) {
-        for (let s = 0; s < segments[i].length; s++) {
+        for (let s = 0; s < sponsorTimes[i].segment.length; s++) {
-            let timeMessage = utils.getFormattedTime(segments[i][s]);
+            let timeMessage = utils.getFormattedTime(sponsorTimes[i].segment[s]);
             //if this is an end time
             if (s == 1) {
                 timeMessage = " to " + timeMessage;
@@ -1593,3 +1590,36 @@ function updateAdFlag() {
         updateVisibilityOfPlayerControlsButton();
     }
 }
+
+function showTimeWithoutSkips(allSponsorTimes): void {
+	let skipDuration = 0;
+	
+	// Calculate skipDuration based from the segments in the preview bar
+	for (let i = 0; i < allSponsorTimes.length; i++) {
+        // If an end time exists
+        if (allSponsorTimes[i].segment[1]) {
+            skipDuration += allSponsorTimes[i].segment[1] - allSponsorTimes[i].segment[0];
+        }
+		
+	}
+	
+	// YouTube player time display
+	let display = document.getElementsByClassName("ytp-time-display notranslate")[0];
+	if (display === undefined) return
+	
+    let formatedTime = utils.getFormattedTime(video.duration - skipDuration);
+	
+	const durationID = "sponsorBlockDurationAfterSkips";	
+    let duration = document.getElementById(durationID);
+
+	// Create span if needed
+	if(duration === null) {
+		duration = document.createElement('span');
+        duration.id = durationID;
+        duration.classList.add("ytp-time-duration");
+
+		display.appendChild(duration);
+	}
+		
+    duration.innerText = (skipDuration <= 0 || isNaN(skipDuration)) ? "" : " ("+formatedTime+")";
+}

src/js-components/previewBar.ts

@@ -6,6 +6,8 @@
 'use strict';
 
 import Config from "../config";
+import Utils from "../utils";
+let utils = new Utils();
 
 class PreviewBar {
 	container: HTMLUListElement;
@@ -79,8 +81,8 @@ class PreviewBar {
 						tooltipTextWrapper.classList.remove("sbTooltipOneTitleThumbnailOffset");
 					} else if (category !== null) {
 						categoryTooltip.classList.remove("sbHidden");
-						categoryTooltip.textContent = chrome.i18n.getMessage("category_" + category) 
+						categoryTooltip.textContent = utils.shortCategoryName(category)
-							|| (chrome.i18n.getMessage("preview") + " " + chrome.i18n.getMessage("category_" + category.split("preview-")[1]));
+							|| (chrome.i18n.getMessage("preview") + " " + utils.shortCategoryName(category.split("preview-")[1]));
 
 						// There is a title now
 						tooltip.classList.remove("ytp-tooltip-text-no-title");

src/options.ts

@@ -237,7 +237,7 @@ function invidiousInstanceAddInit(element: HTMLElement, option: string) {
 
     let setButton = element.querySelector(".text-change-set");
     setButton.addEventListener("click", async function(e) {
-        if (textBox.value == "" || textBox.value.includes("/") || textBox.value.includes("http") || textBox.value.includes(":")) {
+        if (textBox.value == "" || textBox.value.includes("/") || textBox.value.includes("http")) {
             alert(chrome.i18n.getMessage("addInvidiousInstanceError"));
         } else {
             // Add this
@@ -298,7 +298,8 @@ function invidiousInit(checkbox: HTMLInputElement, option: string) {
  * @param checkbox 
  * @param option 
  */
-function invidiousOnClick(checkbox: HTMLInputElement, option: string) {
+async function invidiousOnClick(checkbox: HTMLInputElement, option: string) {
+    return new Promise((resolve) => {
         if (checkbox.checked) {
             utils.setupExtraSitePermissions(function (granted) {
                 if (!granted) {
@@ -307,10 +308,13 @@ function invidiousOnClick(checkbox: HTMLInputElement, option: string) {
                 } else {
                     checkbox.checked = true;
                 }
+
+                resolve();
             });
         } else {
             utils.removeExtraSiteRegistration();
         }
+    });
 }
 
 /**
@@ -358,15 +362,6 @@ function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) {
         let button: HTMLElement = element.querySelector(".trigger-button");
         let option = element.getAttribute("sync-option");
 
-        // Don't allow keys which are already listened for by youtube 
-        let restrictedKeys = "1234567890,.jklftcibmJKLFTCIBMNP/<> -+";
-        if (restrictedKeys.indexOf(key) !== -1 ) {
-            closeKeybindOption(element, button);
-
-            alert(chrome.i18n.getMessage("theKey") + " " + key + " " + chrome.i18n.getMessage("keyAlreadyUsedByYouTube"));
-            return;
-        }
-
         // Make sure keybind isn't used by the other listener
         // TODO: If other keybindings are going to be added, we need a better way to find the other keys used.
         let otherKeybind = (option === "startSponsorKeybind") ? Config.config['submitKeybind'] : Config.config['startSponsorKeybind'];
@@ -435,8 +430,8 @@ function activatePrivateTextChange(element: HTMLElement) {
         case "*":
             let jsonData = JSON.parse(JSON.stringify(Config.localConfig));
 
-            // Fix sponsorTimes data as it is destroyed from the JSON stringify
+            // Fix segmentTimes data as it is destroyed from the JSON stringify
-            jsonData.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+            jsonData.segmentTimes = Config.encodeStoredItem(Config.localConfig.segmentTimes);
 
             result = JSON.stringify(jsonData);
             break;
@@ -445,7 +440,7 @@ function activatePrivateTextChange(element: HTMLElement) {
     textBox.value = result;
     
     let setButton = element.querySelector(".text-change-set");
-    setButton.addEventListener("click", () => {
+    setButton.addEventListener("click", async () => {
         let confirmMessage = element.getAttribute("confirm-message");
 
         if (confirmMessage === null || confirm(chrome.i18n.getMessage(confirmMessage))) {
@@ -460,16 +455,15 @@ function activatePrivateTextChange(element: HTMLElement) {
                         }
                         Config.convertJSON();
 
-                        // Reload options on page
-                        init();
-
                         if (newConfig.supportInvidious) {
                             let checkbox = <HTMLInputElement> document.querySelector("#support-invidious > label > label > input");
                             
                             checkbox.checked = true;
-                            invidiousOnClick(checkbox, "supportInvidious");
+                            await invidiousOnClick(checkbox, "supportInvidious");
                         }
 
+                        window.location.reload();
+                        
                     } catch (e) {
                         alert(chrome.i18n.getMessage("incorrectlyFormattedOptions"));
                     }
@@ -519,8 +513,8 @@ function copyDebugOutputToClipboard() {
         config: JSON.parse(JSON.stringify(Config.localConfig)) // Deep clone config object
     };
 
-    // Fix sponsorTimes data as it is destroyed from the JSON stringify
+    // Fix segmentTimes data as it is destroyed from the JSON stringify
-    output.config.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+    output.config.segmentTimes = Config.encodeStoredItem(Config.localConfig.segmentTimes);
     
     // Sanitise sensitive user config values
     delete output.config.userID;

src/popup.ts

@@ -119,7 +119,7 @@ async function runThePopup(messageListener?: MessageListener) {
     let startTimeChosen = false;
   
     //the start and end time pairs (2d)
-    let sponsorTimes = [];
+    let sponsorTimes: SponsorTime[] = [];
   
     //current video ID of this tab
     let currentVideoID = null;
@@ -252,9 +252,9 @@ async function runThePopup(messageListener?: MessageListener) {
         }
   
         //load video times for this video 
-        let sponsorTimesStorage = Config.config.sponsorTimes.get(currentVideoID);
+        let sponsorTimesStorage = Config.config.segmentTimes.get(currentVideoID);
         if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) {
-            if (sponsorTimesStorage[sponsorTimesStorage.length - 1] != undefined && sponsorTimesStorage[sponsorTimesStorage.length - 1].length < 2) {
+            if (sponsorTimesStorage[sponsorTimesStorage.length - 1] != undefined && sponsorTimesStorage[sponsorTimesStorage.length - 1].segment.length < 2) {
                 startTimeChosen = true;
                 PageElements.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEnd");
             }
@@ -336,13 +336,17 @@ async function runThePopup(messageListener?: MessageListener) {
         let sponsorTimesIndex = sponsorTimes.length - (startTimeChosen ? 1 : 0);
   
         if (sponsorTimes[sponsorTimesIndex] == undefined) {
-            sponsorTimes[sponsorTimesIndex] = [];
+            sponsorTimes[sponsorTimesIndex] = {
+                segment: [],
+                category: "sponsor",
+                UUID: null
+            };
         }
   
-        sponsorTimes[sponsorTimesIndex][startTimeChosen ? 1 : 0] = response.time;
+        sponsorTimes[sponsorTimesIndex].segment[startTimeChosen ? 1 : 0] = response.time;
 
         let localStartTimeChosen = startTimeChosen;
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
         
         //send a message to the client script
         if (localStartTimeChosen) {
@@ -528,7 +532,7 @@ async function runThePopup(messageListener?: MessageListener) {
     }
 
     function previewSponsorTime(index) {
-        let skipTime = sponsorTimes[index][0];
+        let skipTime = sponsorTimes[index].segment[0];
 
         if (document.getElementById("startTimeMinutes" + index) != null) {
             //edit is currently open, use that time
@@ -575,28 +579,28 @@ async function runThePopup(messageListener?: MessageListener) {
         startTimeMinutes.id = "startTimeMinutes" + index;
         startTimeMinutes.className = "sponsorTime popupElement";
         startTimeMinutes.type = "text";
-        startTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index][0]));
+        startTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index].segment[0]));
         startTimeMinutes.style.width = "45px";
     
         let startTimeSeconds = document.createElement("input");
         startTimeSeconds.id = "startTimeSeconds" + index;
         startTimeSeconds.className = "sponsorTime popupElement";
         startTimeSeconds.type = "text";
-        startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][0]);
+        startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index].segment[0]);
         startTimeSeconds.style.width = "60px";
 
         let endTimeMinutes = document.createElement("input");
         endTimeMinutes.id = "endTimeMinutes" + index;
         endTimeMinutes.className = "sponsorTime popupElement";
         endTimeMinutes.type = "text";
-        endTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index][1]));
+        endTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index].segment[1]));
         endTimeMinutes.style.width = "45px";
     
         let endTimeSeconds = document.createElement("input");
         endTimeSeconds.id = "endTimeSeconds" + index;
         endTimeSeconds.className = "sponsorTime popupElement";
         endTimeSeconds.type = "text";
-        endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][1]);
+        endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index].segment[1]);
         endTimeSeconds.style.width = "60px";
 
         //the button to set the current time
@@ -668,11 +672,11 @@ async function runThePopup(messageListener?: MessageListener) {
     }
   
     function saveSponsorTimeEdit(index, closeEditMode = true) {
-        sponsorTimes[index][0] = getSponsorTimeEditTimes("startTime", index);
+        sponsorTimes[index].segment[0] = getSponsorTimeEditTimes("startTime", index);
-        sponsorTimes[index][1] = getSponsorTimeEditTimes("endTime", index);
+        sponsorTimes[index].segment[1] = getSponsorTimeEditTimes("endTime", index);
   
         //save this
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
         
         messageHandler.query({
             active: true,
@@ -692,7 +696,7 @@ async function runThePopup(messageListener?: MessageListener) {
     //deletes the sponsor time submitted at an index
     function deleteSponsorTime(index) {
         //if it is not a complete sponsor time
-        if (sponsorTimes[index].length < 2) {
+        if (sponsorTimes[index].segment.length < 2) {
             messageHandler.query({
                 active: true,
                 currentWindow: true
@@ -710,7 +714,7 @@ async function runThePopup(messageListener?: MessageListener) {
         sponsorTimes.splice(index, 1);
   
         //save this
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
         
         //if they are all removed
         if (sponsorTimes.length == 0) {
@@ -780,7 +784,7 @@ async function runThePopup(messageListener?: MessageListener) {
     //hides and shows the submit times button when needed
     function showSubmitTimesIfNecessary() {
         //check if an end time has been specified for the latest sponsor time
-        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length > 1) {
+        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].segment.length > 1) {
             //show submit times button
             document.getElementById("submitTimesContainer").style.display = "unset";
         } else {

src/utils.ts

@@ -338,7 +338,7 @@ class Utils {
             secondsNum = Math.floor(secondsNum);
         }
 
-        let secondsDisplay: string = String(secondsNum.toFixed(3));
+        let secondsDisplay: string = String(precise ? secondsNum.toFixed(3) : secondsNum);
         
         if (secondsNum < 10) {
             //add a zero
@@ -350,6 +350,10 @@ class Utils {
         return formatted;
     }
 
+    shortCategoryName(categoryName: string): string {
+        return chrome.i18n.getMessage("category_" + categoryName + "_short") || chrome.i18n.getMessage("category_" + categoryName);
+    }
+
     getRawSeconds(minutes: number, seconds: number): number {
         return minutes * 60 + seconds;
     }