Merge branch 'master' into master

SpacingBat3 · Aug 5, 2022 · 604feae · 604feae
2 parents 97f435b + 06c0e6b
commit 604feae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@fontsource/fira-code": "^4.5.9",
     "@fontsource/roboto": "^4.5.1",
     "@fontsource/ubuntu": "^4.5.0",
-    "@spacingbat3/kolor": "^2.0.1",
+    "@spacingbat3/kolor": "^3.0.1",
     "deepmerge-ts": "^4.0.0",
     "dompurify": "^2.3.6",
     "electron-fetch": "^1.7.3",

diff --git a/sources/code/common/main.ts b/sources/code/common/main.ts
@@ -153,11 +153,11 @@ let overwriteMain: (() => unknown) | undefined;
     console.log([
       "\n " + kolor.bold(kolor.blue(app.getName())) +
         " – Privacy focused Discord client made with " +
-        kolor.bold(kolor.brightWhite(kolor.blueBg("TypeScript"))) + " and " +
-        kolor.bold(kolor.blackBg(kolor.brightCyan("Electron"))) + ".\n",
-      " " + kolor.underscore("Usage:"),
+        kolor.bold(kolor.whiteBright(kolor.bgBlue("TypeScript"))) + " and " +
+        kolor.bold(kolor.bgBlack(kolor.cyanBright("Electron"))) + ".\n",
+      " " + kolor.underline("Usage:"),
       " " + kolor.red(argv0) + kolor.green(" [options]\n"),
-      " " + kolor.underscore("Options:")
+      " " + kolor.underline("Options:")
     ].join("\n")+"\n"+[
       renderLine(["help", "h", "?"],"Show this help message."),
       renderLine(["version","V"],"Show current application version."),
@@ -206,7 +206,7 @@ let overwriteMain: (() => unknown) | undefined;
       Promise.all(filePromise).then(() => {
         console.log([
           "\n🎉️ "+kolor.green(kolor.bold("Successfully"))+" exported localization files to",
-          "   '" + kolor.blue(kolor.underscore(directory)) + "'!\n"
+          "   '" + kolor.blue(kolor.underline(directory)) + "'!\n"
         ].join("\n"));
         app.quit();
       }).catch((err:NodeJS.ErrnoException) => {
@@ -221,7 +221,7 @@ let overwriteMain: (() => unknown) | undefined;
           null;
         console.error([
           "\n⛔️ " + kolor.red(kolor.bold(err.code ?? err.name)) + " " + (err.syscall ?? "") + ": ",
-          (finalPath ? kolor.blue(kolor.underscore(finalPath)) + ": " : ""),
+          (finalPath ? kolor.blue(kolor.underline(finalPath)) + ": " : ""),
           err.message.replace((err.code ?? "") + ": ", "")
             .replace(", " + (err.syscall ?? "") + " '" + (err.path ?? "") + "'", "") + ".\n"
         ].join(""));

diff --git a/sources/code/main/modules/socket.ts b/sources/code/main/modules/socket.ts
@@ -2,7 +2,7 @@ import type { Server } from "ws";
 import kolor from "@spacingbat3/kolor";
 
 function wsLog(message:string, ...args:unknown[]) {
-  console.log(kolor.bold(kolor.brightMagenta("[WebSocket]"))+" "+message,...args);
+  console.log(kolor.bold(kolor.magentaBright("[WebSocket]"))+" "+message,...args);
 }
 
 /** Generates an inclusive range (as `Array`) from `start` to `end`. */
@@ -143,7 +143,7 @@ export default async function startServer(window:Electron.BrowserWindow) {
   const [
     {isJsonSyntaxCorrect, knownInstancesList: knownIstancesList},
     {initWindow},
-    {underscore},
+    {underline},
     L10N
   ] = await Promise.all([
     import("../../common/global"),
@@ -157,7 +157,7 @@ export default async function startServer(window:Electron.BrowserWindow) {
     // eslint-disable-next-line no-await-in-loop
     wss = await getServer(port);
     if(wss !== null) {
-      wsLog(listenPort,underscore(port.toString()));
+      wsLog(listenPort,underline(port.toString()));
       wsPort = port;
       break;
     }