test old driver

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-- [ ] I agree to license my contribution under GPL-3.0 and agree to allow distribution on app stores as outlined in [LICENSE-APPSTORE](https://github.com/ajayyy/SponsorBlock/blob/master/LICENSE-APPSTORE.txt)
+- [ ] I agree to license my contribution under LGPL-3.0 **or** my contribution is from another project with a license compatible with LGPL-3.0
 
 To test this pull request, follow the [instructions in the wiki](https://github.com/ajayyy/SponsorBlock/wiki/Testing-a-Pull-Request).
 

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-If you make any contributions to SponsorBlock after this file was created, you are agreeing that any code you have contributed will be licensed under GPL-3.0 and agree to allow distribution on app stores as outlined in LICENSE-APPSTORE.
+If you make any contributions to SponsorBlock after this file was created, you are agreeing that any code you have contributed will be licensed under LGPL-3.0 or later.
 
 # Translations
 https://crowdin.com/project/sponsorblock

LICENSE

@@ -1,674 +1,165 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+
-
+  This version of the GNU Lesser General Public License incorporates
-  The GNU General Public License is a free, copyleft license for
+the terms and conditions of version 3 of the GNU General Public
-software and other kinds of works.
+License, supplemented by the additional permissions listed below.
-
+
-  The licenses for most software and other practical works are designed
+  0. Additional Definitions.
-to take away your freedom to share and change the works.  By contrast,
+
-the GNU General Public License is intended to guarantee your freedom to
+  As used herein, "this License" refers to version 3 of the GNU Lesser
-share and change all versions of a program--to make sure it remains free
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
-software for all its users.  We, the Free Software Foundation, use the
+General Public License.
-GNU General Public License for most of our software; it applies also to
+
-any other work released this way by its authors.  You can apply it to
+  "The Library" refers to a covered work governed by this License,
-your programs, too.
+other than an Application or a Combined Work as defined below.
-
+
-  When we speak of free software, we are referring to freedom, not
+  An "Application" is any work that makes use of an interface provided
-price.  Our General Public Licenses are designed to make sure that you
+by the Library, but which is not otherwise based on the Library.
-have the freedom to distribute copies of free software (and charge for
+Defining a subclass of a class defined by the Library is deemed a mode
-them if you wish), that you receive source code or can get it if you
+of using an interface provided by the Library.
-want it, that you can change the software or use pieces of it in new
+
-free programs, and that you know you can do these things.
+  A "Combined Work" is a work produced by combining or linking an
-
+Application with the Library.  The particular version of the Library
-  To protect your rights, we need to prevent others from denying you
+with which the Combined Work was made is also called the "Linked
-these rights or asking you to surrender the rights.  Therefore, you have
+Version".
-certain responsibilities if you distribute copies of the software, or if
+
-you modify it: responsibilities to respect the freedom of others.
+  The "Minimal Corresponding Source" for a Combined Work means the
-
+Corresponding Source for the Combined Work, excluding any source code
-  For example, if you distribute copies of such a program, whether
+for portions of the Combined Work that, considered in isolation, are
-gratis or for a fee, you must pass on to the recipients the same
+based on the Application, and not on the Linked Version.
-freedoms that you received.  You must make sure that they, too, receive
+
-or can get the source code.  And you must show them these terms so they
+  The "Corresponding Application Code" for a Combined Work means the
-know their rights.
+object code and/or source code for the Application, including any data
-
+and utility programs needed for reproducing the Combined Work from the
-  Developers that use the GNU GPL protect your rights with two steps:
+Application, but excluding the System Libraries of the Combined Work.
-(1) assert copyright on the software, and (2) offer you this License
+
-giving you legal permission to copy, distribute and/or modify it.
+  1. Exception to Section 3 of the GNU GPL.
-
+
-  For the developers' and authors' protection, the GPL clearly explains
+  You may convey a covered work under sections 3 and 4 of this License
-that there is no warranty for this free software.  For both users' and
+without being bound by section 3 of the GNU GPL.
-authors' sake, the GPL requires that modified versions be marked as
+
-changed, so that their problems will not be attributed erroneously to
+  2. Conveying Modified Versions.
-authors of previous versions.
+
-
+  If you modify a copy of the Library, and, in your modifications, a
-  Some devices are designed to deny users access to install or run
+facility refers to a function or data to be supplied by an Application
-modified versions of the software inside them, although the manufacturer
+that uses the facility (other than as an argument passed when the
-can do so.  This is fundamentally incompatible with the aim of
+facility is invoked), then you may convey a copy of the modified
-protecting users' freedom to change the software.  The systematic
+version:
-pattern of such abuse occurs in the area of products for individuals to
+
-use, which is precisely where it is most unacceptable.  Therefore, we
+   a) under this License, provided that you make a good faith effort to
-have designed this version of the GPL to prohibit the practice for those
+   ensure that, in the event an Application does not supply the
-products.  If such problems arise substantially in other domains, we
+   function or data, the facility still operates, and performs
-stand ready to extend this provision to those domains in future versions
+   whatever part of its purpose remains meaningful, or
-of the GPL, as needed to protect the freedom of users.
+
-
+   b) under the GNU GPL, with none of the additional permissions of
-  Finally, every program is threatened constantly by software patents.
+   this License applicable to that copy.
-States should not allow patents to restrict development and use of
+
-software on general-purpose computers, but in those that do, we wish to
+  3. Object Code Incorporating Material from Library Header Files.
-avoid the special danger that patents applied to a free program could
+
-make it effectively proprietary.  To prevent this, the GPL assures that
+  The object code form of an Application may incorporate material from
-patents cannot be used to render the program non-free.
+a header file that is part of the Library.  You may convey such object
-
+code under terms of your choice, provided that, if the incorporated
-  The precise terms and conditions for copying, distribution and
+material is not limited to numerical parameters, data structure
-modification follow.
+layouts and accessors, or small macros, inline functions and templates
-
+(ten or fewer lines in length), you do both of the following:
-                       TERMS AND CONDITIONS
+
-
+   a) Give prominent notice with each copy of the object code that the
-  0. Definitions.
+   Library is used in it and that the Library and its use are
-
+   covered by this License.
-  "This License" refers to version 3 of the GNU General Public License.
+
-
+   b) Accompany the object code with a copy of the GNU GPL and this license
-  "Copyright" also means copyright-like laws that apply to other kinds of
+   document.
-works, such as semiconductor masks.
+
-
+  4. Combined Works.
-  "The Program" refers to any copyrightable work licensed under this
+
-License.  Each licensee is addressed as "you".  "Licensees" and
+  You may convey a Combined Work under terms of your choice that,
-"recipients" may be individuals or organizations.
+taken together, effectively do not restrict modification of the
-
+portions of the Library contained in the Combined Work and reverse
-  To "modify" a work means to copy from or adapt all or part of the work
+engineering for debugging such modifications, if you also do each of
-in a fashion requiring copyright permission, other than the making of an
+the following:
-exact copy.  The resulting work is called a "modified version" of the
+
-earlier work or a work "based on" the earlier work.
+   a) Give prominent notice with each copy of the Combined Work that
-
+   the Library is used in it and that the Library and its use are
-  A "covered work" means either the unmodified Program or a work based
+   covered by this License.
-on the Program.
+
-
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-  To "propagate" a work means to do anything with it that, without
+   document.
-permission, would make you directly or secondarily liable for
+
-infringement under applicable copyright law, except executing it on a
+   c) For a Combined Work that displays copyright notices during
-computer or modifying a private copy.  Propagation includes copying,
+   execution, include the copyright notice for the Library among
-distribution (with or without modification), making available to the
+   these notices, as well as a reference directing the user to the
-public, and in some countries other activities as well.
+   copies of the GNU GPL and this license document.
-
+
-  To "convey" a work means any kind of propagation that enables other
+   d) Do one of the following:
-parties to make or receive copies.  Mere interaction with a user through
+
-a computer network, with no transfer of a copy, is not conveying.
+       0) Convey the Minimal Corresponding Source under the terms of this
-
+       License, and the Corresponding Application Code in a form
-  An interactive user interface displays "Appropriate Legal Notices"
+       suitable for, and under terms that permit, the user to
-to the extent that it includes a convenient and prominently visible
+       recombine or relink the Application with a modified version of
-feature that (1) displays an appropriate copyright notice, and (2)
+       the Linked Version to produce a modified Combined Work, in the
-tells the user that there is no warranty for the work (except to the
+       manner specified by section 6 of the GNU GPL for conveying
-extent that warranties are provided), that licensees may convey the
+       Corresponding Source.
-work under this License, and how to view a copy of this License.  If
+
-the interface presents a list of user commands or options, such as a
+       1) Use a suitable shared library mechanism for linking with the
-menu, a prominent item in the list meets this criterion.
+       Library.  A suitable mechanism is one that (a) uses at run time
-
+       a copy of the Library already present on the user's computer
-  1. Source Code.
+       system, and (b) will operate properly with a modified version
-
+       of the Library that is interface-compatible with the Linked
-  The "source code" for a work means the preferred form of the work
+       Version.
-for making modifications to it.  "Object code" means any non-source
+
-form of a work.
+   e) Provide Installation Information, but only if you would otherwise
-
+   be required to provide such information under section 6 of the
-  A "Standard Interface" means an interface that either is an official
+   GNU GPL, and only to the extent that such information is
-standard defined by a recognized standards body, or, in the case of
+   necessary to install and execute a modified version of the
-interfaces specified for a particular programming language, one that
+   Combined Work produced by recombining or relinking the
-is widely used among developers working in that language.
+   Application with a modified version of the Linked Version. (If
-
+   you use option 4d0, the Installation Information must accompany
-  The "System Libraries" of an executable work include anything, other
+   the Minimal Corresponding Source and Corresponding Application
-than the work as a whole, that (a) is included in the normal form of
+   Code. If you use option 4d1, you must provide the Installation
-packaging a Major Component, but which is not part of that Major
+   Information in the manner specified by section 6 of the GNU GPL
-Component, and (b) serves only to enable use of the work with that
+   for conveying Corresponding Source.)
-Major Component, or to implement a Standard Interface for which an
+
-implementation is available to the public in source code form.  A
+  5. Combined Libraries.
-"Major Component", in this context, means a major essential component
+
-(kernel, window system, and so on) of the specific operating system
+  You may place library facilities that are a work based on the
-(if any) on which the executable work runs, or a compiler used to
+Library side by side in a single library together with other library
-produce the work, or an object code interpreter used to run it.
+facilities that are not Applications and are not covered by this
-
+License, and convey such a combined library under terms of your
-  The "Corresponding Source" for a work in object code form means all
+choice, if you do both of the following:
-the source code needed to generate, install, and (for an executable
+
-work) run the object code and to modify the work, including scripts to
+   a) Accompany the combined library with a copy of the same work based
-control those activities.  However, it does not include the work's
+   on the Library, uncombined with any other library facilities,
-System Libraries, or general-purpose tools or generally available free
+   conveyed under the terms of this License.
-programs which are used unmodified in performing those activities but
+
-which are not part of the work.  For example, Corresponding Source
+   b) Give prominent notice with the combined library that part of it
-includes interface definition files associated with source files for
+   is a work based on the Library, and explaining where to find the
-the work, and the source code for shared libraries and dynamically
+   accompanying uncombined form of the same work.
-linked subprograms that the work is specifically designed to require,
+
-such as by intimate data communication or control flow between those
+  6. Revised Versions of the GNU Lesser General Public License.
-subprograms and other parts of the work.
+
-
+  The Free Software Foundation may publish revised and/or new versions
-  The Corresponding Source need not include anything that users
+of the GNU Lesser General Public License from time to time. Such new
-can regenerate automatically from other parts of the Corresponding
+versions will be similar in spirit to the present version, but may
-Source.
+differ in detail to address new problems or concerns.
-
+
-  The Corresponding Source for a work in source code form is that
+  Each version is given a distinguishing version number. If the
-same work.
+Library as you received it specifies that a certain numbered version
-
+of the GNU Lesser General Public License "or any later version"
-  2. Basic Permissions.
+applies to it, you have the option of following the terms and
-
+conditions either of that published version or of any later version
-  All rights granted under this License are granted for the term of
+published by the Free Software Foundation. If the Library as you
-copyright on the Program, and are irrevocable provided the stated
+received it does not specify a version number of the GNU Lesser
-conditions are met.  This License explicitly affirms your unlimited
+General Public License, you may choose any version of the GNU Lesser
-permission to run the unmodified Program.  The output from running a
+General Public License ever published by the Free Software Foundation.
-covered work is covered by this License only if the output, given its
+
-content, constitutes a covered work.  This License acknowledges your
+  If the Library as you received it specifies that a proxy can decide
-rights of fair use or other equivalent, as provided by copyright law.
+whether future versions of the GNU Lesser General Public License shall
-
+apply, that proxy's public statement of acceptance of any version is
-  You may make, run and propagate covered works that you do not
+permanent authorization for you to choose that version for the
-convey, without conditions so long as your license otherwise remains
+Library.
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSE-APPSTORE.txt

@@ -1,13 +0,0 @@
-The developers are aware that the terms of service that
-apply to apps distributed via Apple's App Store services and similar app stores may conflict
-with rights granted under the SponsorBlock license, the GNU General
-Public License, version 3. The copyright holders of the SponsorBlock 
-project do not wish this conflict to prevent the otherwise-compliant 
-distribution of derived apps via the App Store and similar app stores. 
-Therefore, we have committed not to pursue any license
-violation that results solely from the conflict between the GNU GPLv3
-and the Apple App Store terms of service or similar app stores. In
-other words, as long as you comply with the GPL in all other respects,
-including its requirements to provide users with source code and the
-text of the license, we will not object to your distribution of the
-SponsorBlock project through the App Store.

LICENSE-HISTORY.txt

@@ -1,171 +0,0 @@
-Prior to commit 7338af3b384e2297eaf710443121ac840099a9f1, this project was licensed under LGPL 3.0.
-
-You must follow LICENSE instead if you want to use any newer version.
-
-----
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

README.md

@@ -75,4 +75,4 @@ Icons made by:
 
 ### License
 
-This project is licensed under GNU GPL v3 or any later version
+This project is licensed under GNU LGPL v3 or any later version

manifest/chrome-manifest-extra.json

@@ -1,156 +1,12 @@
 {
-  "host_permissions": [
+  "optional_permissions": [
-    "https://*.youtube.com/*",
+    "declarativeContent",
-    "https://sponsor.ajay.app/*"
+    "webNavigation"
   ],
-  "optional_host_permissions": [
-    "*://*/*"
-  ],
-  "web_accessible_resources": [{
-    "resources": [
-      "icons/LogoSponsorBlocker256px.png",
-      "icons/IconSponsorBlocker256px.png",
-      "icons/PlayerStartIconSponsorBlocker.svg",
-      "icons/PlayerStopIconSponsorBlocker.svg",
-      "icons/PlayerUploadIconSponsorBlocker.svg",
-      "icons/PlayerUploadFailedIconSponsorBlocker.svg",
-      "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
-      "icons/clipboard.svg",
-      "icons/settings.svg",
-      "icons/pencil.svg",
-      "icons/check.svg",
-      "icons/check-smaller.svg",
-      "icons/upvote.png",
-      "icons/downvote.png",
-      "icons/thumbs_down.svg",
-      "icons/thumbs_down_locked.svg",
-      "icons/thumbs_up.svg",
-      "icons/help.svg",
-      "icons/report.png",
-      "icons/close.png",
-      "icons/skipIcon.svg",
-      "icons/refresh.svg",
-      "icons/beep.ogg",
-      "icons/pause.svg",
-      "icons/stop.svg",
-      "icons/skip.svg",
-      "icons/heart.svg",
-      "icons/visible.svg",
-      "icons/not_visible.svg",
-      "icons/sort.svg",
-      "icons/money.svg",
-      "icons/segway.png",
-      "icons/close-smaller.svg",
-      "icons/right-arrow.svg",
-      "icons/campaign.svg",
-      "icons/star.svg",
-      "icons/lightbulb.svg",
-      "icons/bolt.svg",
-      "icons/stopwatch.svg",
-      "icons/music-note.svg",
-      "icons/import.svg",
-      "icons/export.svg",
-      "icons/PlayerInfoIconSponsorBlocker.svg",
-      "icons/PlayerDeleteIconSponsorBlocker.svg",
-      "icons/dearrow.svg",
-      "popup.html",
-      "popup.css",
-      "content.css",
-      "shared.css",
-      "js/document.js",
-      "libs/Source+Sans+Pro.css",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
-    ],
-    "matches": ["<all_urls>"]
-  }],
-  "content_scripts": [
-    {
-        "world": "MAIN",
-        "js": [
-            "./js/document.js"
-        ],
-        "matches": [
-            "https://*.youtube.com/*",
-            "https://www.youtube-nocookie.com/embed/*"
-        ],
-        "exclude_matches": [
-          "https://accounts.youtube.com/RotateCookiesPage*"
-      ],
-        "all_frames": true,
-        "run_at": "document_start"
-    },
-    {
-      "world": "ISOLATED",
-      "js": [
-          "./js/content.js"
-      ],
-      "css": [
-        "content.css",
-        "shared.css"
-      ],
-      "matches": [
-          "https://*.youtube.com/*",
-          "https://www.youtube-nocookie.com/embed/*"
-      ],
-      "exclude_matches": [
-        "https://accounts.youtube.com/RotateCookiesPage*"
-      ],
-      "all_frames": true,
-      "run_at": "document_start"
-  }
-  ],
-  "action": {
-    "default_title": "SponsorBlock",
-    "default_popup": "popup.html",
-    "default_icon": {
-        "16": "icons/IconSponsorBlocker16px.png",
-        "32": "icons/IconSponsorBlocker32px.png",
-        "64": "icons/IconSponsorBlocker64px.png",
-        "128": "icons/IconSponsorBlocker128px.png"
-    },
-    "theme_icons": [
-        {
-            "light": "icons/IconSponsorBlocker16px.png",
-            "dark": "icons/IconSponsorBlocker16px.png",
-            "size": 16
-        },
-        {
-            "light": "icons/IconSponsorBlocker32px.png",
-            "dark": "icons/IconSponsorBlocker32px.png",
-            "size": 32
-        },
-        {
-            "light": "icons/IconSponsorBlocker64px.png",
-            "dark": "icons/IconSponsorBlocker64px.png",
-            "size": 64
-        },
-        {
-            "light": "icons/IconSponsorBlocker128px.png",
-            "dark": "icons/IconSponsorBlocker128px.png",
-            "size": 128
-        },
-        {
-            "light": "icons/IconSponsorBlocker256px.png",
-            "dark": "icons/IconSponsorBlocker256px.png",
-            "size": 256
-        },
-        {
-            "light": "icons/IconSponsorBlocker512px.png",
-            "dark": "icons/IconSponsorBlocker512px.png",
-            "size": 512
-        },
-        {
-            "light": "icons/IconSponsorBlocker1024px.png",
-            "dark": "icons/IconSponsorBlocker1024px.png",
-            "size": 1024
-        }
-    ]
-  },
   "background": {
-    "service_worker": "./js/background.js"
+    "persistent": false
   },
-  "manifest_version": 3
+  "permissions": [
+    "https://*.youtube.com/*"
+  ]
 }

manifest/firefox-manifest-extra.json

@@ -2,15 +2,18 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "sponsorBlocker@ajay.app",
-      "strict_min_version": "56.0"
+      "strict_min_version": "48.0"
     },
     "gecko_android": {
-      "strict_min_version": "113.0"
+      "strict_min_version": "79.0"
     }
   },
   "background": {
     "persistent": false
   },
