Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters

src/utils/configUtils.ts

@@ -1,5 +1,48 @@
 import Config from "../config";
+import { Keybind } from "../types";
 
 export function showDonationLink(): boolean {
     return navigator.vendor !== "Apple Computer, Inc." && Config.config.showDonationLink;
+}
+
+export function isSafari(): boolean {
+    return navigator.vendor === "Apple Computer, Inc.";
+}
+
+export function keybindEquals(first: Keybind, second: Keybind): boolean {
+    if (first == null || second == null ||
+            Boolean(first.alt) != Boolean(second.alt) || Boolean(first.ctrl) != Boolean(second.ctrl) || Boolean(first.shift) != Boolean(second.shift) ||
+            first.key == null && first.code == null || second.key == null && second.code == null)
+        return false;
+    if (first.code != null && second.code != null)
+        return first.code === second.code;
+    if (first.key != null && second.key != null)
+        return first.key.toUpperCase() === second.key.toUpperCase();
+    return false;
+}
+
+export function formatKey(key: string): string {
+    if (key == null)
+        return "";
+    else if (key == " ")
+        return "Space";
+    else if (key.length == 1)
+        return key.toUpperCase();
+    else
+        return key;
+}
+
+export function keybindToString(keybind: Keybind): string {
+    if (keybind == null || keybind.key == null)
+        return "";
+
+    let ret = "";
+    if (keybind.ctrl)
+        ret += "Ctrl+";
+    if (keybind.alt)
+        ret += "Alt+";
+    if (keybind.shift)
+        ret += "Shift+";
+
+    return ret += formatKey(keybind.key);
 }

src/utils/genericUtils.ts

@@ -44,7 +44,30 @@ function getErrorMessage(statusCode: number, responseText: string): string {
     return errorMessage + postFix;
 }
 
+/* Gets percieved luminance of a color */
+function getLuminance(color: string): number {
+    const {r, g, b} = hexToRgb(color);
+    return Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b));
+}
+
+/* From https://stackoverflow.com/a/5624139 */
+function hexToRgb(hex: string): {r: number, g: number, b: number} {
+    // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+    const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+    hex = hex.replace(shorthandRegex, function(m, r, g, b) {
+      return r + r + g + g + b + b;
+    });
+  
+    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result ? {
+      r: parseInt(result[1], 16),
+      g: parseInt(result[2], 16),
+      b: parseInt(result[3], 16)
+    } : null;
+  }
+
 export const GenericUtils = {
     wait,
-    getErrorMessage
+    getErrorMessage,
+    getLuminance
 }

src/utils/pageUtils.ts

@@ -43,7 +43,7 @@ function findValidElementFromGenerator<T>(objects: T[] | NodeListOf<HTMLElement>
 }
 
 export function getHashParams(): Record<string, unknown> {
-    const windowHash = window.location.hash.substr(1);
+    const windowHash = window.location.hash.slice(1);
     if (windowHash) {
         const params: Record<string, unknown> = windowHash.split('&').reduce((acc, param) => {
             const [key, value] = param.split('=');