refactor: remove dead code, add more types

.eslintrc.js

@@ -21,8 +21,8 @@ module.exports = {
     rules: {
         // TODO: Remove warn rules when not needed anymore
         "@typescript-eslint/no-this-alias": "warn",
-        "no-self-assign": "warn",
+        "no-self-assign": "off",
-        "@typescript-eslint/no-empty-interface": "warn",
+        "@typescript-eslint/no-empty-interface": "off",
         "@typescript-eslint/ban-types": "warn",
     },
     settings: {

src/background.ts

@@ -2,8 +2,10 @@ import * as CompileConfig from "../config.json";
 
 import Config from "./config";
 import { Registration } from "./types";
+
 // Make the config public for debugging purposes
-(<any> window).SB = Config;
+
+window.SB = Config;
 
 import Utils from "./utils";
 const utils = new Utils({
@@ -70,7 +72,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
 });
 
 //add help page on install
-chrome.runtime.onInstalled.addListener(function (object) {
+chrome.runtime.onInstalled.addListener(function () {
     // This let's the config sync to run fully before checking.
     // This is required on Firefox
     setTimeout(function() {

src/components/CategoryChooserComponent.tsx

@@ -1,6 +1,5 @@
 import * as React from "react";
 
-import Config from "../config"
 import * as CompileConfig from "../../config.json";
 import CategorySkipOptionsComponent from "./CategorySkipOptionsComponent";
 

src/components/CategorySkipOptionsComponent.tsx

@@ -2,9 +2,6 @@ import * as React from "react";
 
 import Config from "../config"
 import { CategorySkipOption } from "../types";
-import Utils from "../utils";
-
-const utils = new Utils();
 
 export interface CategorySkipOptionsProps { 
     category: string;

src/components/NoticeComponent.tsx

@@ -28,7 +28,7 @@ export interface NoticeState {
 
 class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     countdownInterval: NodeJS.Timeout;
-    idSuffix: any;
+    idSuffix: string;
 
     amountOfPreviousNotices: number;
 

src/components/NoticeTextSectionComponent.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 export interface NoticeTextSelectionProps {
     text: string,
     idSuffix: string,
-    onClick?: (event: React.MouseEvent) => any
+    onClick?: (event: React.MouseEvent) => unknown
 }
 
 export interface NoticeTextSelectionState {

src/components/SkipNoticeComponent.tsx

@@ -2,10 +2,6 @@ import * as React from "react";
 import * as CompileConfig from "../../config.json";
 import Config from "../config"
 import { ContentContainer, SponsorHideType, SponsorTime } from "../types";
-
-import Utils from "../utils";
-const utils = new Utils();
-
 import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 
@@ -42,7 +38,7 @@ export interface SkipNoticeState {
 
     downvoting: boolean;
     choosingCategory: boolean;
-    thanksForVotingText: boolean; //null until the voting buttons should be hidden
+    thanksForVotingText: string; //null until the voting buttons should be hidden
 
     actionState: SkipNoticeAction;
 }
@@ -447,7 +443,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         });
     }
 
-    getUnskippedModeInfo(index: number, buttonText: string) {
+    getUnskippedModeInfo(index: number, buttonText: string): SkipNoticeState {
         const self = this;
         const maxCountdownTime = function() {
             const sponsorTime = self.segments[index];
@@ -458,14 +454,11 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
 
         return {
             unskipText: buttonText,
-
             unskipCallback: (index) => this.reskip(index),
-
+            // change max duration to however much of the sponsor is left
-            //change max duration to however much of the sponsor is left
             maxCountdownTime: maxCountdownTime,
-
             countdownTime: maxCountdownTime()
-        }
+        } as SkipNoticeState;
     }
 
     reskip(index: number): void {
@@ -508,7 +501,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         }
     }
 
-    setNoticeInfoMessageWithOnClick(onClick: (event: React.MouseEvent) => any, ...messages: string[]): void {
+    setNoticeInfoMessageWithOnClick(onClick: (event: React.MouseEvent) => unknown, ...messages: string[]): void {
         this.setState({
             messages,
             messageOnClick: (event) => onClick(event)
@@ -521,7 +514,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         });
     }
     
-    addVoteButtonInfo(message): void {
+    addVoteButtonInfo(message: string): void {
         this.setState({
             thanksForVotingText: message
         });

src/config.ts

@@ -58,7 +58,7 @@ interface SBConfig {
     }
 }
 
-interface SBObject {
+export interface SBObject {
     configListeners: Array<Function>;
     defaults: SBConfig;
     localConfig: SBConfig;

src/globals.d.ts

@@ -0,0 +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/utils.ts

@@ -119,8 +119,7 @@ class Utils {
                 const rule = {
                     id: "invidious",
                     conditions,
-                    // This API is experimental and not visible by the TypeScript compiler
+                    actions: [new chrome.declarativeContent.RequestContentScript({
-                    actions: [new (<any> chrome.declarativeContent).RequestContentScript({
                         allFrames: true,
                         js: self.js,
                         css: self.css