From 9fbf59eae4e58b292042832731ed731bad79980c Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Mon, 24 Oct 2022 02:27:01 -0600 Subject: [PATCH] well that was a miserable idea --- bot.js | 2 +- .../{ts/log/getlevel.ts => log/getlevel.js} | 6 ++--- src/util/{ts => }/log/levels.json | 0 src/util/log/log.js | 3 +++ src/util/{util/ts => }/log/types.js | 0 src/util/ts/log/log.ts | 25 ------------------- src/util/ts/log/types.ts | 0 src/util/util/ts/log/getlevel.d.ts | 1 - src/util/util/ts/log/getlevel.js | 20 --------------- src/util/util/ts/log/levels.json | 5 ---- src/util/util/ts/log/log.d.ts | 17 ------------- src/util/util/ts/log/log.js | 8 ------ src/util/util/ts/log/types.d.ts | 0 13 files changed, 7 insertions(+), 80 deletions(-) rename src/util/{ts/log/getlevel.ts => log/getlevel.js} (72%) rename src/util/{ts => }/log/levels.json (100%) create mode 100644 src/util/log/log.js rename src/util/{util/ts => }/log/types.js (100%) delete mode 100644 src/util/ts/log/log.ts delete mode 100644 src/util/ts/log/types.ts delete mode 100644 src/util/util/ts/log/getlevel.d.ts delete mode 100644 src/util/util/ts/log/getlevel.js delete mode 100644 src/util/util/ts/log/levels.json delete mode 100644 src/util/util/ts/log/log.d.ts delete mode 100644 src/util/util/ts/log/log.js delete mode 100644 src/util/util/ts/log/types.d.ts diff --git a/bot.js b/bot.js index 67ee7cb..46ad075 100644 --- a/bot.js +++ b/bot.js @@ -1,4 +1,4 @@ -const logger = require('./src/util/ts/log/log'); +const logger = require('./src/util/log/log'); const client = {test: 'e', config: {logLevel: 1}}; const log = logger(client); log(); \ No newline at end of file diff --git a/src/util/ts/log/getlevel.ts b/src/util/log/getlevel.js similarity index 72% rename from src/util/ts/log/getlevel.ts rename to src/util/log/getlevel.js index 5e87455..a204f1a 100644 --- a/src/util/ts/log/getlevel.ts +++ b/src/util/log/getlevel.js @@ -1,8 +1,8 @@ -import config = require('../../../json/config.json'); -import levels = require('./levels.json'); +const config = require('../../json/config.json'); +const levels = require('../ts/log/levels.json'); const validStrings = Object.keys(levels); -const getLevel = (level: string | number): number => { +const getLevel = (level) => { if (typeof level === 'number') { if (level <= 0) {return 0;} if (level > 3) {return 3;} diff --git a/src/util/ts/log/levels.json b/src/util/log/levels.json similarity index 100% rename from src/util/ts/log/levels.json rename to src/util/log/levels.json diff --git a/src/util/log/log.js b/src/util/log/log.js new file mode 100644 index 0000000..3d2ca31 --- /dev/null +++ b/src/util/log/log.js @@ -0,0 +1,3 @@ +export const log = (client) => (log = "Test Log", options = {}) => { + +}; \ No newline at end of file diff --git a/src/util/util/ts/log/types.js b/src/util/log/types.js similarity index 100% rename from src/util/util/ts/log/types.js rename to src/util/log/types.js diff --git a/src/util/ts/log/log.ts b/src/util/ts/log/log.ts deleted file mode 100644 index 5649f43..0000000 --- a/src/util/ts/log/log.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {Client} from "discord.js"; - -function color() {}; - -export const log = (client: Client) => (log: any | LogOptionsObject = "Test Log", options?: LogOptionsObject) => { - -}; - -export interface LogOptionsObject { - message?: any, - level?: string | number, - source?: string | { - text?: string, - color?: Color - }, - color?: Color, - suffix?: string -} - -export interface ColorObject { - type: "hex" | "default", - color: string -} - -export type Color = string | ColorObject; \ No newline at end of file diff --git a/src/util/ts/log/types.ts b/src/util/ts/log/types.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/util/util/ts/log/getlevel.d.ts b/src/util/util/ts/log/getlevel.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/src/util/util/ts/log/getlevel.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/src/util/util/ts/log/getlevel.js b/src/util/util/ts/log/getlevel.js deleted file mode 100644 index 546d6b9..0000000 --- a/src/util/util/ts/log/getlevel.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const config = require("../../../json/config.json"); -const levels = require("./levels.json"); -const validStrings = Object.keys(levels); -const getLevel = (level) => { - if (typeof level === 'number') { - if (level <= 0) { - return 0; - } - if (level > 3) { - return 3; - } - return Math.floor(level); - } - else { - const levelM = `${level}`.trim().toUpperCase(); - return validStrings.includes(levelM) ? levels[levelM] : typeof config.log.defaultLevel === 'number' ? getLevel(config.log.defaultLevel) : 1; - } -}; diff --git a/src/util/util/ts/log/levels.json b/src/util/util/ts/log/levels.json deleted file mode 100644 index 003f413..0000000 --- a/src/util/util/ts/log/levels.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "TOP": 0, - "STANDARD": 1, - "VERBOSE": 2 -} diff --git a/src/util/util/ts/log/log.d.ts b/src/util/util/ts/log/log.d.ts deleted file mode 100644 index 3d68c67..0000000 --- a/src/util/util/ts/log/log.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Client } from "discord.js"; -export declare const log: (client: Client) => (log?: any | LogOptionsObject, options?: LogOptionsObject) => void; -export interface LogOptionsObject { - message?: any; - level?: string | number; - source?: string | { - text?: string; - color?: Color; - }; - color?: Color; - suffix?: string; -} -export interface ColorObject { - type: "hex" | "default"; - color: string; -} -export declare type Color = string | ColorObject; diff --git a/src/util/util/ts/log/log.js b/src/util/util/ts/log/log.js deleted file mode 100644 index 5ee2fef..0000000 --- a/src/util/util/ts/log/log.js +++ /dev/null @@ -1,8 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.log = void 0; -function color() { } -; -const log = (client) => (log = "Test Log", options) => { -}; -exports.log = log; diff --git a/src/util/util/ts/log/types.d.ts b/src/util/util/ts/log/types.d.ts deleted file mode 100644 index e69de29..0000000