+  "permissions": [
+    "scripting"
+  ],
   "browser_action": {
     "default_area": "navbar"
   }

manifest/manifest-v2-extra.json

@@ -1,136 +0,0 @@
-{
-    "web_accessible_resources": [
-        "icons/LogoSponsorBlocker256px.png",
-        "icons/IconSponsorBlocker256px.png",
-        "icons/PlayerStartIconSponsorBlocker.svg",
-        "icons/PlayerStopIconSponsorBlocker.svg",
-        "icons/PlayerUploadIconSponsorBlocker.svg",
-        "icons/PlayerUploadFailedIconSponsorBlocker.svg",
-        "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
-        "icons/clipboard.svg",
-        "icons/settings.svg",
-        "icons/pencil.svg",
-        "icons/check.svg",
-        "icons/check-smaller.svg",
-        "icons/upvote.png",
-        "icons/downvote.png",
-        "icons/thumbs_down.svg",
-        "icons/thumbs_down_locked.svg",
-        "icons/thumbs_up.svg",
-        "icons/help.svg",
-        "icons/report.png",
-        "icons/close.png",
-        "icons/skipIcon.svg",
-        "icons/refresh.svg",
-        "icons/beep.ogg",
-        "icons/pause.svg",
-        "icons/stop.svg",
-        "icons/skip.svg",
-        "icons/heart.svg",
-        "icons/visible.svg",
-        "icons/not_visible.svg",
-        "icons/sort.svg",
-        "icons/money.svg",
-        "icons/segway.png",
-        "icons/close-smaller.svg",
-        "icons/right-arrow.svg",
-        "icons/campaign.svg",
-        "icons/star.svg",
-        "icons/lightbulb.svg",
-        "icons/bolt.svg",
-        "icons/stopwatch.svg",
-        "icons/music-note.svg",
-        "icons/import.svg",
-        "icons/export.svg",
-        "icons/PlayerInfoIconSponsorBlocker.svg",
-        "icons/PlayerDeleteIconSponsorBlocker.svg",
-        "icons/dearrow.svg",
-        "popup.html",
-        "popup.css",
-        "content.css",
-        "shared.css",
-        "js/document.js",
-        "libs/Source+Sans+Pro.css",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
-    ],
-    "permissions": [
-        "https://sponsor.ajay.app/*"
-    ],
-    "optional_permissions": [
-        "*://*/*"
-    ],
-    "browser_action": {
-        "default_title": "SponsorBlock",
-        "default_popup": "popup.html",
-        "default_icon": {
-            "16": "icons/IconSponsorBlocker16px.png",
-            "32": "icons/IconSponsorBlocker32px.png",
-            "64": "icons/IconSponsorBlocker64px.png",
-            "128": "icons/IconSponsorBlocker128px.png"
-        },
-        "theme_icons": [
-            {
-                "light": "icons/IconSponsorBlocker16px.png",
-                "dark": "icons/IconSponsorBlocker16px.png",
-                "size": 16
-            },
-            {
-                "light": "icons/IconSponsorBlocker32px.png",
-                "dark": "icons/IconSponsorBlocker32px.png",
-                "size": 32
-            },
-            {
-                "light": "icons/IconSponsorBlocker64px.png",
-                "dark": "icons/IconSponsorBlocker64px.png",
-                "size": 64
-            },
-            {
-                "light": "icons/IconSponsorBlocker128px.png",
-                "dark": "icons/IconSponsorBlocker128px.png",
-                "size": 128
-            },
-            {
-                "light": "icons/IconSponsorBlocker256px.png",
-                "dark": "icons/IconSponsorBlocker256px.png",
-                "size": 256
-            },
-            {
-                "light": "icons/IconSponsorBlocker512px.png",
-                "dark": "icons/IconSponsorBlocker512px.png",
-                "size": 512
-            },
-            {
-                "light": "icons/IconSponsorBlocker1024px.png",
-                "dark": "icons/IconSponsorBlocker1024px.png",
-                "size": 1024
-            }
-        ]
-    },
-    "background": {
-        "scripts":[
-            "./js/background.js"
-        ]
-    },
-    "content_scripts": [{
-        "run_at": "document_start",
-        "matches": [
-            "https://*.youtube.com/*",
-            "https://www.youtube-nocookie.com/embed/*"
-        ],
-        "exclude_matches": [
-            "https://accounts.youtube.com/RotateCookiesPage*"
-        ],
-        "all_frames": true,
-        "js": [
-            "./js/content.js"
-        ],
-        "css": [
-            "content.css",
-            "shared.css"
-        ]
-    }],
-    "manifest_version": 2
-}  

manifest/manifest.json

@@ -1,10 +1,141 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.6.1",
+    "version": "5.4.28",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",
+    "content_scripts": [{
+        "run_at": "document_start",
+        "matches": [
+            "https://*.youtube.com/*",
+            "https://www.youtube-nocookie.com/embed/*"
+        ],
+        "all_frames": true,
+        "js": [
+            "./js/content.js"
+        ],
+        "css": [
+            "content.css",
+            "shared.css"
+        ]
+    }],
+    "web_accessible_resources": [
+        "icons/LogoSponsorBlocker256px.png",
+        "icons/IconSponsorBlocker256px.png",
+        "icons/PlayerStartIconSponsorBlocker.svg",
+        "icons/PlayerStopIconSponsorBlocker.svg",
+        "icons/PlayerUploadIconSponsorBlocker.svg",
+        "icons/PlayerUploadFailedIconSponsorBlocker.svg",
+        "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
+        "icons/clipboard.svg",
+        "icons/settings.svg",
+        "icons/pencil.svg",
+        "icons/check.svg",
+        "icons/check-smaller.svg",
+        "icons/upvote.png",
+        "icons/downvote.png",
+        "icons/thumbs_down.svg",
+        "icons/thumbs_down_locked.svg",
+        "icons/thumbs_up.svg",
+        "icons/help.svg",
+        "icons/report.png",
+        "icons/close.png",
+        "icons/skipIcon.svg",
+        "icons/refresh.svg",
+        "icons/beep.ogg",
+        "icons/pause.svg",
+        "icons/stop.svg",
+        "icons/skip.svg",
+        "icons/heart.svg",
+        "icons/visible.svg",
+        "icons/not_visible.svg",
+        "icons/sort.svg",
+        "icons/money.svg",
+        "icons/segway.png",
+        "icons/close-smaller.svg",
+        "icons/right-arrow.svg",
+        "icons/campaign.svg",
+        "icons/star.svg",
+        "icons/lightbulb.svg",
+        "icons/bolt.svg",
+        "icons/stopwatch.svg",
+        "icons/music-note.svg",
+        "icons/import.svg",
+        "icons/export.svg",
+        "icons/PlayerInfoIconSponsorBlocker.svg",
+        "icons/PlayerDeleteIconSponsorBlocker.svg",
+        "icons/dearrow.svg",
+        "popup.html",
+        "popup.css",
+        "content.css",
+        "shared.css",
+        "js/document.js",
+        "libs/Source+Sans+Pro.css",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
+    ],
+    "permissions": [
+        "storage",
+        "https://sponsor.ajay.app/*"
+    ],
+    "optional_permissions": [
+        "*://*/*"
+    ],
+    "browser_action": {
+        "default_title": "SponsorBlock",
+        "default_popup": "popup.html",
+        "default_icon": {
+            "16": "icons/IconSponsorBlocker16px.png",
+            "32": "icons/IconSponsorBlocker32px.png",
+            "64": "icons/IconSponsorBlocker64px.png",
+            "128": "icons/IconSponsorBlocker128px.png"
+        },
+        "theme_icons": [
+            {
+                "light": "icons/IconSponsorBlocker16px.png",
+                "dark": "icons/IconSponsorBlocker16px.png",
+                "size": 16
+            },
+            {
+                "light": "icons/IconSponsorBlocker32px.png",
+                "dark": "icons/IconSponsorBlocker32px.png",
+                "size": 32
+            },
+            {
+                "light": "icons/IconSponsorBlocker64px.png",
+                "dark": "icons/IconSponsorBlocker64px.png",
+                "size": 64
+            },
+            {
+                "light": "icons/IconSponsorBlocker128px.png",
+                "dark": "icons/IconSponsorBlocker128px.png",
+                "size": 128
+            },
+            {
+                "light": "icons/IconSponsorBlocker256px.png",
+                "dark": "icons/IconSponsorBlocker256px.png",
+                "size": 256
+            },
+            {
+                "light": "icons/IconSponsorBlocker512px.png",
+                "dark": "icons/IconSponsorBlocker512px.png",
+                "size": 512
+            },
+            {
+                "light": "icons/IconSponsorBlocker1024px.png",
+                "dark": "icons/IconSponsorBlocker1024px.png",
+                "size": 1024
+            }
+        ]
+    }, 
+    "background": {
+        "scripts":[
+        "./js/background.js"
+        ]
+    },
     "icons": {
         "16": "icons/IconSponsorBlocker16px.png",
         "32": "icons/IconSponsorBlocker32px.png",
@@ -14,12 +145,9 @@
         "512": "icons/IconSponsorBlocker512px.png",
         "1024": "icons/IconSponsorBlocker1024px.png"
     },
-    "permissions": [
-        "storage",
-        "scripting"
-    ],
     "options_ui": {
         "page": "options/options.html",
         "open_in_tab": true
-    }
+    },
+    "manifest_version": 2
 }  

manifest/safari-manifest-extra.json

@@ -2,6 +2,9 @@
   "background": {
     "persistent": false
   },
+  "permissions": [
+    "scripting"
+  ],
   "optional_permissions": [
     "webNavigation"
   ]

package.json

@@ -38,7 +38,7 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "typescript": "4.9",
-    "web-ext": "^7.10.0",
+    "web-ext": "^7.6.2",
     "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
@@ -96,6 +96,6 @@
     "url": "git+https://github.com/ajayyy/SponsorBlock.git"
   },
   "author": "Ajay Ramachandran",
-  "license": "GPL-3.0",
+  "license": "LGPL-3.0-or-later",
   "private": true
 }

public/content.css

@@ -26,11 +26,6 @@
 	transition: transform .1s cubic-bezier(0,0,0.2,1);
 }
 
-/* May 2024 hover preview */
-.YtPlayerProgressBarProgressBar #previewbar {
-	transform: none;
-}
-
 .ytp-big-mode #previewbar {
 	transform: scaleY(0.625) translateY(-30%) translateY(1.5px);
 }
@@ -325,6 +320,11 @@ div:hover > .sponsorBlockChapterBar {
     padding-bottom: 7.8%;
 }
 
+/* if two are very close to eachother */
+.secondSkipNotice {
+	bottom: 290px;
+}
+
 .noticeLeftIcon {
 	display: flex;
   	align-items: center;
@@ -785,18 +785,6 @@ input::-webkit-inner-spin-button {
     line-height: 1.5em;
 }
 
-/* Description on right layout */
-#title > #categoryPillParent {
-	font-size: 2rem;
-	font-weight: bold;
-	display: flex;
-	justify-content: center;
-	line-height: 2.8rem;
-}
-#title > #categoryPillParent > #categoryPill.cbPillOpen {
-	margin-bottom: 5px;
-}
-
 #categoryPillParent {
 	height: fit-content;
     margin-top: auto;

public/options/options.html

@@ -219,20 +219,18 @@
 							__MSG_showSkipNotice__
 						</label>
 					</div>
+				</div>
 	
-					<div data-type="selector" data-sync="noticeVisibilityMode" data-dependent-on="dontShowNotice">
+				<div data-type="selector" data-sync="noticeVisibilityMode">
-						<br/>
+					<label class="optionLabel" for="noticeVisibilityMode">__MSG_noticeVisibilityLabel__:</label>
 
-						<label class="optionLabel" for="noticeVisibilityMode">__MSG_noticeVisibilityLabel__:</label>
+					<select id="noticeVisibilityMode" class="selector-element optionsSelector" >
-	
+						<option value="0">__MSG_noticeVisibilityMode0__</option>
-						<select id="noticeVisibilityMode" class="selector-element optionsSelector" >
+						<option value="1">__MSG_noticeVisibilityMode1__</option>
-							<option value="0">__MSG_noticeVisibilityMode0__</option>
+						<option value="2">__MSG_noticeVisibilityMode2__</option>
-							<option value="1">__MSG_noticeVisibilityMode1__</option>
+						<option value="3">__MSG_noticeVisibilityMode3__</option>
-							<option value="2">__MSG_noticeVisibilityMode2__</option>
+						<option value="4">__MSG_noticeVisibilityMode4__</option>
-							<option value="3">__MSG_noticeVisibilityMode3__</option>
+					</select>
-							<option value="4">__MSG_noticeVisibilityMode4__</option>
-						</select>
-					</div>
 				</div>
 
 				<div data-type="toggle" data-sync="showCategoryGuidelines">
@@ -435,27 +433,12 @@
 					<div class="inline"></div>
 				</div>
 
-				<div data-type="keybind-change" data-sync="closeSkipNoticeKeybind">	
-					<label class="optionLabel">__MSG_setCloseSkipNoticeKeybind__:</label>
-					<div class="inline"></div>
-				</div>
-
 				<div data-type="keybind-change" data-sync="startSponsorKeybind">	
 					<label class="optionLabel">__MSG_setStartSponsorShortcut__:</label>
 					<div class="inline"></div>
 				</div>
 
 				<div data-type="keybind-change" data-sync="submitKeybind">	
-					<label class="optionLabel">__MSG_setOpenSubmissionMenuKeybind__:</label>
-					<div class="inline"></div>
-				</div>
-
-				<div data-type="keybind-change" data-sync="previewKeybind">	
-					<label class="optionLabel">__MSG_setPreviewKeybind__:</label>
-					<div class="inline"></div>
-				</div>
-
-				<div data-type="keybind-change" data-sync="actuallySubmitKeybind">	
 					<label class="optionLabel">__MSG_setSubmitKeybind__:</label>
 					<div class="inline"></div>
 				</div>
@@ -519,31 +502,6 @@
 					</div>
 				</div>
 
-				<div data-type="private-text-change" data-sync-type="local" data-sync="*" data-confirm-message="exportOptionsWarning">
-					<h2>__MSG_exportOtherData__</h2>
-					
-					<div>
-						<div class="option-button trigger-button inline">
-							__MSG_exportOptionsCopy__
-						</div>
-						<div class="option-button download-button inline">
-							__MSG_exportOptionsDownload__
-						</div>
-						<label for="importLocalOptions" class="option-button inline">
-							__MSG_exportOptionsUpload__
-						</label>
-						<input id="importLocalOptions" type="file" class="upload-button hidden" />
-					</div>
-	
-					<div class="option-hidden-section hidden spacing indent">	
-						<textarea class="option-text-box" rows="10" style="width:80%"></textarea>
-	
-						<div class="option-button text-change-set">
-							__MSG_setOptions__
-						</div>
-					</div>
-				</div>
-
 				<div data-type="button-press" data-sync="resetToDefault" data-confirm-message="confirmResetToDefault">
 					<div class="option-button trigger-button">
 						__MSG_resetToDefault__
@@ -637,18 +595,6 @@
 					<div class="small-description">__MSG_whatTrackDownvotes__</div>
 				</div>
 	
-				<div data-type="toggle" data-sync="trackDownvotesInPrivate" data-confirm-on="false">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="trackDownvotesInPrivate" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="trackDownvotesInPrivate">
-							__MSG_enableTrackDownvotesInPrivate__
-						</label>
-					</div>
-				</div>
-
 				<div data-type="button-press" data-sync="copyDebugInformation" data-confirm-message="copyDebugInformation">
 					<div class="option-button trigger-button">
 						__MSG_copyDebugInformation__

src/background.ts

@@ -7,9 +7,13 @@ import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "../m
 import { setupTabUpdates } from "../maze-utils/src/tab-updates";
 import { generateUserID } from "../maze-utils/src/setup";
 
+// Make the config public for debugging purposes
+
+window.SB = Config;
+
 import Utils from "./utils";
 import { getExtensionIdsToImportFrom } from "./utils/crossExtension";
-import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
+import { isFirefoxOrSafari } from "../maze-utils/src";
 import { injectUpdatedScripts } from "../maze-utils/src/cleanup";
 import { logWarn } from "./utils/logger";
 import { chromeP } from "../maze-utils/src/browserApi";
