LICENSE

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Lenaisten.de
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package.json

@@ -4,16 +4,12 @@
   "author": "Jörn-Michael Miehe <joern-michael.miehe@lenaisten.de>",
   "license": "MIT",
   "scripts": {
-    "build": "webpack --mode=development",
-    "build-release": "webpack --mode=production",
+    "build": "webpack --config webpack.config.js",
     "lint-ext": "web-ext lint --source-dir=dist",
     "build-ext": "web-ext build --source-dir=dist --artifacts-dir=dist --overwrite-dest"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.7",
     "@types/chrome": "^0.0.254",
-    "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "prettier": "^3.1.1",
     "ts-loader": "^9.5.1",

public/manifest.json

@@ -17,7 +17,7 @@
   ],
   "web_accessible_resources": [
     {
-      "resources": ["main.js.map", "img/sb_button.png"],
+      "resources": ["img/sb_button.png"],
       "matches": ["*://*.lenameyerlandrut-fanclub.de/*"]
     }
   ],

src/bttv_api.ts

@@ -1,28 +0,0 @@
-type BTTV_Emote = {
-  id: string;
-  code: string;
-  imageType: string;
-  animated: boolean;
-  user: any;
-};
-
-export async function bttv_get_url(
-  code: string,
-): Promise<[string, string] | null> {
-  const res = await fetch(
-    `https://api.betterttv.net/3/emotes/shared/search?query=${code}&offset=0&limit=50`,
-  );
-  const content = await res.json();
-
-  if (!Array.isArray(content)) return null;
-  const matches = (content as BTTV_Emote[]).filter(
-    (be) => be.code.toLowerCase() == code.toLowerCase(),
-  );
-
-  if (matches.length <= 0) return null;
-
-  return [
-    code,
-    `//cdn.betterttv.net/emote/${matches[0].id}/1x.${matches[0].imageType}`,
-  ];
-}

src/helpers.ts

@@ -1,12 +0,0 @@
-type MapFunction<In, Out> = (input: In) => Promise<[In, Out] | null>;
-
-export async function map_parallel<In, Out>(
-  inputs: Iterable<In>,
-  map_fn: MapFunction<In, Out>,
-): Promise<Map<In, Out>> {
-  const queue = [...inputs].map((input) => map_fn(input));
-
-  return new Map<In, Out>(
-    (await Promise.all(queue)).filter((job): job is [In, Out] => job !== null),
-  );
-}

src/main.ts

@@ -1,33 +1,73 @@
-import { bttv_get_url } from "./bttv_api";
-import { map_parallel } from "./helpers";
-
 const emote_regex = /bttv:([^\s]+)/gi;
 
+type Emote = {
+  code: string;
+  url?: string;
+};
+
+type BTTV_Emote = {
+  id: string;
+  code: string;
+  imageType: string;
+  animated: boolean;
+  user: any;
+};
+
+async function bttv_get_url(code: string): Promise<Emote> {
+  const res = await fetch(
+    `https://api.betterttv.net/3/emotes/shared/search?query=${code}&offset=0&limit=50`,
+  );
+  const content = await res.json();
+
+  if (!Array.isArray(content)) return { code: code };
+  const matches = (content as BTTV_Emote[]).filter(
+    (be) => be.code.toLowerCase() == code.toLowerCase(),
+  );
+
+  if (matches.length <= 0) return { code: code };
+
+  return {
+    code: code,
+    url: `//cdn.betterttv.net/emote/${matches[0].id}/1x.${matches[0].imageType}`,
+  };
+}
+
+type EmoteMap = { [code: string]: string };
+
+async function get_emotes(codes: Iterable<string>): Promise<EmoteMap> {
+  const codes_set = new Set(codes);
+
+  // queue emote jobs
+  const queue = [...codes_set].map((code) => bttv_get_url(code));
+  console.log("[lmlfc-bttv] queued", queue.length, "jobs");
+
+  // run
+  const result: EmoteMap = {};
+  for (const job of await Promise.all(queue)) {
+    if (job.url) result[job.code] = job.url;
+  }
+
+  return result;
+}
+
 async function process_text(text: string): Promise<string> {
   const matches = [...text.matchAll(emote_regex)];
-  const codes = new Set(matches.map(([_, code]) => code));
-  console.log("[lmlfc-bttv]", `searching ${[...codes].length} emotes`);
-  const emotes = await map_parallel(codes, bttv_get_url);
-  console.debug("matches", matches, "codes", codes, "emotes", emotes);
+  const emotes = await get_emotes(matches.map(([_, code]) => code));
 
   for (const emote of matches.reverse()) {
     const [match, code] = emote;
-    console.debug("match", match, "code", code);
-
-    if (emote.index == undefined) continue;
-    const index = emote.index;
-
-    if (!emotes.has(code)) continue;
-    const url = emotes.get(code);
-    console.debug("index", index, "url", url);
+    const index = emote.index ?? 0;
+    if (!(code in emotes)) continue;
 
     text =
       text.substring(0, index) +
-      `[not]${url}[/not]` +
+      `[not]${emotes[code]}[/not]` +
       text.substring(index + match.length);
   }
 
-  return text.replace(/\[\/not\]\s+\[not\]/g, "[/not][not]");
+  text = text.replace(/\[\/not\]\s+\[not\]/g, "[/not][not]");
+
+  return text;
 }
 
 (() => {
@@ -39,9 +79,6 @@ async function process_text(text: string): Promise<string> {
   );
   if (!(cb_send instanceof HTMLInputElement)) return;
 
-  const cb_input = document.querySelector("#mgc_cb_evo_input");
-  if (!(cb_input instanceof HTMLInputElement)) return;
-
   const bttv_btn = (() => {
     const btn = document.createElement("a");
     btn.style.setProperty("cursor", "pointer");
@@ -54,6 +91,9 @@ async function process_text(text: string): Promise<string> {
     img.style.setProperty("vertical-align", "middle");
 
     btn.addEventListener("click", async () => {
+      const cb_input = document.querySelector("#mgc_cb_evo_input");
+      if (!(cb_input instanceof HTMLInputElement)) return;
+
       cb_input.value = await process_text(cb_input.value);
       cb_input.focus();
       cb_send.click();
@@ -65,5 +105,5 @@ async function process_text(text: string): Promise<string> {
 
   cb_form.insertBefore(bttv_btn, cb_send);
 
-  console.log("[lmlfc-bttv]", `loaded`);
+  console.log("done.");
 })();

tsconfig.json

@@ -1,18 +1,13 @@
 {
   "compilerOptions": {
     "strict": true,
-    "module": "CommonJS",
+    "module": "commonjs",
     "target": "es6",
+    "esModuleInterop": true,
     "sourceMap": true,
-    // flags
-    "alwaysStrict": true,
-    "strictNullChecks": true,
+    "rootDir": "src",
+    "outDir": "dist/js",
     "noEmitOnError": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "forceConsistentCasingInFileNames": true
+    "typeRoots": ["node_modules/@types"]
   }
 }

webpack.config.js

@@ -2,6 +2,7 @@ const path = require("path");
 const CopyPlugin = require("copy-webpack-plugin");
 
 module.exports = {
+  mode: "production",
   entry: {
     main: path.join(__dirname, "src", "main.ts"),
   },
@@ -9,26 +10,15 @@ module.exports = {
     path: path.join(__dirname, "dist"),
     filename: "[name].js",
   },
-  devtool: "source-map",
   resolve: {
     extensions: [".ts", ".js"],
   },
   module: {
     rules: [
       {
-        test: /\.[jt]s$/,
-        exclude: /(node_modules)/,
-        use: [
-          {
-            loader: "babel-loader",
-            options: {
-              presets: ["@babel/preset-env"],
-            },
-          },
-          {
+        test: /\.tsx?$/,
         loader: "ts-loader",
-          },
-        ],
+        exclude: /node_modules/,
       },
     ],
   },