@@ -119,7 +123,7 @@ chrome.runtime.onInstalled.addListener(function () {
         // If there is no userID, then it is the first install.
         if (!userID && !Config.local.alreadyInstalled){
             //open up the install page
-            chrome.tabs.create({url: chrome.runtime.getURL("/help/index.html")});
+            chrome.tabs.create({url: chrome.extension.getURL("/help/index.html")});
 
             //generate a userID
             const newUserID = generateUserID();
@@ -133,21 +137,14 @@ chrome.runtime.onInstalled.addListener(function () {
 
         if (Config.config.supportInvidious) {
             if (!(await utils.containsInvidiousPermission())) {
-                chrome.tabs.create({url: chrome.runtime.getURL("/permissions/index.html")});
+                chrome.tabs.create({url: chrome.extension.getURL("/permissions/index.html")});
             }
         }
     }, 1500);
 
-    if (!isFirefoxOrSafari()) {
+    // Only do this once the old version understands how to clean itself up
+    if (!isFirefoxOrSafari() && chrome.runtime.getManifest().version !== "5.4.13") {
         injectUpdatedScripts().catch(logWarn);
-
-        waitFor(() => Config.isReady()).then(() => {
-            if (Config.config.supportInvidious) {
-                injectUpdatedScripts([
-                    utils.getExtraSiteRegistration()
-                ])
-            }
-        }).catch(logWarn);
     }
 });
 
@@ -163,8 +160,8 @@ async function registerFirefoxContentScript(options: Registration) {
             ids: [options.id]
         }).catch(() => []);
 
-        if (existingRegistrations && existingRegistrations.length > 0 
+        if (existingRegistrations.length > 0 
-            && options.matches.every((match) => existingRegistrations[0].matches.includes(match))) {
+            && existingRegistrations[0].matches.every((match) => options.matches.includes(match))) {
             // No need to register another script, already registered
             return;
         }
@@ -225,35 +222,27 @@ async function submitVote(type: number, UUID: string, category: string) {
 
     const typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;
 
-    try {
+    //publish this vote
-        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection);
+    const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection);
 
-        if (response.ok) {
+    if (response.ok) {
-            return {
+        return {
-                successType: 1,
+            successType: 1,
-                responseText: await response.text()
+            responseText: await response.text()
-            };
+        };
-        } else if (response.status == 405) {
+    } else if (response.status == 405) {
-            //duplicate vote
+        //duplicate vote
-            return {
+        return {
-                successType: 0,
+            successType: 0,
-                statusCode: response.status,
+            statusCode: response.status,
-                responseText: await response.text()
+            responseText: await response.text()
-            };
+        };
-        } else {
+    } else {
-            //error while connect
+        //error while connect
-            return {
-                successType: -1,
-                statusCode: response.status,
-                responseText: await response.text()
-            };
-        }
-    } catch (e) {
-        console.error(e);
         return {
             successType: -1,
-            statusCode: -1,
+            statusCode: response.status,
-            responseText: ""
+            responseText: await response.text()
         };
     }
 }

src/components/CategoryPillComponent.tsx

@@ -6,7 +6,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";
 
@@ -23,14 +23,12 @@ export interface CategoryPillState {
 }
 
 class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryPillState> {
-    mainRef: React.MutableRefObject<HTMLSpanElement>;
+
     tooltip?: Tooltip;
 
     constructor(props: CategoryPillProps) {
         super(props);
 
-        this.mainRef = React.createRef();
-
         this.state = {
             segment: null,
             show: false,
@@ -45,21 +43,17 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
             color: this.getTextColor(),
         }
 
-        // To be able to remove the margin from the parent
-        this.mainRef?.current?.parentElement?.classList?.toggle("cbPillOpen", this.state.show);
-
         return (
             <span style={style}
                 className={"sponsorBlockCategoryPill" + (!this.props.showTextByDefault ? " sbPillNoText" : "")}
                 aria-label={this.getTitleText()}
                 onClick={(e) => this.toggleOpen(e)}
                 onMouseEnter={() => this.openTooltip()}
-                onMouseLeave={() => this.closeTooltip()}
+                onMouseLeave={() => this.closeTooltip()}>
-                ref={this.mainRef}>
                 
                 <span className="sponsorBlockCategoryPillTitleSection">
                     <img className="sponsorSkipLogo sponsorSkipObject"
-                        src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
+                        src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
                     </img>
 
                     {
@@ -92,7 +86,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
                 )}
 
                 {/* Close Button */}
-                <img src={chrome.runtime.getURL("icons/close.png")}
+                <img src={chrome.extension.getURL("icons/close.png")}
                     className="categoryPillClose"
                     onClick={() => {
                         this.setState({ show: false });

src/components/ChapterVoteComponent.tsx

@@ -6,7 +6,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";
 

src/components/NoticeComponent.tsx

@@ -41,13 +41,6 @@ export interface NoticeProps {
     children?: React.ReactNode;
 }
 
-interface MouseDownInfo {
-    x: number;
-    y: number;
-    right: number;
-    bottom: number;
-}
-
 export interface NoticeState {
     maxCountdownTime: () => number;
 
@@ -57,16 +50,8 @@ export interface NoticeState {
     mouseHovering: boolean;
 
     startFaded: boolean;
-
-    mouseDownInfo: MouseDownInfo | null;
-    mouseMoved: boolean;
-    right: number;
-    bottom: number;
 }
 
-// Limits for dragging notice around
-const bounds = [10, 100, 10, 10];
-
 class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     countdownInterval: NodeJS.Timeout;
 
@@ -76,8 +61,6 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
 
     parentRef: React.RefObject<HTMLDivElement>;
 
-    handleMouseMoveBinded: (e: MouseEvent) => void = this.handleMouseMove.bind(this);
-
     constructor(props: NoticeProps) {
         super(props);
 
@@ -104,12 +87,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
             countdownMode: CountdownMode.Timer,
             mouseHovering: false,
 
-            startFaded: this.props.startFaded ?? false,
+            startFaded: this.props.startFaded ?? false
-
-            mouseDownInfo: null,
-            mouseMoved: false,
-            right: bounds[0],
-            bottom: props.showInSecondSlot ? 290 : bounds[1]
         }
     }
 
@@ -120,9 +98,6 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     render(): React.ReactElement {
         const noticeStyle: React.CSSProperties = {
             zIndex: this.props.zIndex || (1000 + this.amountOfPreviousNotices),
-            right: this.state.right,
-            bottom: this.state.bottom,
-            userSelect: this.state.mouseDownInfo && this.state.mouseMoved ? "none" : "auto",
             ...(this.props.style ?? {})
         }
 
@@ -132,29 +107,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                     + (this.props.showInSecondSlot ? " secondSkipNotice" : "")
                     + (this.props.extraClass ? ` ${this.props.extraClass}` : "")}
                 onMouseEnter={(e) => this.onMouseEnter(e) }
-                onMouseLeave={() => {
+                onMouseLeave={() => this.timerMouseLeave()}
-                    this.timerMouseLeave();
-                }}
-                onMouseDown={(e) => {
-                    document.addEventListener("mousemove", this.handleMouseMoveBinded);
-
-                    this.setState({
-                        mouseDownInfo: {
-                            x: e.clientX,
-                            y: e.clientY,
-                            right: this.state.right,
-                            bottom: this.state.bottom
-                        },
-                        mouseMoved: false
-                    });
-                }}
-                onMouseUp={() => {
-                    document.removeEventListener("mousemove", this.handleMouseMoveBinded);
-
-                    this.setState({
-                        mouseDownInfo: null
-                    });
-                }}
                 ref={this.parentRef}
                 style={noticeStyle} >
                 <div className={"sponsorSkipNoticeTableContainer" 
@@ -207,7 +160,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                                     
 
                                         {/* Close button */}
-                                        <img src={chrome.runtime.getURL("icons/close.png")}
+                                        <img src={chrome.extension.getURL("icons/close.png")}
                                             className={"sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton" 
                                                             + (this.props.biggerCloseButton ? " biggerCloseButton" : "")}
                                             onClick={() => this.close()}>
@@ -442,31 +395,6 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     getElement(): React.RefObject<HTMLDivElement> {
         return this.parentRef;
     }
-
-    componentWillUnmount(): void {
-        document.removeEventListener("mousemove", this.handleMouseMoveBinded);
-    }
-
-    // For dragging around notice
-    handleMouseMove(e: MouseEvent): void {
-        if (this.state.mouseDownInfo && e.buttons === 1) {
-            const [mouseX, mouseY] = [e.clientX, e.clientY];
-
-            const deltaX = mouseX - this.state.mouseDownInfo.x;
-            const deltaY = mouseY - this.state.mouseDownInfo.y;
-
-            if (deltaX > 0 || deltaY > 0) this.setState({ mouseMoved: true });
-
-            const element = this.parentRef.current;
-            const parent = element.parentElement.parentElement;
-            this.setState({
-                right: Math.min(parent.clientWidth - element.clientWidth - bounds[2], Math.max(bounds[0], this.state.mouseDownInfo.right - deltaX)),
-                bottom: Math.min(parent.clientHeight - element.clientHeight - bounds[3], Math.max(bounds[1], this.state.mouseDownInfo.bottom - deltaY))
-            });
-        } else {
-            document.removeEventListener("mousemove", this.handleMouseMoveBinded);
-        }
-    }
 }
 
 export default NoticeComponent;

src/components/SkipNoticeComponent.tsx

@@ -14,7 +14,6 @@ import PencilSvg from "../svg-icons/pencil_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { generateUserID } from "../../maze-utils/src/setup";
 import { keybindToString } from "../../maze-utils/src/config";
-import { getFormattedTime } from "../../maze-utils/src/formating";
 
 enum SkipButtonState {
     Undo, // Unskip
@@ -317,7 +316,6 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                         <select id={"sponsorTimeCategories" + this.idSuffix}
                                 className="sponsorTimeCategories sponsorTimeEditSelector"
                                 defaultValue={this.segments[0].category}
-                                onMouseDown={(e) => e.stopPropagation()}
                                 ref={this.categoryOptionRef}>
 
                             {this.getCategoryOptions()}
@@ -388,10 +386,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                         style={{opacity: this.getSubmissionChooserOpacity(i),
                                 color: this.getSubmissionChooserColor(i)}}
                         onClick={() => this.performAction(i)}
-                        autoFocus={i == 0}
                         key={"submission" + i + this.segments[i].category + this.idSuffix}>
-                    {`${(i + 1)}. ${chrome.i18n.getMessage("category_" + 
+                    {(i + 1) + ". " + chrome.i18n.getMessage("category_" + this.segments[i].category)}
-                        this.segments[i].category)} (${getFormattedTime(this.segments[i].segment[0])})`}
                 </button>
             );
         }
@@ -460,15 +456,6 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         if (this.segments.length === 1) {
             this.performAction(0, action);
         } else {
-            if (this.state.smaller) {
-                this.setState({
-                    smaller: false
-                });
-
-                this.noticeRef.current.fadedMouseEnter();
-                this.noticeRef.current.resetCountdown();
-            }
-
             switch (action ?? this.state.actionState) {
                 case SkipNoticeAction.None:
                     this.resetStateToStart();
@@ -563,10 +550,10 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
             source: SponsorSourceType.Local
         };
 
-        const segmentTimes = Config.local.unsubmittedSegments[sponsorVideoID] || [];
+        const segmentTimes = Config.config.unsubmittedSegments[sponsorVideoID] || [];
         segmentTimes.push(sponsorTimesSubmitting);
-        Config.local.unsubmittedSegments[sponsorVideoID] = segmentTimes;
+        Config.config.unsubmittedSegments[sponsorVideoID] = segmentTimes;
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         this.props.contentContainer().sponsorTimesSubmitting.push(sponsorTimesSubmitting);
         this.props.contentContainer().updatePreviewBar();

src/components/SponsorTimeEditComponent.tsx

@@ -8,7 +8,6 @@ import SelectorComponent, { SelectorOption } from "./SelectorComponent";
 import { DEFAULT_CATEGORY } from "../utils/categoryUtils";
 import { getFormattedTime, getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
 import { asyncRequestToServer } from "../utils/requests";
-import { defaultPreviewTime } from "../utils/constants";
 
 export interface SponsorTimeEditProps {
     index: number;
@@ -27,14 +26,13 @@ export interface SponsorTimeEditState {
     editing: boolean;
     sponsorTimeEdits: [string, string];
     selectedCategory: Category;
-    selectedActionType: ActionType;
     description: string;
     suggestedNames: SelectorOption[];
     chapterNameSelectorOpen: boolean;
     chapterNameSelectorHovering: boolean;
 }
 
-const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => !["chapter", "intro"].includes(name))
+const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => name !== "chapter")
     .map((name) => chrome.i18n.getMessage("category_" + name).split(/\/|\s|-/)));
 
 class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, SponsorTimeEditState> {
@@ -70,8 +68,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         this.state = {
             editing: false,
             sponsorTimeEdits: [null, null],
-            selectedCategory: sponsorTime.category ?? DEFAULT_CATEGORY as Category,
+            selectedCategory: DEFAULT_CATEGORY as Category,
-            selectedActionType: sponsorTime.actionType,
             description: sponsorTime.description || "",
             suggestedNames: [],
             chapterNameSelectorOpen: false,
@@ -81,15 +78,13 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
     componentDidMount(): void {
         // Prevent inputs from triggering key events
-        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', (e) => {
+        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', function (event) {
-            e.stopPropagation();
+            event.stopPropagation();
         });
 
         // Prevent scrolling while changing times
-        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', (e) => {
+        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', function (event) {
-            if (this.state.editing) {
+            event.preventDefault();
-                e.preventDefault();
-            }
         }, {passive: false});
 
         // Add as a config listener
@@ -124,14 +119,14 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         const timeDisplayStyle: React.CSSProperties = {};
         const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
         const segment = sponsorTime.segment;
-        if (this.state.selectedActionType === ActionType.Full) timeDisplayStyle.display = "none";
+        if (sponsorTime?.actionType === ActionType.Full) timeDisplayStyle.display = "none";
         if (this.state.editing) {
             timeDisplay = (
                 <div id={"sponsorTimesContainer" + this.idSuffix}
                     style={timeDisplayStyle}
                     className="sponsorTimeDisplay">
 
-                        {this.state.selectedActionType !== ActionType.Poi ? (
+                        {sponsorTime.actionType !== ActionType.Poi ? (
                             <span id={"startButton" + this.idSuffix}
                                 className="sponsorNowButton"
                                 onClick={() => this.setTimeTo(0, 0)}>
@@ -148,14 +143,14 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                             className="sponsorTimeEdit sponsorTimeEditInput"
                             type="text"
                             style={{color: "inherit", backgroundColor: "inherit"}}
-                            value={this.state.sponsorTimeEdits[0] ?? ""}
+                            value={this.state.sponsorTimeEdits[0]}
                             onKeyDown={(e) => e.stopPropagation()}
                             onKeyUp={(e) => e.stopPropagation()}
                             onChange={(e) => this.handleOnChange(0, e, sponsorTime, e.target.value)}
                             onWheel={(e) => this.changeTimesWhenScrolling(0, e, sponsorTime)}>
                         </input>
 
-                        {this.state.selectedActionType !== ActionType.Poi ? (
+                        {sponsorTime.actionType !== ActionType.Poi ? (
                             <span>
                                 <span>
                                     {" " + chrome.i18n.getMessage("to") + " "}
@@ -165,7 +160,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                                     className="sponsorTimeEdit sponsorTimeEditInput"
                                     type="text"
                                     style={{color: "inherit", backgroundColor: "inherit"}}
-                                    value={this.state.sponsorTimeEdits[1] ?? ""}
+                                    value={this.state.sponsorTimeEdits[1]}
                                     onKeyDown={(e) => e.stopPropagation()}
                                     onKeyUp={(e) => e.stopPropagation()}
                                     onChange={(e) => this.handleOnChange(1, e, sponsorTime, e.target.value)}
@@ -195,7 +190,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                     className="sponsorTimeDisplay"
                     onClick={this.toggleEditTime.bind(this)}>
                         {getFormattedTime(segment[0], true) +
-                            ((!isNaN(segment[1]) && this.state.selectedActionType !== ActionType.Poi)
+                            ((!isNaN(segment[1]) && sponsorTime.actionType !== ActionType.Poi)
                                 ? " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(segment[1], true) : "")}
                 </div>
             );
@@ -210,9 +205,9 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                 <div style={{position: "relative"}}>
                     <select id={"sponsorTimeCategories" + this.idSuffix}
                         className="sponsorTimeEditSelector sponsorTimeCategories"
+                        defaultValue={sponsorTime.category}
                         ref={this.categoryOptionRef}
                         style={{color: "inherit", backgroundColor: "inherit"}}
-                        value={this.state.selectedCategory}
                         onChange={(event) => this.categorySelectionChange(event)}>
                         {this.getCategoryOptions()}
                     </select>
@@ -223,7 +218,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                         target="_blank" rel="noreferrer">
                         <img id={"sponsorTimeCategoriesHelpButton" + this.idSuffix}
                             className="helpButton"
-                            src={chrome.runtime.getURL("icons/help.svg")}
+                            src={chrome.extension.getURL("icons/help.svg")}
                             title={chrome.i18n.getMessage("categoryGuidelines")} />
                     </a>
                 </div>
@@ -235,7 +230,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                     <div style={{position: "relative"}}>
                         <select id={"sponsorTimeActionTypes" + this.idSuffix}
                             className="sponsorTimeEditSelector sponsorTimeActionTypes"
-                            value={this.state.selectedActionType}
+                            defaultValue={sponsorTime.actionType}
                             style={{color: "inherit", backgroundColor: "inherit"}}
                             ref={this.actionTypeOptionRef}
                             onChange={(e) => this.actionTypeSelectionChange(e)}>
@@ -245,7 +240,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                 ): ""}
 
                 {/* Chapter Name */}
-                {this.state.selectedActionType=== ActionType.Chapter ? (
+                {sponsorTime.actionType === ActionType.Chapter ? (
                     <div onBlur={() => this.setState({chapterNameSelectorOpen: false})}>
                         <input id={"chapterName" + this.idSuffix}
                             className="sponsorTimeEdit sponsorTimeEditInput sponsorChapterNameInput"
@@ -272,49 +267,48 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                     </div>
                 ): ""}
 
+                <br/>
+
                 {/* Editing Tools */}
 
-                <div style={{ marginTop: "3px" }}>
+                <span id={"sponsorTimeDeleteButton" + this.idSuffix}
-                    <span id={"sponsorTimeDeleteButton" + this.idSuffix}
+                    className="sponsorTimeEditButton"
+                    onClick={this.deleteTime.bind(this)}>
+                    {chrome.i18n.getMessage("delete")}
+                </span>
+
+                {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(sponsorTime.actionType)) 
+                    && sponsorTime.actionType !== ActionType.Chapter ? (
+                    <span id={"sponsorTimePreviewButton" + this.idSuffix}
                         className="sponsorTimeEditButton"
-                        onClick={this.deleteTime.bind(this)}>
+                        onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey)}>
-                        {chrome.i18n.getMessage("delete")}
+                        {chrome.i18n.getMessage("preview")}
                     </span>
+                ): ""}
 
-                    {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) 
+                {(!isNaN(segment[1]) && sponsorTime.actionType != ActionType.Full) ? (
-                        && this.state.selectedActionType !== ActionType.Chapter ? (
+                    <span id={"sponsorTimeInspectButton" + this.idSuffix}
-                        <span id={"sponsorTimePreviewButton" + this.idSuffix}
+                        className="sponsorTimeEditButton"
-                            className="sponsorTimeEditButton"
+                        onClick={this.inspectTime.bind(this)}>
-                            onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey)}>
+                        {chrome.i18n.getMessage("inspect")}
-                            {chrome.i18n.getMessage("preview")}
+                    </span>
-                        </span>
+                ): ""}
-                    ): ""}
 
-                    {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
+                {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(sponsorTime.actionType)) ? (
-                        <span id={"sponsorTimeInspectButton" + this.idSuffix}
+                    <span id={"sponsorTimePreviewEndButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
+                        className="sponsorTimeEditButton"
-                            onClick={this.inspectTime.bind(this)}>
+                        onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey, true)}>
-                            {chrome.i18n.getMessage("inspect")}
+                        {chrome.i18n.getMessage("End")}
-                        </span>
+                    </span>
-                    ): ""}
+                ): ""}
-
-                    {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) ? (
-                        <span id={"sponsorTimePreviewEndButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey, true)}>
-                            {chrome.i18n.getMessage("End")}
-                        </span>
-                    ): ""}
-
-                    {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
-                        <span id={"sponsorTimeEditButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={this.toggleEditTime.bind(this)}>
-                            {this.state.editing ? chrome.i18n.getMessage("save") : chrome.i18n.getMessage("edit")}
-                        </span>
-                    ): ""}
-                </div>
 
+                {(!isNaN(segment[1]) && sponsorTime.actionType != ActionType.Full) ? (
+                    <span id={"sponsorTimeEditButton" + this.idSuffix}
+                        className="sponsorTimeEditButton"
+                        onClick={this.toggleEditTime.bind(this)}>
+                        {this.state.editing ? chrome.i18n.getMessage("save") : chrome.i18n.getMessage("edit")}
+                    </span>
+                ): ""}
             </div>
         );
     }
@@ -458,9 +452,6 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
     categorySelectionChange(event: React.ChangeEvent<HTMLSelectElement>): void {
         const chosenCategory = event.target.value as Category;
-        this.setState({
-            selectedCategory: chosenCategory
-        });
 
         // See if show more categories was pressed
         if (chosenCategory !== DEFAULT_CATEGORY && !Config.config.categorySelections.some((category) => category.name === chosenCategory)) {
@@ -488,10 +479,6 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     actionTypeSelectionChange(event: React.ChangeEvent<HTMLSelectElement>): void {
         const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
 
-        this.setState({
-            selectedActionType: event.target.value as ActionType
-        });
-
         this.handleReplacingLostTimes(sponsorTime.category, event.target.value as ActionType, sponsorTime);
         this.saveEditTimes();
     }
@@ -606,12 +593,11 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     saveEditTimes(): void {
         // Rate limit edits
         const timeSinceLastEdit = Date.now() - this.lastEditTime;
-        const rateLimitTime = 200;
+        if (timeSinceLastEdit < 200) {
-        if (timeSinceLastEdit < rateLimitTime) {
             if (!this.editTimeTimeout) {
                 this.editTimeTimeout = setTimeout(() => {
                     this.saveEditTimes();
-                }, rateLimitTime - timeSinceLastEdit)
+                }, timeSinceLastEdit)
             }
 
             return;
@@ -635,9 +621,6 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                 if (addingTime) {
                     this.props.contentContainer().updateEditButtonsOnPlayer();
                 }
-            } else if (startTime !== null) {
-                // Only start time is valid, still an incomplete segment
-                sponsorTimesSubmitting[this.props.index].segment[0] = startTime;
             }
         } else if (this.state.sponsorTimeEdits[1] === null && category === "outro" && !sponsorTimesSubmitting[this.props.index].segment[1]) {
             sponsorTimesSubmitting[this.props.index].segment[1] = this.props.contentContainer().v.duration;
@@ -648,15 +631,12 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
         const actionType = this.getNextActionType(category, this.actionTypeOptionRef?.current?.value as ActionType);
         sponsorTimesSubmitting[this.props.index].actionType = actionType;
-        this.setState({
-            selectedActionType: actionType
-        });
 
         const description = actionType === ActionType.Chapter ? this.descriptionOptionRef?.current?.value : "";
         sponsorTimesSubmitting[this.props.index].description = description;
 
-        Config.local.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimesSubmitting;
+        Config.config.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimesSubmitting;
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         this.props.contentContainer().updatePreviewBar();
 
@@ -675,7 +655,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     previewTime(ctrlPressed = false, shiftPressed = false, skipToEndTime = false): void {
         const sponsorTimes = this.props.contentContainer().sponsorTimesSubmitting;
         const index = this.props.index;
-        let seekTime = defaultPreviewTime;
+        let seekTime = 2;
         if (ctrlPressed) seekTime = 0.5;
         if (shiftPressed) seekTime = 0.25;
 
@@ -706,11 +686,11 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
   
         //save this
         if (sponsorTimes.length > 0) {
-            Config.local.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimes;
+            Config.config.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimes;
         } else {
-            delete Config.local.unsubmittedSegments[this.props.contentContainer().sponsorVideoID];
+            delete Config.config.unsubmittedSegments[this.props.contentContainer().sponsorVideoID];
         }
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         this.props.contentContainer().updatePreviewBar();
         

src/components/SubmissionNoticeComponent.tsx

@@ -14,7 +14,7 @@ export interface SubmissionNoticeProps {
     // Contains functions and variables from the content script needed by the skip notice
     contentContainer: ContentContainer;
 
-    callback: () => Promise<boolean>;
+    callback: () => unknown;
 
     closeListener: () => void;
 }
@@ -69,13 +69,6 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
         this.videoObserver.observe(this.contentContainer().v, {
             attributes: true
         });
-
-        // Prevent zooming while changing times
-        document.getElementById("sponsorSkipNoticeMiddleRow" + this.state.idSuffix).addEventListener('wheel', function (event) {
-            if (event.ctrlKey) {
-                event.preventDefault();
-            }
-        }, {passive: false});
     }
 
     componentWillUnmount(): void {
@@ -89,17 +82,13 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
         if (currentSegmentCount > this.lastSegmentCount) {
             this.lastSegmentCount = currentSegmentCount;
 
-            this.scrollToBottom();
+            const scrollElement = this.noticeRef.current.getElement().current.querySelector("#sponsorSkipNoticeMiddleRowSubmissionNotice");
+            scrollElement.scrollTo({
+                top: scrollElement.scrollHeight + 1000
+            });
         }
     }
 
-    scrollToBottom() {
-        const scrollElement = this.noticeRef.current.getElement().current.querySelector("#sponsorSkipNoticeMiddleRowSubmissionNotice");
-        scrollElement.scrollTo({
-            top: scrollElement.scrollHeight + 1000
-        });
-    }
-
     render(): React.ReactElement {
         const sortButton = 
             <img id={"sponsorSkipSortButton" + this.state.idSuffix} 
@@ -107,7 +96,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 onClick={() => this.sortSegments()}
                 title={chrome.i18n.getMessage("sortSegments")}
                 key="sortButton"
-                src={chrome.runtime.getURL("icons/sort.svg")}>
+                src={chrome.extension.getURL("icons/sort.svg")}>
             </img>;
         const exportButton = 
             <img id={"sponsorSkipExportButton" + this.state.idSuffix} 
@@ -115,7 +104,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 onClick={() => this.exportSegments()}
                 title={chrome.i18n.getMessage("exportSegments")}
                 key="exportButton"
-                src={chrome.runtime.getURL("icons/export.svg")}>
+                src={chrome.extension.getURL("icons/export.svg")}>
             </img>;
         return (
             <NoticeComponent noticeTitle={this.state.noticeTitle}
@@ -131,8 +120,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 {/* Sponsor Time List */}
                 <tr id={"sponsorSkipNoticeMiddleRow" + this.state.idSuffix}
                     className="sponsorTimeMessagesRow"
-                    style={{maxHeight: (this.contentContainer().v?.offsetHeight - 200) + "px"}}
+                    style={{maxHeight: (this.contentContainer().v.offsetHeight - 200) + "px"}}>
-                    onMouseDown={(e) => e.stopPropagation()}>
                     <td style={{width: "100%"}}>
                         {this.getSponsorTimeMessages()}
                     </td>
@@ -239,19 +227,17 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
             }
         }
 
-        this.props.callback().then((success) => {
+        this.props.callback();
-            if (success) {
+
-                this.cancel();
+        this.cancel();
-            }
-        });
     }
 
     sortSegments(): void {
         let sponsorTimesSubmitting = this.props.contentContainer().sponsorTimesSubmitting;
         sponsorTimesSubmitting = sponsorTimesSubmitting.sort((a, b) => a.segment[0] - b.segment[0]);
 
-        Config.local.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimesSubmitting;
+        Config.config.unsubmittedSegments[this.props.contentContainer().sponsorVideoID] = sponsorTimesSubmitting;
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         this.forceUpdate();
     }

src/components/options/KeybindDialogComponent.tsx

@@ -141,12 +141,9 @@ class KeybindDialogComponent extends React.Component<KeybindDialogProps, Keybind
                 return {message: chrome.i18n.getMessage("youtubeKeybindWarning"), blocking: false};
         }
 
-        if (this.props.option !== "skipKeybind" && this.equals(Config.config['skipKeybind']) ||
+        if (this.props.option != "skipKeybind" && this.equals(Config.config['skipKeybind']) ||
-                this.props.option !== "submitKeybind" && this.equals(Config.config['submitKeybind']) ||
+                this.props.option != "submitKeybind" && this.equals(Config.config['submitKeybind']) ||
-                this.props.option !== "actuallySubmitKeybind" && this.equals(Config.config['actuallySubmitKeybind']) ||
+                this.props.option != "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
-                this.props.option !== "previewKeybind" && this.equals(Config.config['previewKeybind']) ||
-                this.props.option !== "closeSkipNoticeKeybind" && this.equals(Config.config['closeSkipNoticeKeybind']) ||
-                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
             return {message: chrome.i18n.getMessage("keyAlreadyUsed"), blocking: true};
 
         return null;

src/components/options/UnsubmittedVideoListComponent.tsx

@@ -24,7 +24,7 @@ class UnsubmittedVideoListComponent extends React.Component<UnsubmittedVideoList
 
     render(): React.ReactElement {
         // Render nothing if there are no unsubmitted segments
-        if (Object.keys(Config.local.unsubmittedSegments).length == 0)
+        if (Object.keys(Config.config.unsubmittedSegments).length == 0)
             return <></>;
 
         return (
@@ -58,7 +58,7 @@ class UnsubmittedVideoListComponent extends React.Component<UnsubmittedVideoList
     getUnsubmittedVideos(): JSX.Element[] {
         const elements: JSX.Element[] = [];
 
-        for (const videoID of Object.keys(Config.local.unsubmittedSegments)) {
+        for (const videoID of Object.keys(Config.config.unsubmittedSegments)) {
             elements.push(
                 <UnsubmittedVideoListItem videoID={videoID} key={videoID}>
                 </UnsubmittedVideoListItem>

src/components/options/UnsubmittedVideoListItem.tsx

@@ -23,7 +23,7 @@ class UnsubmittedVideoListItem extends React.Component<UnsubmittedVideosListItem
     }
 
     render(): React.ReactElement {
-        const segmentCount = Config.local.unsubmittedSegments[this.props.videoID]?.length ?? 0;
+        const segmentCount = Config.config.unsubmittedSegments[this.props.videoID]?.length ?? 0;
 
         return (
             <>
@@ -69,17 +69,17 @@ class UnsubmittedVideoListItem extends React.Component<UnsubmittedVideosListItem
 
     clearSegments(): void {
         if (confirm(chrome.i18n.getMessage("clearThis"))) {
-            delete Config.local.unsubmittedSegments[this.props.videoID];
+            delete Config.config.unsubmittedSegments[this.props.videoID];
-            Config.forceLocalUpdate("unsubmittedSegments");
+            Config.forceSyncUpdate("unsubmittedSegments");
         }
     }
 
     exportSegments(): void {
-        this.copyToClipboard(exportTimes(Config.local.unsubmittedSegments[this.props.videoID]));
+        this.copyToClipboard(exportTimes(Config.config.unsubmittedSegments[this.props.videoID]));
     }
 
     exportSegmentsAsURL(): void {
-        this.copyToClipboard(`https://youtube.com/watch?v=${this.props.videoID}${exportTimesAsHashParam(Config.local.unsubmittedSegments[this.props.videoID])}`)
+        this.copyToClipboard(`https://youtube.com/watch?v=${this.props.videoID}${exportTimesAsHashParam(Config.config.unsubmittedSegments[this.props.videoID])}`)
     }
 
     copyToClipboard(text: string): void {

src/components/options/UnsubmittedVideosComponent.tsx

@@ -21,8 +21,8 @@ class UnsubmittedVideosComponent extends React.Component<UnsubmittedVideosProps,
     }
 
     render(): React.ReactElement {
-        const videoCount = Object.keys(Config.local.unsubmittedSegments).length;
+        const videoCount = Object.keys(Config.config.unsubmittedSegments).length;
-        const segmentCount = Object.values(Config.local.unsubmittedSegments).reduce((acc: number, vid: Array<unknown>) => acc + vid.length, 0);
+        const segmentCount = Object.values(Config.config.unsubmittedSegments).reduce((acc: number, vid: Array<unknown>) => acc + vid.length, 0);
 
         return <>
             <div style={{marginBottom: "10px"}}>
@@ -48,7 +48,7 @@ class UnsubmittedVideosComponent extends React.Component<UnsubmittedVideosProps,
 
     clearAllSegments(): void {
         if (confirm(chrome.i18n.getMessage("clearUnsubmittedSegmentsConfirm")))
-            Config.local.unsubmittedSegments = {};
+            Config.config.unsubmittedSegments = {};
     }
 }
 

src/config.ts

@@ -12,6 +12,8 @@ interface SBConfig {
     userID: string;
     isVip: boolean;
     permissions: Record<Category, Permission>;
+    /* Contains unsubmitted segments that the user has created. */
+    unsubmittedSegments: Record<string, SponsorTime[]>;
     defaultCategory: Category;
     renderSegmentsAsChapters: boolean;
     whitelistedChannels: string[];
@@ -29,7 +31,6 @@ interface SBConfig {
     trackViewCount: boolean;
     trackViewCountInPrivate: boolean;
     trackDownvotes: boolean;
-    trackDownvotesInPrivate: boolean;
     dontShowNotice: boolean;
     noticeVisibilityMode: NoticeVisbilityMode;
     hideVideoPlayerControls: boolean;
@@ -91,11 +92,8 @@ interface SBConfig {
     skipToHighlightKeybind: Keybind;
     startSponsorKeybind: Keybind;
     submitKeybind: Keybind;
-    actuallySubmitKeybind: Keybind;
-    previewKeybind: Keybind;
     nextChapterKeybind: Keybind;
     previousChapterKeybind: Keybind;
-    closeSkipNoticeKeybind: Keybind;
 
     // What categories should be skipped
     categorySelections: CategorySelection[];
@@ -140,11 +138,8 @@ interface SBStorage {
     downvotedSegments: Record<VideoID & HashedValue, VideoDownvotes>;
     navigationApiAvailable: boolean;
     
-    // Used when sync storage disabled
+    // Used when sync storage disbaled
     alreadyInstalled: boolean;
-
-    /* Contains unsubmitted segments that the user has created. */
-    unsubmittedSegments: Record<string, SponsorTime[]>;
 }
 
 class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
@@ -156,10 +151,6 @@ class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
             skipCount: this.config.skipCount,
             sponsorTimesContributed: this.config.sponsorTimesContributed
         });
-
-        chrome.storage.local.set({
-            ...this.localDefaults,
-        });
     }
 }
 
@@ -168,14 +159,6 @@ function migrateOldSyncFormats(config: SBConfig) {
         chrome.storage.sync.remove("showZoomToFillError");
     }
 
-    if (config["unsubmittedSegments"] && Object.keys(config["unsubmittedSegments"]).length > 0) {
-        chrome.storage.local.set({
-            unsubmittedSegments: config["unsubmittedSegments"]
-        }, () => {
-            chrome.storage.sync.remove("unsubmittedSegments");
-        });
-    }
-
     if (!config["chapterCategoryAdded"]) {
         config["chapterCategoryAdded"] = true;
 
@@ -189,6 +172,15 @@ function migrateOldSyncFormats(config: SBConfig) {
         }
     }
 
+    if (config["segmentTimes"]) {
+        const unsubmittedSegments = {};
+        for (const item of config["segmentTimes"]) {
+            unsubmittedSegments[item[0]] = item[1];
+        }
+
+        chrome.storage.sync.remove("segmentTimes", () => config.unsubmittedSegments = unsubmittedSegments);
+    }
+
     if (config["exclusive_accessCategoryAdded"] !== undefined) {
         chrome.storage.sync.remove("exclusive_accessCategoryAdded");
     }
@@ -274,6 +266,7 @@ const syncDefaults = {
     userID: null,
     isVip: false,
     permissions: {},
+    unsubmittedSegments: {},
     defaultCategory: "chooseACategory" as Category,
     renderSegmentsAsChapters: false,
     whitelistedChannels: [],
@@ -291,7 +284,6 @@ const syncDefaults = {
     trackViewCount: true,
     trackViewCountInPrivate: true,
     trackDownvotes: true,
-    trackDownvotesInPrivate: false,
     dontShowNotice: false,
     noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
     hideVideoPlayerControls: false,
@@ -349,11 +341,8 @@ const syncDefaults = {
     skipToHighlightKeybind: { key: "Enter", ctrl: true },
     startSponsorKeybind: { key: ";" },
     submitKeybind: { key: "'" },
-    actuallySubmitKeybind: { key: "'", ctrl: true },
-    previewKeybind: { key: ";", ctrl: true },
     nextChapterKeybind: { key: "ArrowRight", ctrl: true },
     previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
-    closeSkipNoticeKeybind: { key: "Backspace" },
 
     categorySelections: [{
         name: "sponsor" as Category,
@@ -471,9 +460,7 @@ const syncDefaults = {
 const localDefaults = {
     downvotedSegments: {},
     navigationApiAvailable: null,
-    alreadyInstalled: false,
+    alreadyInstalled: false
-
-    unsubmittedSegments: {}
 };
 
 const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);

src/content.ts

@@ -26,7 +26,7 @@ import { SkipButtonControlBar } from "./js-components/skipButtonControlBar";
 import { getStartTimeFromUrl } from "./utils/urlParser";
 import { getControls, getExistingChapters, getHashParams, isPlayingPlaylist, isVisible } from "./utils/pageUtils";
 import { CategoryPill } from "./render/CategoryPill";
-import { AnimationUtils } from "../maze-utils/src/animationUtils";
+import { AnimationUtils } from "./utils/animationUtils";
 import { GenericUtils } from "./utils/genericUtils";
 import { logDebug, logWarn } from "./utils/logger";
 import { importTimes } from "./utils/exporter";
@@ -34,8 +34,8 @@ import { ChapterVote } from "./render/ChapterVote";
 import { openWarningDialog } from "./utils/warnings";
 import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { getErrorMessage, getFormattedTime } from "../maze-utils/src/formating";
-import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube, getLastNonInlineVideoID, triggerVideoIDChange, triggerVideoElementChange, getIsInline } from "../maze-utils/src/video";
+import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube } from "../maze-utils/src/video";
-import { Keybind, StorageChangesObject, isSafari, keybindEquals, keybindToString } from "../maze-utils/src/config";
+import { Keybind, StorageChangesObject, isSafari, keybindEquals } from "../maze-utils/src/config";
 import { findValidElement } from "../maze-utils/src/dom"
 import { getHash, HashedValue } from "../maze-utils/src/hash";
 import { generateUserID } from "../maze-utils/src/setup";
@@ -47,9 +47,6 @@ import { cleanPage } from "./utils/pageCleaner";
 import { addCleanupListener } from "../maze-utils/src/cleanup";
 import { hideDeArrowPromotion, tryShowingDeArrowPromotion } from "./dearrowPromotion";
 import { asyncRequestToServer } from "./utils/requests";
-import { isMobileControlsOpen } from "./utils/mobileUtils";
-import { defaultPreviewTime } from "./utils/constants";
-import { onVideoPage } from "../maze-utils/src/pageInfo";
 
 cleanPage();
 
@@ -73,15 +70,12 @@ let sponsorDataFound = false;
 let sponsorTimes: SponsorTime[] = [];
 let existingChaptersImported = false;
 let importingChaptersWaitingForFocus = false;
-let importingChaptersWaiting = false;
-let triedImportingChapters = false;
 // List of open skip notices
 const skipNotices: SkipNotice[] = [];
 let activeSkipKeybindElement: ToggleSkippable = null;
 let retryFetchTimeout: NodeJS.Timeout = null;
 let shownSegmentFailedToFetchWarning = false;
 let selectedSegment: SegmentUUID | null = null;
-let previewedSegment = false;
 
 // JSON video info
 let videoInfo: VideoInfo = null;
@@ -127,10 +121,13 @@ setupVideoModule({
         updateVisibilityOfPlayerControlsButton();
     },
     resetValues,
-    documentScript: chrome.runtime.getManifest().manifest_version === 2 ? documentScript : undefined
+    documentScript
 }, () => Config);
 setupThumbnailListener();
 
+//the video id of the last preview bar update
+let lastPreviewBarUpdate: VideoID;
+
 // Is the video currently being switched
 let switchingVideos = null;
 
@@ -168,6 +165,7 @@ let submissionNotice: SubmissionNotice = null;
 
 let lastResponseStatus: number;
 let retryCount = 0;
+let lookupWaiting = false;
 
 // Contains all of the functions and variables needed by the skip notice
 const skipNoticeContentContainer: ContentContainer = () => ({
@@ -218,7 +216,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                 found: sponsorDataFound,
                 status: lastResponseStatus,
                 sponsorTimes: sponsorTimes,
-                time: getVideo()?.currentTime ?? 0,
+                time: getVideo().currentTime,
                 onMobileYouTube: isOnMobileYouTube()
             });
 
@@ -253,20 +251,13 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
 
             break;
         case "submitTimes":
-            openSubmissionMenu();
+            submitSponsorTimes();
             break;
         case "refreshSegments":
             // update video on refresh if videoID invalid
-            if (!getVideoID()) {
+            if (!getVideoID()) checkVideoIDChange();
-                checkVideoIDChange();
-            }
-            // if popup rescieves no response, or the videoID is invalid,
-            // it will assume the page is not a video page and stop the refresh animation
-            sendResponse({ hasVideo: getVideoID() != null });
             // fetch segments
-            if (getVideoID()) {
+            sponsorsLookup(false);
-                sponsorsLookup(false);
-            }
 
             break;
         case "unskip":
@@ -304,9 +295,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                 if (!sponsorTimesSubmitting.some(
                         (s) => Math.abs(s.segment[0] - segment.segment[0]) < 1
                             && Math.abs(s.segment[1] - segment.segment[1]) < 1)) {
-                    const hasChaptersPermission = (Config.config.showCategoryWithoutPermission
+                    if (segment.category === "chapter" && !utils.getCategorySelection("chapter")) {
-                        || Config.config.permissions["chapter"]);
-                    if (segment.category === "chapter" && (!utils.getCategorySelection("chapter") || !hasChaptersPermission)) {
                         segment.category = "chooseACategory" as Category;
                         segment.actionType = ActionType.Skip;
                         segment.description = "";
@@ -318,12 +307,12 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             }
 
             if (addedSegments) {
-                Config.local.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
+                Config.config.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
-                Config.forceLocalUpdate("unsubmittedSegments");
+                Config.forceSyncUpdate("unsubmittedSegments");
 
                 updateEditButtonsOnPlayer();
                 updateSponsorTimesSubmitting(false);
-                openSubmissionMenu();
+                submitSponsorTimes();
             }
 
             sendResponse({
@@ -381,11 +370,9 @@ function resetValues() {
     lastCheckTime = 0;
     lastCheckVideoTime = -1;
     retryCount = 0;
-    previewedSegment = false;
 
     sponsorTimes = [];
     existingChaptersImported = false;
-    triedImportingChapters = false;
     sponsorSkipped = [];
     lastResponseStatus = 0;
     shownSegmentFailedToFetchWarning = false;
@@ -402,9 +389,8 @@ function resetValues() {
     //reset sponsor data found check
     sponsorDataFound = false;
 
-    // When first loading a video, it is not switching videos
+    if (switchingVideos === null) {
-    // Hover play also doesn't need this check
+        // When first loading a video, it is not switching videos
-    if (switchingVideos === null || !onVideoPage()) {
         switchingVideos = false;
     } else {
         switchingVideos = true;
@@ -461,36 +447,26 @@ function videoIDChange(): void {
     updateSponsorTimesSubmitting();
 
     tryShowingDeArrowPromotion().catch(logWarn);
-
-    checkPreviewbarState();
-
-    if (getIsInline()) {
-        // Hover preview progress bar can take some time to appear
-        //   and if the miniplayer is also active then it would 
-        //   attach to the wrong one
-        setTimeout(checkPreviewbarState, 500);
-        setTimeout(checkPreviewbarState, 1000);
-        setTimeout(checkPreviewbarState, 3000);
-    }
 }
 
 function handleMobileControlsMutations(): void {
-    // Don't update while scrubbing
+    if (!chrome.runtime?.id) return;
-    if (!chrome.runtime?.id 
-            || document.querySelector(".YtProgressBarProgressBarPlayheadDotInDragging")) return;
 
     updateVisibilityOfPlayerControlsButton();
 
     skipButtonControlBar?.updateMobileControls();
 
     if (previewBar !== null) {
-        if (!previewBar.parent.contains(previewBar.container) && isMobileControlsOpen()) {
+        if (document.body.contains(previewBar.container)) {
-            previewBar.createElement();
+            const progressBarBackground = document.querySelector<HTMLElement>(".progress-bar-background");
-            updatePreviewBar();
+
+            if (progressBarBackground !== null) {
+                updatePreviewBarPositionMobile(progressBarBackground);
+            }
 
             return;
-        } else if (!previewBar.parent.isConnected) {
+        } else {
-            // The parent does not exist anymore, remove that old preview bar
+            // The container does not exist anymore, remove that old preview bar
             previewBar.remove();
             previewBar = null;
         }
@@ -500,32 +476,26 @@ function handleMobileControlsMutations(): void {
     createPreviewBar();
 }
 
-function getPreviewBarAttachElement(): HTMLElement | null {
+/**
+ * Creates a preview bar on the video
+ */
+function createPreviewBar(): void {
+    if (previewBar !== null) return;
+
     const progressElementOptions = [{
+            // For mobile YouTube
+            selector: ".progress-bar-background",
+            isVisibleCheck: true
+        }, {
             // For new mobile YouTube (#1287)
             selector: ".progress-bar-line",
             isVisibleCheck: true
         }, {
-            // For newer mobile YouTube (Jan 2024)
+            // For Desktop YouTube
-            selector: ".YtProgressBarProgressBarLine",
-            isVisibleCheck: true
-        }, {
-            // For newer mobile YouTube (May 2024)
-            selector: ".YtmProgressBarProgressBarLine",
-            isVisibleCheck: true
-        }, {
-            // For desktop YouTube hover play
-            // Priority is given to the hover play progress bar over the main progress bar
-            //   for miniplayer + hover preview case
-            // Second is new hover play selector
-            selector: "#video-preview .ytp-progress-bar, #video-preview .YtProgressBarLineHost",
-            isVisibleCheck: true
-        }, {
-            // For desktop YouTube
             selector: ".ytp-progress-bar",
             isVisibleCheck: true
         }, {
-            // For desktop YouTube
+            // For Desktop YouTube
             selector: ".no-model.cue-range-marker",
             isVisibleCheck: true
         }, {
@@ -548,27 +518,14 @@ function getPreviewBarAttachElement(): HTMLElement | null {
         const el = option.isVisibleCheck ? findValidElement(allElements) : allElements[0];
 
         if (el) {
-            return el;
+            const chapterVote = new ChapterVote(voteAsync);
+            previewBar = new PreviewBar(el, isOnMobileYouTube(), isOnInvidious(), chapterVote, () => importExistingChapters(true));
+
+            updatePreviewBar();
+
+            break;
         }
     }
-
-    return null;
-}
-
-/**
- * Creates a preview bar on the video
- */
-function createPreviewBar(): void {
-    if (previewBar !== null) return;
-
-    const el = getPreviewBarAttachElement();
-
-    if (el) {
-        const chapterVote = new ChapterVote(voteAsync);
-        previewBar = new PreviewBar(el, isOnMobileYouTube(), isOnInvidious(), chapterVote, () => importExistingChapters(true));
-
-        updatePreviewBar();
-    }
 }
 
 /**
@@ -812,7 +769,6 @@ function getVirtualTime(): number {
 
 function inMuteSegment(currentTime: number, includeOverlap: boolean): boolean {
     const checkFunction = (segment) => segment.actionType === ActionType.Mute
-        && segment.hidden === SponsorHideType.Visible
         && segment.segment[0] <= currentTime
         && (segment.segment[1] > currentTime || (includeOverlap && segment.segment[1] + 0.02 > currentTime));
     return sponsorTimes?.some(checkFunction) || sponsorTimesSubmitting.some(checkFunction);
@@ -822,8 +778,6 @@ function inMuteSegment(currentTime: number, includeOverlap: boolean): boolean {
  * This makes sure the videoID is still correct and if the sponsorTime is included
  */
 function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boolean {
-    if (!onVideoPage()) return false;
-
     const currentVideoID = getYouTubeVideoID();
     const recordedVideoID = videoID || getVideoID();
     if (currentVideoID !== recordedVideoID || (sponsorTime
@@ -847,16 +801,14 @@ let playbackRateCheckInterval: NodeJS.Timeout | null = null;
 let lastPlaybackSpeed = 1;
 let setupVideoListenersFirstTime = true;
 function setupVideoListeners() {
-    const video = getVideo();
-
     //wait until it is loaded
-    video.addEventListener('loadstart', videoOnReadyListener)
+    getVideo().addEventListener('loadstart', videoOnReadyListener)
-    video.addEventListener('durationchange', durationChangeListener);
+    getVideo().addEventListener('durationchange', durationChangeListener);
 
     if (setupVideoListenersFirstTime) {
         addCleanupListener(() => {
-            video.removeEventListener('loadstart', videoOnReadyListener);
+            getVideo().removeEventListener('loadstart', videoOnReadyListener);
-            video.removeEventListener('durationchange', durationChangeListener);
+            getVideo().removeEventListener('durationchange', durationChangeListener);
         });
     }
 
@@ -872,20 +824,18 @@ function setupVideoListeners() {
 
             startSponsorSchedule();
         };
-        video.addEventListener('ratechange', rateChangeListener);
+        getVideo().addEventListener('ratechange', rateChangeListener);
         // Used by videospeed extension (https://github.com/igrigorik/videospeed/pull/740)
-        video.addEventListener('videoSpeed_ratechange', rateChangeListener);
+        getVideo().addEventListener('videoSpeed_ratechange', rateChangeListener);
 
         const playListener = () => {
             // If it is not the first event, then the only way to get to 0 is if there is a seek event
             // This check makes sure that changing the video resolution doesn't cause the extension to think it
             // gone back to the begining
-            if (video.readyState <= HTMLMediaElement.HAVE_CURRENT_DATA
+            if (getVideo().readyState <= HTMLMediaElement.HAVE_CURRENT_DATA
-                    && video.currentTime === 0) return;
+                    && getVideo().currentTime === 0) return;
-
 
             updateVirtualTime();
-            checkForMiniplayerPlaying();
 
             if (switchingVideos || lastPausedAtZero) {
                 switchingVideos = false;
@@ -901,15 +851,15 @@ function setupVideoListeners() {
             updateAdFlag();
 
             // Make sure it doesn't get double called with the playing event
-            if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
+            if (Math.abs(lastCheckVideoTime - getVideo().currentTime) > 0.3
-                    || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
+                    || (lastCheckVideoTime !== getVideo().currentTime && Date.now() - lastCheckTime > 2000)) {
                 lastCheckTime = Date.now();
-                lastCheckVideoTime = video.currentTime;
+                lastCheckVideoTime = getVideo().currentTime;
 
                 startSponsorSchedule();
             }
         };
-        video.addEventListener('play', playListener);
+        getVideo().addEventListener('play', playListener);
 
         const playingListener = () => {
             updateVirtualTime();
@@ -917,8 +867,8 @@ function setupVideoListeners() {
 
             if (startedWaiting) {
                 startedWaiting = false;
-                logDebug(`[SB] Playing event after buffering: ${Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
+                logDebug(`[SB] Playing event after buffering: ${Math.abs(lastCheckVideoTime - getVideo().currentTime) > 0.3
-                    || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)}`);
+                    || (lastCheckVideoTime !== getVideo().currentTime && Date.now() - lastCheckTime > 2000)}`);
             }
 
             if (switchingVideos) {
@@ -930,63 +880,63 @@ function setupVideoListeners() {
             }
 
             // Make sure it doesn't get double called with the play event
-            if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
+            if (Math.abs(lastCheckVideoTime - getVideo().currentTime) > 0.3
-                    || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
+                    || (lastCheckVideoTime !== getVideo().currentTime && Date.now() - lastCheckTime > 2000)) {
                 lastCheckTime = Date.now();
-                lastCheckVideoTime = video.currentTime;
+                lastCheckVideoTime = getVideo().currentTime;
 
                 startSponsorSchedule();
             }
 
             if (playbackRateCheckInterval) clearInterval(playbackRateCheckInterval);
-            lastPlaybackSpeed = video.playbackRate;
+            lastPlaybackSpeed = getVideo().playbackRate;
 
             // Video speed controller compatibility
             // That extension makes rate change events not propagate
             if (document.body.classList.contains("vsc-initialized")) {
                 playbackRateCheckInterval = setInterval(() => {
-                    if ((!getVideoID() || video.paused) && playbackRateCheckInterval) {
+                    if ((!getVideoID() || getVideo().paused) && playbackRateCheckInterval) {
                         // Video is gone, stop checking
                         clearInterval(playbackRateCheckInterval);
                         return;
                     }
     
-                    if (video.playbackRate !== lastPlaybackSpeed) {
+                    if (getVideo().playbackRate !== lastPlaybackSpeed) {
-                        lastPlaybackSpeed = video.playbackRate;
+                        lastPlaybackSpeed = getVideo().playbackRate;
     
                         rateChangeListener();
                     }
                 }, 2000);
             }
         };
-        video.addEventListener('playing', playingListener);
+        getVideo().addEventListener('playing', playingListener);
         
         const seekingListener = () => {
             lastKnownVideoTime.fromPause = false;
 
-            if (!video.paused){
+            if (!getVideo().paused){
                 // Reset lastCheckVideoTime
                 lastCheckTime = Date.now();
-                lastCheckVideoTime = video.currentTime;
+                lastCheckVideoTime = getVideo().currentTime;
 
                 updateVirtualTime();
                 clearWaitingTime();
 
                 // Sometimes looped videos loop back to almost zero, but not quite
-                if (video.loop && video.currentTime < 0.2) {
+                if (getVideo().loop && getVideo().currentTime < 0.2) {
                     startSponsorSchedule(false, 0);
                 } else {
                     startSponsorSchedule();
                 }
             } else {
-                updateActiveSegment(video.currentTime);
+                updateActiveSegment(getVideo().currentTime);
 
-                if (video.currentTime === 0) {
+                if (getVideo().currentTime === 0) {
                     lastPausedAtZero = true;
                 }
             }
         };
-        video.addEventListener('seeking', seekingListener);
+        getVideo().addEventListener('seeking', seekingListener);
         
         const stoppedPlayback = () => {
             // Reset lastCheckVideoTime
@@ -997,7 +947,7 @@ function setupVideoListeners() {
 
             lastKnownVideoTime.videoTime = null;
             lastKnownVideoTime.preciseTime = null;
-            updateWaitingTime(video);
+            updateWaitingTime();
 
             cancelSponsorSchedule();
         };
@@ -1006,26 +956,26 @@ function setupVideoListeners() {
 
             stoppedPlayback();
         };
-        video.addEventListener('pause', pauseListener);
+        getVideo().addEventListener('pause', pauseListener);
         const waitingListener = () => {
             logDebug("[SB] Not skipping due to buffering");
             startedWaiting = true;
 
             stoppedPlayback();
         };
-        video.addEventListener('waiting', waitingListener);
+        getVideo().addEventListener('waiting', waitingListener);
 
         startSponsorSchedule();
 
         if (setupVideoListenersFirstTime) {
             addCleanupListener(() => {
-                video.removeEventListener('play', playListener);
+                getVideo().removeEventListener('play', playListener);
-                video.removeEventListener('playing', playingListener);
+                getVideo().removeEventListener('playing', playingListener);
-                video.removeEventListener('seeking', seekingListener);
+                getVideo().removeEventListener('seeking', seekingListener);
-                video.removeEventListener('ratechange', rateChangeListener);
+                getVideo().removeEventListener('ratechange', rateChangeListener);
-                video.removeEventListener('videoSpeed_ratechange', rateChangeListener);
+                getVideo().removeEventListener('videoSpeed_ratechange', rateChangeListener);
-                video.removeEventListener('pause', pauseListener);
+                getVideo().removeEventListener('pause', pauseListener);
-                video.removeEventListener('waiting', waitingListener);
+                getVideo().removeEventListener('waiting', waitingListener);
 
                 if (playbackRateCheckInterval) clearInterval(playbackRateCheckInterval);
             });
@@ -1076,8 +1026,8 @@ function updateVirtualTime() {
     }
 }
 
-function updateWaitingTime(video: HTMLVideoElement): void {
+function updateWaitingTime(): void {
-    lastTimeFromWaitingEvent = video.currentTime;
+    lastTimeFromWaitingEvent = getVideo().currentTime;
 }
 
 function clearWaitingTime(): void {
@@ -1111,18 +1061,24 @@ function setupCategoryPill() {
 }
 
 async function sponsorsLookup(keepOldSubmissions = true) {
+    if (lookupWaiting) return;
+    //there is still no video here
+    if (!getVideo()) {
+        lookupWaiting = true;
+        setTimeout(() => {
+            lookupWaiting = false;
+            sponsorsLookup()
+        }, 100);
+        return;
+    }
+
     const categories: string[] = Config.config.categorySelections.map((category) => category.name);
 
     const extraRequestData: Record<string, unknown> = {};
     const hashParams = getHashParams();
     if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
 
-    const videoID = getVideoID()
+    const hashPrefix = (await getHash(getVideoID(), 1)).slice(0, 4) as VideoID & HashedValue;
-    if (!videoID) {
-        console.error("[SponsorBlock] Attempted to fetch segments with a null/undefined videoID.");
-        return;
-    }
-    const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
     const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
         categories,
         actionTypes: getEnabledActionTypes(),
@@ -1192,14 +1148,13 @@ async function sponsorsLookup(keepOldSubmissions = true) {
                 }
             }
 
-            if (!getVideo()) {
-                //there is still no video here
-                await waitFor(() => getVideo(), 5000, 10);
-            }
-
             startSkipScheduleCheckingForStartSponsors();
 
-            if (!isNaN(getVideo().duration)) {
+            //update the preview bar
+            //leave the type blank for now until categories are added
+            if (lastPreviewBarUpdate == getVideoID() || (lastPreviewBarUpdate == null && !isNaN(getVideo().duration))) {
+                //set it now
+                //otherwise the listener can handle it
                 updatePreviewBar();
             }
         } else {
@@ -1217,7 +1172,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {
         found: sponsorDataFound,
         status: lastResponseStatus,
         sponsorTimes: sponsorTimes,
-        time: getVideo()?.currentTime ?? 0,
+        time: getVideo().currentTime,
         onMobileYouTube: isOnMobileYouTube()
     });
 
@@ -1227,10 +1182,10 @@ async function sponsorsLookup(keepOldSubmissions = true) {
 }
 
 function importExistingChapters(wait: boolean) {
-    if (!existingChaptersImported && !importingChaptersWaiting && !triedImportingChapters && onVideoPage() && !isOnMobileYouTube()) {
+    if (!existingChaptersImported) {
         const waitCondition = () => getVideo()?.duration && getExistingChapters(getVideoID(), getVideo().duration);
 
-        if (wait && !document.hasFocus() && !importingChaptersWaitingForFocus && !waitCondition()) {
+        if (!waitCondition() && wait && !document.hasFocus() && !importingChaptersWaitingForFocus) {
             importingChaptersWaitingForFocus = true;
             const listener = () => {
                 importExistingChapters(wait);
@@ -1238,17 +1193,14 @@ function importExistingChapters(wait: boolean) {
             };
             window.addEventListener("focus", listener);
         } else {
-            importingChaptersWaiting = true;
             waitFor(waitCondition,
                 wait ? 15000 : 0, 400, (c) => c?.length > 0).then((chapters) => {
-                    importingChaptersWaiting = false;
-
                     if (!existingChaptersImported && chapters?.length > 0) {
                         sponsorTimes = (sponsorTimes ?? []).concat(...chapters).sort((a, b) => a.segment[0] - b.segment[0]);
                         existingChaptersImported = true;
                         updatePreviewBar();
                     }
-                }).catch(() => { importingChaptersWaiting = false; triedImportingChapters = true; }); // eslint-disable-line @typescript-eslint/no-empty-function
+                }).catch(() => {}); // eslint-disable-line @typescript-eslint/no-empty-function
         }
     }
 }
@@ -1362,6 +1314,15 @@ function startSkipScheduleCheckingForStartSponsors() {
     }
 }
 
+/**
+ * This function is required on mobile YouTube and will keep getting called whenever the preview bar disapears
+ */
+function updatePreviewBarPositionMobile(parent: HTMLElement) {
+    if (document.getElementById("previewbar") === null) {
+        previewBar.createElement(parent);
+    }
+}
+
 function selectSegment(UUID: SegmentUUID): void {
     selectedSegment = UUID;
     updatePreviewBar();
@@ -1420,6 +1381,9 @@ function updatePreviewBar(): void {
 
         showTimeWithoutSkips(skippedDuration);
     }
+
+    // Update last video id
+    lastPreviewBarUpdate = getVideoID();
 }
 
 //checks if this channel is whitelisted, should be done only after the channelID has been loaded
@@ -1444,7 +1408,6 @@ function videoElementChange(newVideo: boolean): void {
             setupCategoryPill();
         }
     
-        updatePreviewBar();
         checkPreviewbarState();
     
         // Incase the page is still transitioning, check again in a few seconds
@@ -1454,19 +1417,8 @@ function videoElementChange(newVideo: boolean): void {
     })
 }
 
-let checkingPreviewbarAgain = false;
 function checkPreviewbarState(): void {
-    if (!getPreviewBarAttachElement() && !checkingPreviewbarAgain && getVideo() && getVideoID()) {
+    if (previewBar && !utils.findReferenceNode()?.contains(previewBar.container)) {
-        checkingPreviewbarAgain = true;
-        setTimeout(() => {
-            checkingPreviewbarAgain = false;
-            checkPreviewbarState();
-        }, 500);
-
-        return;
-    }
-
-    if (previewBar && !getPreviewBarAttachElement()?.contains(previewBar.container)) {
         previewBar.remove();
         previewBar = null;
     }
@@ -1602,8 +1554,7 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
                     && segment.segment[1] > minimum && shouldSkip(segment)))) // Only include intersecting skippable segments
         && (!hideHiddenSponsors || segment.hidden === SponsorHideType.Visible)
         && segment.segment.length === 2
-        && segment.actionType !== ActionType.Poi
+        && segment.actionType !== ActionType.Poi;
-        && segment.actionType !== ActionType.Full;
 
     const possibleTimes = sponsorTimes.map((sponsorTime) => ({
         ...sponsorTime,
@@ -1637,7 +1588,6 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
  * @param time
  */
 function previewTime(time: number, unpause = true) {
-    previewedSegment = true;
     getVideo().currentTime = time;
 
     // Unpause the video if needed
@@ -1648,13 +1598,6 @@ function previewTime(time: number, unpause = true) {
 
 //send telemetry and count skip
 function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped: number, fullSkip: boolean) {
-    for (const segment of skippingSegments) {
-        if (!previewedSegment && sponsorTimesSubmitting.some((s) => s.segment === segment.segment)) {
-            // Count that as a previewed segment
-            previewedSegment = true;
-        }
-    }
-
     if (!Config.config.trackViewCount || (!Config.config.trackViewCountInPrivate && chrome.extension.inIncognitoContext)) return;
 
     let counted = false;
@@ -1681,9 +1624,8 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
 
     // There will only be one submission if it is manual skip
     const autoSkip: boolean = forceAutoSkip || shouldAutoSkip(skippingSegments[0]);
-    const isSubmittingSegment = sponsorTimesSubmitting.some((time) => time.segment === skippingSegments[0].segment);
 
-    if ((autoSkip || isSubmittingSegment)
+    if ((autoSkip || sponsorTimesSubmitting.some((time) => time.segment === skippingSegments[0].segment))
             && v.currentTime !== skipTime[1]) {
         switch(skippingSegments[0].actionType) {
             case ActionType.Poi:
@@ -1764,7 +1706,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
     }
 
     //send telemetry that a this sponsor was skipped
-    if (autoSkip || isSubmittingSegment) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true);
+    if (autoSkip) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true);
 }
 
 function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, unskipTime: number, startReskip: boolean) {
@@ -1832,7 +1774,7 @@ function createButton(baseID: string, title: string, callback: () => void, image
     newButton.draggable = isDraggable;
     newButtonImage.id = baseID + "Image";
     newButtonImage.className = "playerButtonImage";
-    newButtonImage.src = chrome.runtime.getURL("icons/" + imageName);
+    newButtonImage.src = chrome.extension.getURL("icons/" + imageName);
 
     // Append image to button
     newButton.appendChild(newButtonImage);
@@ -1854,8 +1796,7 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
     return (!Config.config.manualSkipOnFullVideo || !sponsorTimes?.some((s) => s.category === segment.category && s.actionType === ActionType.Full))
         && (utils.getCategorySelection(segment.category)?.option === CategorySkipOption.AutoSkip ||
             (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic")
-                && segment.actionType === ActionType.Skip)
+                && segment.actionType === ActionType.Skip));
-            || sponsorTimesSubmitting.some((s) => s.segment === segment.segment));
 }
 
 function shouldSkip(segment: SponsorTime): boolean {
@@ -1874,7 +1815,7 @@ async function createButtons(): Promise<void> {
     createButton("startSegment", "sponsorStart", () => startOrEndTimingNewSegment(), "PlayerStartIconSponsorBlocker.svg");
     createButton("cancelSegment", "sponsorCancel", () => cancelCreatingSegment(), "PlayerCancelSegmentIconSponsorBlocker.svg");
     createButton("delete", "clearTimes", () => clearSponsorTimes(), "PlayerDeleteIconSponsorBlocker.svg");
-    createButton("submit", "OpenSubmissionMenu", () => openSubmissionMenu(), "PlayerUploadIconSponsorBlocker.svg");
+    createButton("submit", "OpenSubmissionMenu", () => submitSponsorTimes(), "PlayerUploadIconSponsorBlocker.svg");
     createButton("info", "openPopup", () => openInfoMenu(), "PlayerInfoIconSponsorBlocker.svg");
 
     const controlsContainer = getControls();
@@ -1932,10 +1873,10 @@ function updateEditButtonsOnPlayer(): void {
 
     if (buttonsEnabled) {
         if (creatingSegment) {
-            playerButtons.startSegment.image.src = chrome.runtime.getURL("icons/PlayerStopIconSponsorBlocker.svg");
+            playerButtons.startSegment.image.src = chrome.extension.getURL("icons/PlayerStopIconSponsorBlocker.svg");
             playerButtons.startSegment.button.setAttribute("title", chrome.i18n.getMessage("sponsorEnd"));
         } else {
-            playerButtons.startSegment.image.src = chrome.runtime.getURL("icons/PlayerStartIconSponsorBlocker.svg");
+            playerButtons.startSegment.image.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker.svg");
             playerButtons.startSegment.button.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
         }
     }
@@ -1983,8 +1924,8 @@ function startOrEndTimingNewSegment() {
     }
 
     // Save the newly created segment
-    Config.local.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
+    Config.config.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
-    Config.forceLocalUpdate("unsubmittedSegments");
+    Config.forceSyncUpdate("unsubmittedSegments");
 
     // Make sure they know if someone has already submitted something it while they were watching
     sponsorsLookup();
@@ -2016,13 +1957,13 @@ function cancelCreatingSegment() {
     if (isSegmentCreationInProgress()) {
         if (sponsorTimesSubmitting.length > 1) {  // If there's more than one segment: remove last
             sponsorTimesSubmitting.pop();
-            Config.local.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
+            Config.config.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
         } else {  // Otherwise delete the video entry & close submission menu
             resetSponsorSubmissionNotice();
             sponsorTimesSubmitting = [];
-            delete Config.local.unsubmittedSegments[getVideoID()];
+            delete Config.config.unsubmittedSegments[getVideoID()];
         }
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
     }
 
     updateEditButtonsOnPlayer();
@@ -2030,7 +1971,7 @@ function cancelCreatingSegment() {
 }
 
 function updateSponsorTimesSubmitting(getFromConfig = true) {
-    const segmentTimes = Config.local.unsubmittedSegments[getVideoID()];
+    const segmentTimes = Config.config.unsubmittedSegments[getVideoID()];
 
     //see if this data should be saved in the sponsorTimesSubmitting variable
     if (getFromConfig && segmentTimes != undefined) {
@@ -2048,9 +1989,6 @@ function updateSponsorTimesSubmitting(getFromConfig = true) {
         }
 
         if (sponsorTimesSubmitting.length > 0) {
-            // Assume they already previewed a segment
-            previewedSegment = true;
-
             importExistingChapters(true);
         }
     }
@@ -2116,7 +2054,7 @@ function openInfoMenu() {
             }
         }
     });
-    frame.src = chrome.runtime.getURL("popup.html");
+    frame.src = chrome.extension.getURL("popup.html");
     popup.appendChild(frame);
 
     const elemHasChild = (elements: NodeListOf<HTMLElement>): Element => {
@@ -2163,7 +2101,7 @@ function closeInfoMenu() {
 function clearSponsorTimes() {
     const currentVideoID = getVideoID();
 
-    const sponsorTimes = Config.local.unsubmittedSegments[currentVideoID];
+    const sponsorTimes = Config.config.unsubmittedSegments[currentVideoID];
 
     if (sponsorTimes != undefined && sponsorTimes.length > 0) {
         const confirmMessage = chrome.i18n.getMessage("clearThis") + getSegmentsMessage(sponsorTimes)
@@ -2173,8 +2111,8 @@ function clearSponsorTimes() {
         resetSponsorSubmissionNotice();
 
         //clear the sponsor times
-        delete Config.local.unsubmittedSegments[currentVideoID];
+        delete Config.config.unsubmittedSegments[currentVideoID];
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         //clear sponsor times submitting
         sponsorTimesSubmitting = [];
@@ -2288,63 +2226,32 @@ function resetSponsorSubmissionNotice(callRef = true) {
     submissionNotice = null;
 }
 
-function closeSubmissionMenu() {
+function submitSponsorTimes() {
-    submissionNotice?.close();
-    submissionNotice = null;
-}
-
-function openSubmissionMenu() {
     if (submissionNotice !== null){
-        closeSubmissionMenu();
+        submissionNotice.close();
+        submissionNotice = null;
         return;
     }
 
     if (sponsorTimesSubmitting !== undefined && sponsorTimesSubmitting.length > 0) {
         submissionNotice = new SubmissionNotice(skipNoticeContentContainer, sendSubmitMessage);
     }
-}
-
-function previewRecentSegment() {
-    if (sponsorTimesSubmitting !== undefined && sponsorTimesSubmitting.length > 0) {
-        previewTime(sponsorTimesSubmitting[sponsorTimesSubmitting.length - 1].segment[0] - defaultPreviewTime);
-        
-        if (submissionNotice) {
-            submissionNotice.scrollToBottom();
-        }
-    }
-}
-
-function submitSegments() {
-    if (sponsorTimesSubmitting !== undefined
-            && sponsorTimesSubmitting.length > 0
-            && submissionNotice !== null) {
-        submissionNotice.submit();
-    }
 
 }
 
 //send the message to the background js
 //called after all the checks have been made that it's okay to do so
-async function sendSubmitMessage(): Promise<boolean> {
+async function sendSubmitMessage() {
     // check if all segments are full video
     const onlyFullVideo = sponsorTimesSubmitting.every((segment) => segment.actionType === ActionType.Full);
     // Block if submitting on a running livestream or premiere
     if (!onlyFullVideo && (getIsLivePremiere() || isVisible(document.querySelector(".ytp-live-badge")))) {
         alert(chrome.i18n.getMessage("liveOrPremiere"));
-        return false;
+        return;
-    }
-
-    if (!previewedSegment 
-            && !sponsorTimesSubmitting.every((segment) => 
-                [ActionType.Full, ActionType.Chapter, ActionType.Poi].includes(segment.actionType) 
-                    || segment.segment[1] >= getVideo()?.duration
-                    || segment.segment[0] === 0)) {
-        alert(`${chrome.i18n.getMessage("previewSegmentRequired")} ${keybindToString(Config.config.previewKeybind)}`);
-        return false;
     }
 
     // Add loading animation
-    playerButtons.submit.image.src = chrome.runtime.getURL("icons/PlayerUploadIconSponsorBlocker.svg");
+    playerButtons.submit.image.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker.svg");
     const stopAnimation = AnimationUtils.applyLoadingAnimation(playerButtons.submit.button, 1, () => updateEditButtonsOnPlayer());
 
     //check if a sponsor exceeds the duration of the video
@@ -2355,8 +2262,8 @@ async function sendSubmitMessage(): Promise<boolean> {
     }
 
     //update sponsorTimes
-    Config.local.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
+    Config.config.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
-    Config.forceLocalUpdate("unsubmittedSegments");
+    Config.forceSyncUpdate("unsubmittedSegments");
 
     // Check to see if any of the submissions are below the minimum duration set
     if (Config.config.minDuration > 0) {
@@ -2366,7 +2273,7 @@ async function sendSubmitMessage(): Promise<boolean> {
                 const confirmShort = chrome.i18n.getMessage("shortCheck") + "\n\n" +
                     getSegmentsMessage(sponsorTimesSubmitting);
 
-                if(!confirm(confirmShort)) return false;
+                if(!confirm(confirmShort)) return;
             }
         }
     }
@@ -2383,8 +2290,8 @@ async function sendSubmitMessage(): Promise<boolean> {
         stopAnimation();
 
         // Remove segments from storage since they've already been submitted
-        delete Config.local.unsubmittedSegments[getVideoID()];
+        delete Config.config.unsubmittedSegments[getVideoID()];
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
 
         const newSegments = sponsorTimesSubmitting;
         try {
@@ -2416,12 +2323,10 @@ async function sendSubmitMessage(): Promise<boolean> {
         if (fullVideoSegment) {
             categoryPill?.setSegment(fullVideoSegment);
         }
-
-        return true;
     } else {
         // Show that the upload failed
         playerButtons.submit.button.style.animation = "unset";
-        playerButtons.submit.image.src = chrome.runtime.getURL("icons/PlayerUploadFailedIconSponsorBlocker.svg");
+        playerButtons.submit.image.src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker.svg");
 
         if (response.status === 403 && response.responseText.startsWith("Submission rejected due to a tip from a moderator.")) {
             openWarningDialog(skipNoticeContentContainer);
@@ -2429,8 +2334,6 @@ async function sendSubmitMessage(): Promise<boolean> {
             alert(getErrorMessage(response.status, response.responseText));
         }
     }
-
-    return false;
 }
 
 //get the message that visually displays the video times
@@ -2456,12 +2359,16 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
 }
 
 function updateActiveSegment(currentTime: number): void {
-    previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, currentTime);
+    const activeSegments = previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, currentTime);
-
     chrome.runtime.sendMessage({
         message: "time",
         time: currentTime
     });
+
+    const chapterSegments = activeSegments?.filter((segment) => segment.actionType === ActionType.Chapter);
+    if (chapterSegments?.length > 0) {
+        sendTelemetryAndCount(chapterSegments, 0, true);
+    }
 }
 
 function nextChapter(): void {
@@ -2537,11 +2444,8 @@ function hotkeyListener(e: KeyboardEvent): void {
 
     const skipKey = Config.config.skipKeybind;
     const skipToHighlightKey = Config.config.skipToHighlightKeybind;
-    const closeSkipNoticeKey = Config.config.closeSkipNoticeKeybind;
     const startSponsorKey = Config.config.startSponsorKeybind;
-    const submitKey = Config.config.actuallySubmitKeybind;
+    const submitKey = Config.config.submitKeybind;
-    const previewKey = Config.config.previewKeybind;
-    const openSubmissionMenuKey = Config.config.submitKeybind;
     const nextChapterKey = Config.config.nextChapterKeybind;
     const previousChapterKey = Config.config.previousChapterKeybind;
 
@@ -2556,24 +2460,12 @@ function hotkeyListener(e: KeyboardEvent): void {
             skipButtonControlBar.toggleSkip.call(skipButtonControlBar);
         }
 
-        return;
-    } else if (keybindEquals(key, closeSkipNoticeKey)) {
-        for (let i = 0; i < skipNotices.length; i++) {
-            skipNotices.pop().close();
-        }
-
         return;
     } else if (keybindEquals(key, startSponsorKey)) {
         startOrEndTimingNewSegment();
         return;
     } else if (keybindEquals(key, submitKey)) {
-        submitSegments();
+        submitSponsorTimes();
-        return;
-    } else if (keybindEquals(key, openSubmissionMenuKey)) {
-        openSubmissionMenu();
-        return;
-    } else if (keybindEquals(key, previewKey)) {
-        previewRecentSegment();
         return;
     } else if (keybindEquals(key, nextChapterKey)) {
         if (sponsorTimes.length > 0) e.stopPropagation();
@@ -2592,7 +2484,7 @@ function hotkeyListener(e: KeyboardEvent): void {
     } else if (key.key == startSponsorKey?.key && startSponsorKey.code == null && !keybindEquals(Config.syncDefaults.startSponsorKeybind, startSponsorKey)) {
         startOrEndTimingNewSegment();
     } else if (key.key == submitKey?.key && submitKey.code == null && !keybindEquals(Config.syncDefaults.submitKeybind, submitKey)) {
-        openSubmissionMenu();
+        submitSponsorTimes();
     }
 }
 
@@ -2609,7 +2501,7 @@ function addCSS() {
 
                 fileref.rel = "stylesheet";
                 fileref.type = "text/css";
-                fileref.href = chrome.runtime.getURL(file);
+                fileref.href = chrome.extension.getURL(file);
 
                 head.appendChild(fileref);
             }
@@ -2693,8 +2585,8 @@ function checkForPreloadedSegment() {
     }
 
     if (pushed) {
-        Config.local.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
+        Config.config.unsubmittedSegments[getVideoID()] = sponsorTimesSubmitting;
-        Config.forceLocalUpdate("unsubmittedSegments");
+        Config.forceSyncUpdate("unsubmittedSegments");
     }
 }
 
@@ -2722,22 +2614,3 @@ function setCategoryColorCSSVariables() {
 
     styleContainer.innerText = css;
 }
-
-/**
- * If mini player starts playing, then videoID change might have to be called
- */
-function checkForMiniplayerPlaying() {
-    const miniPlayerUI = document.querySelector(".miniplayer") as HTMLElement;
-    if (!onVideoPage() && isVisible(miniPlayerUI)) {
-        const videoID = getLastNonInlineVideoID();
-        if (videoID) {
-            triggerVideoIDChange(videoID);
-
-            // treat as if video element has changed
-            const video = miniPlayerUI.querySelector("video") as HTMLVideoElement;
-            if (video && getVideo() !== video) {
-                triggerVideoElementChange(video);
-            }
-        }
-    }
-}

src/dearrowPromotion.ts

@@ -9,10 +9,8 @@ import { isVisible } from "./utils/pageUtils";
 import { asyncRequestToServer } from "./utils/requests";
 
 let tooltip: Tooltip = null;
-const showDeArrowPromotion = false;
 export async function tryShowingDeArrowPromotion() {
-    if (showDeArrowPromotion
+    if (Config.config.showDeArrowPromotion
-            && Config.config.showDeArrowPromotion
             && !isOnMobileYouTube()
             && !isOnInvidious()
             && document.URL.includes("watch")

src/globals.d.ts

@@ -1,4 +1,19 @@
 import { SBObject } from "./config";
 declare global {
     interface Window { SB: SBObject }
+    // Remove this once the API becomes stable and types are shipped in @types/chrome
+    namespace chrome {
+        namespace declarativeContent {
+            export interface RequestContentScriptOptions {
+                allFrames?: boolean;
+                css?: string[];
+                instanceType?: "declarativeContent.RequestContentScript";
+                js?: string[];
+                matchAboutBlanck?: boolean;
+            }
+            export class RequestContentScript {
+                constructor(options: RequestContentScriptOptions);
+            }
+        }
+    }
 }

src/js-components/previewBar.ts

@@ -1,5 +1,5 @@
 /*
-Based on code from
+Parts of this are inspired from code from VideoSegments, but rewritten and under the LGPLv3 license
 https://github.com/videosegments/videosegments/commits/f1e111bdfe231947800c6efdd51f62a4e7fef4d4/segmentsbar/segmentsbar.js
 */
 
@@ -11,9 +11,9 @@ import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceT
 import { partition } from "../utils/arrayUtils";
 import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
 import { normalizeChapterName } from "../utils/exporter";
+import { getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
 import { findValidElement } from "../../maze-utils/src/dom";
 import { addCleanupListener } from "../../maze-utils/src/cleanup";
-import { isVisible } from "../utils/pageUtils";
 
 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -125,11 +125,34 @@ class PreviewBar {
             mouseOnSeekBar = false;
         });
 
-        seekBar.addEventListener("mousemove", (e: MouseEvent) => {
+        const observer = new MutationObserver((mutations) => {
-            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer || !chrome.runtime?.id) return;
+            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer) return;
 
-            let noYoutubeChapters = !!tooltipTextWrapper.querySelector(".ytp-tooltip-text.ytp-tooltip-text-no-title");
+            // Only care about mutations to time tooltip
-            const timeInSeconds = this.decimalToTime((e.clientX - seekBar.getBoundingClientRect().x) / seekBar.clientWidth);
+            if (!mutations.some((mutation) => (mutation.target as HTMLElement).classList.contains("ytp-tooltip-text"))) {
+                return;
+            }
+
+            const tooltipTextElements = tooltipTextWrapper.querySelectorAll(".ytp-tooltip-text");
+            let timeInSeconds: number | null = null;
+            let noYoutubeChapters = false;
+
+            for (const tooltipTextElement of tooltipTextElements) {
+                if (tooltipTextElement.classList.contains('ytp-tooltip-text-no-title')) noYoutubeChapters = true;
+
+                const tooltipText = tooltipTextElement.textContent;
+                if (tooltipText === null || tooltipText.length === 0) continue;
+
+                timeInSeconds = getFormattedTimeToSeconds(tooltipText);
+
+                if (timeInSeconds !== null) break;
+            }
+
+            if (timeInSeconds === null) {
+                originalTooltip.style.removeProperty("display");
+
+                return;
+            }
 
             // Find the segment at that location, using the shortest if multiple found
             const [normalSegments, chapterSegments] =
@@ -175,6 +198,15 @@ class PreviewBar {
                 this.chapterTooltip.style.textAlign = titleTooltip.style.textAlign;
             }
         });
+
+        observer.observe(tooltipTextWrapper, {
+            childList: true,
+            subtree: true,
+        });
+
+        addCleanupListener(() => {
+            observer.disconnect();
+        });
     }
 
     private setTooltipTitle(segment: PreviewBarSegment, tooltip: HTMLElement): void {
@@ -192,12 +224,16 @@ class PreviewBar {
         }
     }
 
-    createElement(parent?: HTMLElement): void {
+    createElement(parent: HTMLElement): void {
-        if (parent) this.parent = parent;
+        this.parent = parent;
 
         if (this.onMobileYouTube) {
+            if (parent.classList.contains("progress-bar-background")) {
+                parent.style.backgroundColor = "rgba(255, 255, 255, 0.3)";
+                parent.style.opacity = "1";
+            }
+
             this.container.style.transform = "none";
-            this.container.style.height = "var(--yt-progress-bar-height)";
         } else if (!this.onInvidious) {
             this.container.classList.add("sbNotInvidious");
         }
@@ -226,12 +262,10 @@ class PreviewBar {
         this.segments = segments ?? [];
         this.videoDuration = videoDuration ?? 0;
 
-
         this.updatePageElements();
         // Sometimes video duration is inaccurate, pull from accessibility info
         const ariaDuration = parseInt(this.progressBar?.getAttribute('aria-valuemax')) ?? 0;
-        const multipleActiveVideos = [...document.querySelectorAll("video")].filter((v) => isVisible(v)).length > 1;
+        if (ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
-        if (!multipleActiveVideos && ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
             this.videoDuration = ariaDuration;
         }
 
@@ -239,7 +273,7 @@ class PreviewBar {
     }
 
     private updatePageElements(): void {
-        const allProgressBars = document.querySelectorAll(".ytp-progress-bar") as NodeListOf<HTMLElement>;
+        const allProgressBars = document.querySelectorAll('.ytp-progress-bar') as NodeListOf<HTMLElement>;
         this.progressBar = findValidElement(allProgressBars) ?? allProgressBars?.[0];
 
         if (this.progressBar) {
@@ -277,7 +311,6 @@ class PreviewBar {
             return (b[1] - b[0]) - (a[1] - a[0]);
         });
         for (const segment of sortedSegments) {
-            if (segment.actionType === ActionType.Chapter) continue;
             const bar = this.createBar(segment);
 
             this.container.appendChild(bar);
@@ -317,7 +350,7 @@ class PreviewBar {
         bar.style.left = this.timeToPercentage(startTime);
 
         if (duration > 0) {
-            bar.style.right = this.timeToRightPercentage(endTime);
+            bar.style.right = this.timeToPercentage(this.videoDuration - endTime);
         }
         if (this.chapterFilter(barSegment) && segment[1] < this.videoDuration) {
             bar.style.marginRight = `${this.chapterMargin}px`;
@@ -751,7 +784,6 @@ class PreviewBar {
 
     updateChapterText(segments: SponsorTime[], submittingSegments: SponsorTime[], currentTime: number): SponsorTime[] {
         if (!Config.config.showSegmentNameInChapterBar
-                || Config.config.disableSkipping
                 || ((!segments || segments.length <= 0) && submittingSegments?.length <= 0)) {
             const chaptersContainer = this.getChaptersContainer();
             if (chaptersContainer) {
@@ -891,22 +923,7 @@ class PreviewBar {
         return `${this.timeToDecimal(time) * 100}%`
     }
 
-    timeToRightPercentage(time: number): string {
-        return `${(1 - this.timeToDecimal(time)) * 100}%`
-    }
-
     timeToDecimal(time: number): number {
-        return this.decimalTimeConverter(time, true);
-    }
-
-    decimalToTime(decimal: number): number {
-        return this.decimalTimeConverter(decimal, false);
-    }
-
-    /**
-     * Decimal to time or time to decimal
-     */
-    decimalTimeConverter(value: number, isTime: boolean): number {
         if (this.originalChapterBarBlocks?.length > 1 && this.existingChapters.length === this.originalChapterBarBlocks?.length) {
             // Parent element to still work when display: none
             const totalPixels = this.originalChapterBar.parentElement.clientWidth;
@@ -916,9 +933,8 @@ class PreviewBar {
                 const chapterElement = this.originalChapterBarBlocks[i];
                 const widthPixels = parseFloat(chapterElement.style.width.replace("px", ""));
 
-                const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
+                if (time >= this.existingChapters[i].segment[1]) {
-                if ((isTime && value >= this.existingChapters[i].segment[1])
+                    const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
-                        || (!isTime && value >= (pixelOffset + widthPixels + marginPixels) / totalPixels)) {
                     pixelOffset += widthPixels + marginPixels;
                     lastCheckedChapter = i;
                 } else {
@@ -932,22 +948,13 @@ class PreviewBar {
                 const latestWidth = parseFloat(this.originalChapterBarBlocks[lastCheckedChapter + 1].style.width.replace("px", ""));
                 const latestChapterDuration = latestChapter.segment[1] - latestChapter.segment[0];
 
-                if (isTime) {
+                const percentageInCurrentChapter = (time - latestChapter.segment[0]) / latestChapterDuration;
-                    const percentageInCurrentChapter = (value - latestChapter.segment[0]) / latestChapterDuration;
+                const sizeOfCurrentChapter = latestWidth / totalPixels;
-                    const sizeOfCurrentChapter = latestWidth / totalPixels;
+                return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
-                    return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
-                } else {
-                    const percentageInCurrentChapter = (value * totalPixels - pixelOffset) / latestWidth;
-                    return Math.max(0, latestChapter.segment[0] + (percentageInCurrentChapter * latestChapterDuration));
-                }
             }
         }
 
-        if (isTime) {
+        return Math.min(1, time / this.videoDuration);
-            return Math.min(1, value / this.videoDuration);
-        } else {
-            return Math.max(0, value * this.videoDuration);
-        }
     }
 
     /*

src/js-components/skipButtonControlBar.ts

@@ -1,9 +1,8 @@
 import Config from "../config";
 import { SegmentUUID, SponsorTime } from "../types";
 import { getSkippingText } from "../utils/categoryUtils";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { keybindToString } from "../../maze-utils/src/config";
-import { isMobileControlsOpen } from "../utils/mobileUtils";
 
 export interface SkipButtonControlBarProps {
     skip: (segment: SponsorTime) => void;
@@ -184,8 +183,10 @@ export class SkipButtonControlBar {
     }
 
     updateMobileControls(): void {
-        if (this.enabled) {
+        const overlay = document.getElementById("player-control-overlay");
-            if (isMobileControlsOpen()) {
+
+        if (overlay && this.enabled) {
+            if (overlay?.classList?.contains("fadein")) {
                 this.showButton();
             } else {
                 this.hideButton();

src/messageTypes.ts

@@ -103,8 +103,7 @@ export type MessageResponse =
     | IsChannelWhitelistedResponse
     | Record<string, never> // empty object response {}
     | VoteResponse
-    | ImportSegmentsResponse
+    | ImportSegmentsResponse;
-    | RefreshSegmentsResponse;
 
 export interface VoteResponse {
     successType: number;
@@ -116,10 +115,6 @@ interface ImportSegmentsResponse {
     importedSegments: SponsorTime[];
 }
 
-export interface RefreshSegmentsResponse {
-    hasVideo: boolean;
-}
-
 export interface TimeUpdateMessage {
     message: "time";
     time: number;

src/options.ts

@@ -62,10 +62,6 @@ async function init() {
         Config.configSyncListeners.push(optionsConfigUpdateListener);
     }
 
-    if (!Config.configLocalListeners.includes(optionsLocalConfigUpdateListener)) {
-        Config.configLocalListeners.push(optionsLocalConfigUpdateListener);
-    }
-
     await utils.wait(() => Config.config !== null);
 
     if (!Config.config.darkMode) {
@@ -257,10 +253,10 @@ async function init() {
 
                 if (option == "*")  {
                     const downloadButton = optionsElements[i].querySelector(".download-button");
-                    downloadButton.addEventListener("click", () => downloadConfig(optionsElements[i]));
+                    downloadButton.addEventListener("click", downloadConfig);
 
                     const uploadButton = optionsElements[i].querySelector(".upload-button");
-                    uploadButton.addEventListener("change", (e) => uploadConfig(e, optionsElements[i] as HTMLElement));
+                    uploadButton.addEventListener("change", (e) => uploadConfig(e));
                 }
 
                 const privateTextChangeOption = optionsElements[i].getAttribute("data-sync");
@@ -286,7 +282,7 @@ async function init() {
                             break;
                         case "resetToDefault":
                             Config.resetToDefault();
-                            setTimeout(() => window.location.reload(), 200);
+                            window.location.reload();
                             break;
                     }
                 });
@@ -410,11 +406,7 @@ function optionsConfigUpdateListener(changes: StorageChangesObject) {
         for (const chooser of categoryChoosers) {
             chooser.update();
         }
-    }
+    } else if (changes.unsubmittedSegments) {
-}
-
-function optionsLocalConfigUpdateListener(changes: StorageChangesObject) {
-    if (changes.unsubmittedSegments) {
         for (const chooser of unsubmittedVideos) {
             chooser.update();
         }
@@ -548,7 +540,6 @@ function activatePrivateTextChange(element: HTMLElement) {
 
     const textBox = <HTMLInputElement> element.querySelector(".option-text-box");
     const option = element.getAttribute("data-sync");
-    const optionType = element.getAttribute("data-sync-type");
 
     // See if anything extra must be done
     switch (option) {
@@ -561,11 +552,7 @@ function activatePrivateTextChange(element: HTMLElement) {
     // See if anything extra must be done
     switch (option) {
         case "*": {
-            if (optionType === "local") {
+            result = JSON.stringify(Config.cachedSyncConfig);
-                result = JSON.stringify(Config.cachedLocalStorage);
-            } else {
-                result = JSON.stringify(Config.cachedSyncConfig);
-            }
             break;
         }
     }
@@ -608,7 +595,6 @@ function activatePrivateTextChange(element: HTMLElement) {
  */
 async function setTextOption(option: string, element: HTMLElement, value: string, callbackOnError?: () => void) {
     const confirmMessage = element.getAttribute("data-confirm-message");
-    const optionType = element.getAttribute("data-sync-type");
 
     if (confirmMessage === null || confirm(chrome.i18n.getMessage(confirmMessage))) {
 
@@ -618,21 +604,18 @@ async function setTextOption(option: string, element: HTMLElement, value: string
                 try {
                     const newConfig = JSON.parse(value);
                     for (const key in newConfig) {
-                        if (optionType === "local") {
+                        Config.config[key] = newConfig[key];
-                            Config.local[key] = newConfig[key];
-                        } else {
-                            Config.config[key] = newConfig[key];
-                        }
                     }
 
-                    if (optionType !== "local" && newConfig.supportInvidious) {
+                    if (newConfig.supportInvidious) {
                         const checkbox = <HTMLInputElement> document.querySelector("#support-invidious > div > label > input");
 
                         checkbox.checked = true;
                         await invidiousOnClick(checkbox, "supportInvidious");
                     }
 
-                    setTimeout(() => window.location.reload(), 200);
+                    window.location.reload();
+
                 } catch (e) {
                     alert(chrome.i18n.getMessage("incorrectlyFormattedOptions"));
                 }
@@ -647,27 +630,25 @@ async function setTextOption(option: string, element: HTMLElement, value: string
     }
 }
 
-function downloadConfig(element: Element) {
+function downloadConfig() {
-    const optionType = element.getAttribute("data-sync-type");
-
     const file = document.createElement("a");
-    const jsonData = JSON.parse(JSON.stringify(optionType === "local" ? Config.cachedLocalStorage : Config.cachedSyncConfig));
+    const jsonData = JSON.parse(JSON.stringify(Config.cachedSyncConfig));
     const dateTimeString = new Date().toJSON().replace("T", "_").replace(/:/g, ".").replace(/.\d+Z/g, "")
     file.setAttribute("href", `data:text/json;charset=utf-8,${encodeURIComponent(JSON.stringify(jsonData))}`);
-    file.setAttribute("download", `SponsorBlock${optionType === "local" ? "OtherData" : "Config"}_${dateTimeString}.json`);
+    file.setAttribute("download", `SponsorBlockConfig_${dateTimeString}.json`);
     document.body.append(file);
     file.click();
     file.remove();
 }
 
-function uploadConfig(e: Event, element: HTMLElement) {
+function uploadConfig(e) {
-    const target = e.target as HTMLInputElement;
+    if (e.target.files.length == 1) {
-    if (target.files.length == 1) {
+        const file = e.target.files[0];
-        const file = target.files[0];
         const reader = new FileReader();
+        const element = document.querySelector("[data-sync='*']") as HTMLElement;
         reader.onload = function(ev) {
             setTextOption("*", element, ev.target.result as string, () => {
-                target.value = null;
+                e.target.value = null;
             });
         };
         reader.readAsText(file);

src/popup.ts

@@ -15,12 +15,11 @@ import {
     Message,
     MessageResponse,
     PopupMessage,
-    RefreshSegmentsResponse,
     SponsorStartResponse,
     VoteResponse,
 } from "./messageTypes";
 import { showDonationLink } from "./utils/configUtils";
-import { AnimationUtils } from "../maze-utils/src/animationUtils";
+import { AnimationUtils } from "./utils/animationUtils";
 import { shortCategoryName } from "./utils/categoryUtils";
 import { localizeHtmlPage } from "../maze-utils/src/setup";
 import { exportTimes } from "./utils/exporter";
@@ -95,8 +94,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     type PageElements = { [key: string]: HTMLElement } & InputPageElements
 
     let stopLoadingAnimation = null;
-    // For loading video info from the page
-    let loadRetryCount = 0;
 
     //the start and end time pairs (2d)
     let sponsorTimes: SponsorTime[] = [];
@@ -412,18 +409,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 currentVideoID = result.videoID;
 
                 loadTabData(tabs, updating);
-            } else {
+            } else if (result === undefined && chrome.runtime.lastError) {
-                // Handle error if it exists
+                //this isn't a YouTube video then, or at least the content script is not loaded
-                chrome.runtime.lastError;
-
-                // This isn't a YouTube video then, or at least the content script is not loaded
                 displayNoVideo();
-
-                // Try again in some time if a failure
-                loadRetryCount++;
-                if (loadRetryCount < 6) {
-                    setTimeout(() => getSegmentsFromContentScript(false), 100 * loadRetryCount);
-                }
             }
         });
     }
@@ -436,7 +424,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         }
 
         await utils.wait(() => Config.config !== null, 5000, 10);
-        sponsorTimes = Config.local.unsubmittedSegments[currentVideoID] ?? [];
+        sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] ?? [];
         updateSegmentEditingUI();
 
         messageHandler.sendMessage(
@@ -460,35 +448,37 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
             stopLoadingAnimation = null;
         }
 
-        if (chrome.runtime.lastError || request == undefined || request.found == undefined) {
+        if (chrome.runtime.lastError) {
             //This page doesn't have the injected content script, or at least not yet
-            // Or if the request is empty, meaning the current page is not YouTube or a video page
             displayNoVideo();
             return;
         }
 
-        //remove loading text
+        //if request is undefined, then the page currently being browsed is not YouTube
-        PageElements.mainControls.style.display = "block";
+        if (request != undefined) {
-        if (request.onMobileYouTube) PageElements.mainControls.classList.add("hidden");
+            //remove loading text
-        PageElements.whitelistButton.classList.remove("hidden");
+            PageElements.mainControls.style.display = "block";
-        PageElements.loadingIndicator.style.display = "none";
+            if (request.onMobileYouTube) PageElements.mainControls.classList.add("hidden");
+            PageElements.whitelistButton.classList.remove("hidden");
+            PageElements.loadingIndicator.style.display = "none";
 
-        downloadedTimes = request.sponsorTimes ?? [];
+            downloadedTimes = request.sponsorTimes ?? [];
-        displayDownloadedSponsorTimes(downloadedTimes, request.time);
+            displayDownloadedSponsorTimes(downloadedTimes, request.time);
-        if (request.found) {
+            if (request.found) {
-            PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
+                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
-            PageElements.issueReporterImportExport.classList.remove("hidden");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
-        } else if (request.status == 404 || request.status == 200) {
+            } else if (request.status == 404 || request.status == 200) {
-            PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
+                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
-            PageElements.issueReporterImportExport.classList.remove("hidden");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
-        } else {
-            if (request.status) {
-                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;
             } else {
-                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
+                if (request.status) {
-            }
+                    PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;
+                } else {
+                    PageElements.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
+                }
 
-            PageElements.issueReporterImportExport.classList.remove("hidden");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
+            }
         }
 
         //see if whitelist button should be swapped
@@ -526,7 +516,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     function startSponsorCallback(response: SponsorStartResponse) {
         // Only update the segments after a segment was created
         if (!response.creatingSegment) {
-            sponsorTimes = Config.local.unsubmittedSegments[currentVideoID] || [];
+            sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] || [];
         }
 
         // Update the UI
@@ -561,7 +551,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                     return true;
                 }
             })
-            .sort((a, b) => b.segment[1] - a.segment[1])
+            .sort((a, b) => a.segment[1] - b.segment[1])
             .sort((a, b) => a.segment[0] - b.segment[0]);
 
         //add them as buttons to the issue reporting container
@@ -768,7 +758,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     }
 
     function isCreatingSegment(): boolean {
-        const segments = Config.local.unsubmittedSegments[currentVideoID];
+        const segments = Config.config.unsubmittedSegments[currentVideoID];
         if (!segments) return false;
         const lastSegment = segments[segments.length - 1];
         return lastSegment && lastSegment?.segment?.length !== 2;
@@ -979,17 +969,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         stopLoadingAnimation = AnimationUtils.applyLoadingAnimation(PageElements.refreshSegmentsButton, 0.3);
     }
 
-    async function refreshSegments() {
+    function refreshSegments() {
         startLoadingAnimation();
-        const response = await sendTabMessageAsync({ message: 'refreshSegments' }) as RefreshSegmentsResponse;
+        sendTabMessage({ message: 'refreshSegments' });
-
-        if (response == null || !response.hasVideo) {
-            if (stopLoadingAnimation != null) {
-                stopLoadingAnimation();
-                stopLoadingAnimation = null;
-            }
-            displayNoVideo();
-        }
     }
 
     function skipSegment(actionType: ActionType, UUID: SegmentUUID, element?: HTMLElement): void {
@@ -1101,7 +1083,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         for (const key in changes) {
             switch(key) {
                 case "unsubmittedSegments":
-                    sponsorTimes = Config.local.unsubmittedSegments[currentVideoID] ?? [];
+                    sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] ?? [];
                     updateSegmentEditingUI();
                     break;
             }
@@ -1151,7 +1133,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 break;
             case "videoChanged":
                 currentVideoID = msg.videoID
-                sponsorTimes = Config.local.unsubmittedSegments[currentVideoID] ?? [];
+                sponsorTimes = Config.config.unsubmittedSegments[currentVideoID] ?? [];
                 updateSegmentEditingUI();
 
                 if (msg.whitelisted) {

src/render/CategoryPill.tsx

@@ -43,15 +43,9 @@ export class CategoryPill {
     }
 
     private async attachToPageInternal(): Promise<void> {
-        let referenceNode = 
+        const referenceNode = 
             await waitFor(() => getYouTubeTitleNode());
 
-        // Experimental YouTube layout with description on right
-        const isOnDescriptionOnRightLayout = document.querySelector("#title #description");
-        if (isOnDescriptionOnRightLayout) {
-            referenceNode = referenceNode.parentElement;
-        }
-
         if (referenceNode && !referenceNode.contains(this.container)) {
             if (!this.container) {
                 this.container = document.createElement('span');
@@ -97,9 +91,7 @@ export class CategoryPill {
             parent.appendChild(this.container);
 
             referenceNode.prepend(parent);
-            if (!isOnDescriptionOnRightLayout) {
+            referenceNode.style.display = "flex";
-                referenceNode.style.display = "flex";
-            }
         }
     }
 

src/render/RectangleTooltip.tsx

@@ -59,7 +59,7 @@ export class RectangleTooltip {
                     className="sponsorBlockRectangleTooltip" >
                     <div>
                         <img className="sponsorSkipLogo sponsorSkipObject"
-                            src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
+                            src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
                         </img>
                         <span className="sponsorSkipObject">
                             {this.text + (props.link ? ". " : "")}

src/render/SubmissionNotice.tsx

@@ -11,7 +11,7 @@ class SubmissionNotice {
     // Contains functions and variables from the content script needed by the skip notice
     contentContainer: () => unknown;
 
-    callback: () => Promise<boolean>;
+    callback: () => unknown;
 
     noticeRef: React.MutableRefObject<SubmissionNoticeComponent>;
 
@@ -19,7 +19,7 @@ class SubmissionNotice {
 
     root: Root;
 
-    constructor(contentContainer: ContentContainer, callback: () => Promise<boolean>) {
+    constructor(contentContainer: ContentContainer, callback: () => unknown) {
         this.noticeRef = React.createRef();
 
         this.contentContainer = contentContainer;
@@ -52,14 +52,6 @@ class SubmissionNotice {
 
         this.noticeElement.remove();
     }
-
-    submit(): void {
-        this.noticeRef.current?.submit?.();
-    }
-
-    scrollToBottom(): void {
-        this.noticeRef.current?.scrollToBottom?.();
-    }
 }
 
 export default SubmissionNotice;

src/utils.ts

@@ -2,7 +2,7 @@ import Config, { VideoDownvotes } from "./config";
 import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType, CategorySkipOption } from "./types";
 
 import { getHash, HashedValue } from "../maze-utils/src/hash";
-import { waitFor } from "../maze-utils/src";
+import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { findValidElementFromSelector } from "../maze-utils/src/dom";
 import { isSafari } from "../maze-utils/src/config";
 
@@ -46,7 +46,10 @@ export default class Utils {
      */
     setupExtraSitePermissions(callback: (granted: boolean) => void): void {
         const permissions = [];
-        if (isSafari()) {
+        if (!isFirefoxOrSafari()) {
+            permissions.push("declarativeContent");
+        }
+        if (!isFirefoxOrSafari() || isSafari()) {
             permissions.push("webNavigation");
         }
 
@@ -64,17 +67,6 @@ export default class Utils {
         });
     }
 
-    getExtraSiteRegistration(): Registration {
-        return {
-            message: "registerContentScript",
-            id: "invidious",
-            allFrames: true,
-            js: this.js,
-            css: this.css,
-            matches: this.getPermissionRegex()
-        };
-    }
-
     /**
      * Registers the content scripts for the extra sites.
      * Will use a different method depending on the browser.
@@ -83,7 +75,14 @@ export default class Utils {
      * For now, it is just SB.config.invidiousInstances.
      */
     setupExtraSiteContentScripts(): void {
-        const registration = this.getExtraSiteRegistration();
+        const registration: Registration = {
+            message: "registerContentScript",
+            id: "invidious",
+            allFrames: true,
+            js: this.js,
+            css: this.css,
+            matches: this.getPermissionRegex()
+        };
 
         if (this.backgroundScriptContainer) {
             this.backgroundScriptContainer.registerFirefoxContentScript(registration);
@@ -107,6 +106,11 @@ export default class Utils {
             });
         }
 
+        if (!isFirefoxOrSafari() && chrome.declarativeContent) {
+            // Only if we have permission
+            chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
+        }
+
         chrome.permissions.remove({
             origins: this.getPermissionRegex()
         });
@@ -131,10 +135,8 @@ export default class Utils {
 
     containsInvidiousPermission(): Promise<boolean> {
         return new Promise((resolve) => {
-            const permissions = [];
+            let permissions = ["declarativeContent"];
-            if (isSafari()) {
+            if (isFirefoxOrSafari()) permissions = [];
-                permissions.push("webNavigation");
-            }
 
             chrome.permissions.contains({
                 origins: this.getPermissionRegex(),
@@ -279,8 +281,7 @@ export default class Utils {
     }
 
     async addHiddenSegment(videoID: VideoID, segmentUUID: string, hidden: SponsorHideType) {
-        if ((chrome.extension.inIncognitoContext && !Config.config.trackDownvotesInPrivate)
+        if (chrome.extension.inIncognitoContext || !Config.config.trackDownvotes) return;
-                || !Config.config.trackDownvotes) return;
 
         const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
         const UUIDHash = await getHash(segmentUUID, 1);

src/utils/animationUtils.ts

@@ -0,0 +1,78 @@
+ /**
+ * Starts a spinning animation and returns a function to be called when it should be stopped
+ * The callback will be called when the animation is finished 
+ * It waits until a full rotation is complete
+ */
+function applyLoadingAnimation(element: HTMLElement, time: number, callback?: () => void): () => Promise<void> {
+    element.style.animation = `rotate ${time}s 0s infinite`;
+
+    return async () => new Promise((resolve) => {
+        // Make the animation finite
+        element.style.animation = `rotate ${time}s`;
+
+        // When the animation is over, hide the button
+        const animationEndListener = () => {
+            if (callback) callback();
+
+            element.style.animation = "none";
+
+            element.removeEventListener("animationend", animationEndListener);
+
+            resolve();
+        };
+
+        element.addEventListener("animationend", animationEndListener);
+    });
+}
+
+function setupCustomHideAnimation(element: Element, container: Element, enabled = true, rightSlide = true): { hide: () => void; show: () => void } {
+    if (enabled) element.classList.add("autoHiding");
+    element.classList.add("sbhidden");
+    element.classList.add("animationDone");
+    if (!rightSlide) element.classList.add("autoHideLeft");
+
+    let mouseEntered = false;
+
+    return {
+        hide: () => {
+            mouseEntered = false;
+            if (element.classList.contains("autoHiding")) {
+                element.classList.add("sbhidden");
+            }
+        },
+        show: () => {
+            mouseEntered = true;
+            element.classList.remove("animationDone");
+
+            // Wait for next event loop
+            setTimeout(() => {
+                if (mouseEntered) element.classList.remove("sbhidden")
+            }, 10);
+        }
+    };
+}
+
+function setupAutoHideAnimation(element: Element, container: Element, enabled = true, rightSlide = true): void {
+    const { hide, show } = this.setupCustomHideAnimation(element, container, enabled, rightSlide);
+
+    container.addEventListener("mouseleave", () => hide());
+    container.addEventListener("mouseenter", () => show());
+}
+
+function enableAutoHideAnimation(element: Element): void {
+    element.classList.add("autoHiding");
+    element.classList.add("sbhidden");
+}
+
+function disableAutoHideAnimation(element: Element): void {
+    element.classList.remove("autoHiding");
+    element.classList.remove("sbhidden");
+}
+
+export const AnimationUtils = {
+    applyLoadingAnimation,
+    setupAutoHideAnimation,
+    setupCustomHideAnimation,
+    enableAutoHideAnimation,
+    disableAutoHideAnimation
+};

src/utils/constants.ts

@@ -158,5 +158,3 @@ export function getGuidelineInfo(category: Category): TextBox[] {
             }];
     }
 }
-
-export const defaultPreviewTime = 2;

src/utils/exporter.ts

@@ -53,23 +53,24 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
                 titleRight = removeIf(split2[split2.length - 1], specialCharMatchers)
 
                 const title = titleLeft?.length > titleRight?.length ? titleLeft : titleRight;
-                const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
+                if (title) {
+                    const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
 
-                const category = title ? (determinedCategory ?? ("chapter" as Category)) : "chooseACategory" as Category;
+                    const segment: SponsorTime = {
-                const segment: SponsorTime = {
+                        segment: [startTime, getFormattedTimeToSeconds(match[1])],
-                    segment: [startTime, getFormattedTimeToSeconds(match[1])],
+                        category: determinedCategory ?? ("chapter" as Category),
-                    category,
+                        actionType: determinedCategory ? ActionType.Skip : ActionType.Chapter,
-                    actionType: category === "chapter" ? ActionType.Chapter : ActionType.Skip,
+                        description: title,
-                    description: category === "chapter" ? title : null,
+                        source: SponsorSourceType.Local,
-                    source: SponsorSourceType.Local,
+                        UUID: generateUserID() as SegmentUUID
-                    UUID: generateUserID() as SegmentUUID
+                    };
-                };
 
-                if (result.length > 0 && result[result.length - 1].segment[1] === null) {
+                    if (result.length > 0 && result[result.length - 1].segment[1] === null) {
-                    result[result.length - 1].segment[1] = segment.segment[0];
+                        result[result.length - 1].segment[1] = segment.segment[0];
+                    }
+
+                    result.push(segment);
                 }
-
-                result.push(segment);
             }
         }
     }

src/utils/logger.ts

@@ -1,22 +1,12 @@
-if (typeof (window) !== "undefined") {
+window["SBLogs"] = {
-    window["SBLogs"] = {
+    debug: [],
-        debug: [],
+    warn: []
-        warn: []
+};
-    };
-}
 
 export function logDebug(message: string) {
-    if (typeof (window) !== "undefined") {
+    window["SBLogs"].debug.push(`[${new Date().toISOString()}] ${message}`);
-        window["SBLogs"].debug.push(`[${new Date().toISOString()}] ${message}`);
-    } else {
-        console.log(`[${new Date().toISOString()}] ${message}`)
-    }
 }
 
 export function logWarn(message: string) {
-    if (typeof (window) !== "undefined") {
+    window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
-        window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
-    } else {
-        console.warn(`[${new Date().toISOString()}] ${message}`)
-    }
 }

src/utils/mobileUtils.ts

@@ -1,9 +0,0 @@
-export function isMobileControlsOpen(): boolean {
-    const overlay = document.getElementById("player-control-overlay");
-
-    if (overlay) {
-        return !!overlay?.classList?.contains("fadein");
-    }
-
-    return false;
-}

webpack/webpack.common.js

@@ -160,7 +160,7 @@ module.exports = env => {
                             if (path.match(/(\/|\\)_locales(\/|\\).+/)) {
                                 const parsed = JSON.parse(content.toString());
                                 if (env.browser.toLowerCase() === "safari") {
-                                    parsed.fullName.message = parsed.fullName.message.match(/^.+(?= [-–])/)?.[0] || parsed.fullName.message;
+                                    parsed.fullName.message = parsed.fullName.message.match(/^.+(?= -)/)?.[0] || parsed.fullName.message;
                                     if (parsed.fullName.message.length > 50) {
                                         parsed.fullName.message = parsed.fullName.message.slice(0, 47) + "...";
                                     }

webpack/webpack.manifest.js

@@ -11,7 +11,6 @@ const chromeManifestExtra = require("../manifest/chrome-manifest-extra.json");
 const safariManifestExtra = require("../manifest/safari-manifest-extra.json");
 const betaManifestExtra = require("../manifest/beta-manifest-extra.json");
 const firefoxBetaManifestExtra = require("../manifest/firefox-beta-manifest-extra.json");
-const manifestV2ManifestExtra = require("../manifest/manifest-v2-extra.json");
 
 // schema for options object
 const schema = {
@@ -42,14 +41,12 @@ class BuildManifest {
 
         // Add missing manifest elements
         if (this.options.browser.toLowerCase() === "firefox") {
-            mergeObjects(manifest, manifestV2ManifestExtra);
             mergeObjects(manifest, firefoxManifestExtra);
         } else if (this.options.browser.toLowerCase() === "chrome" 
                 || this.options.browser.toLowerCase() === "chromium"
                 || this.options.browser.toLowerCase() === "edge") {
             mergeObjects(manifest, chromeManifestExtra);
         }  else if (this.options.browser.toLowerCase() === "safari") {
-            mergeObjects(manifest, manifestV2ManifestExtra);
             mergeObjects(manifest, safariManifestExtra);
         }