diff --git a/.gitignore b/.gitignore index 136db44..c00a07a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ node_modules/ dist/ .vscode/ logs/ -package-lock.json \ No newline at end of file +package-lock.json +yarn.lock \ No newline at end of file diff --git a/package.json b/package.json index 30595f3..aab339d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "node --experimental-modules src/bot.mjs", "rmlog": "rm logs/*.log || true", - "debug": "npm run rmlog ; npm start" + "debug": "yarn run rmlog ; yarn start" }, "author": "Flummi & jkhsjdhjs", "license": "WTFPL", diff --git a/src/bot.mjs b/src/bot.mjs index e272f91..515e7d1 100644 --- a/src/bot.mjs +++ b/src/bot.mjs @@ -1,7 +1,7 @@ import _fs from "fs"; import cuffeo from "cuffeo"; import config from "../cfg/config.json"; -import logger from "./inc/log"; +import logger from "./inc/log.mjs"; const fs = _fs.promises; const timeout = 1000; diff --git a/src/inc/admin.mjs b/src/inc/admin.mjs index 5f1ed5a..c896cee 100644 --- a/src/inc/admin.mjs +++ b/src/inc/admin.mjs @@ -1,4 +1,4 @@ -import { default as config } from "../../cfg/config.json"; +import config from "../../cfg/config.json"; export const getLevel = (network, user) => { let ret = { diff --git a/src/inc/events/error.mjs b/src/inc/events/error.mjs index fcbab34..3c7dd50 100644 --- a/src/inc/events/error.mjs +++ b/src/inc/events/error.mjs @@ -1,10 +1,12 @@ +import logger from "../log.mjs"; + export default async bot => { return [{ name: "error", listener: "error", f: e => { - console.log(e); + logger.error(e); } }]; }; diff --git a/src/inc/events/info.mjs b/src/inc/events/info.mjs index e4acc9c..7c6e490 100644 --- a/src/inc/events/info.mjs +++ b/src/inc/events/info.mjs @@ -1,10 +1,12 @@ +import logger from "../log.mjs"; + export default async bot => { return [{ name: "info", listener: "info", f: e => { - console.log(e); + logger.debug(e); } }]; }; diff --git a/src/inc/events/message.mjs b/src/inc/events/message.mjs index 1662e5b..b4e0d4b 100644 --- a/src/inc/events/message.mjs +++ b/src/inc/events/message.mjs @@ -1,5 +1,5 @@ -import logger from "../log"; -import { getLevel } from "../../inc/admin"; +import logger from "../log.mjs"; +import { getLevel } from "../../inc/admin.mjs"; const parseArgs = msg => { let args = msg.trim().split(" ") diff --git a/src/inc/trigger/chatbot.mjs b/src/inc/trigger/chatbot.mjs index 50eff8f..6595478 100644 --- a/src/inc/trigger/chatbot.mjs +++ b/src/inc/trigger/chatbot.mjs @@ -1,5 +1,5 @@ export default async bot => { - const cleverbot = (await import("./lib/cleverbot")).default; + const cleverbot = (await import("./lib/cleverbot.mjs")).default; return [{ name: "chatbot", diff --git a/src/inc/trigger/cookie.mjs b/src/inc/trigger/cookie.mjs index 24d3d5c..8be0f27 100644 --- a/src/inc/trigger/cookie.mjs +++ b/src/inc/trigger/cookie.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; const data = { cookie_cookies: [], diff --git a/src/inc/trigger/debug.mjs b/src/inc/trigger/debug.mjs index b4b1402..9f313c4 100644 --- a/src/inc/trigger/debug.mjs +++ b/src/inc/trigger/debug.mjs @@ -1,4 +1,4 @@ -import { getLevel } from "../admin"; +import { getLevel } from "../admin.mjs"; import fetch from "flumm-fetch-cookies"; import vm from "vm"; diff --git a/src/inc/trigger/drugs.mjs b/src/inc/trigger/drugs.mjs index f6f20f3..eec7281 100644 --- a/src/inc/trigger/drugs.mjs +++ b/src/inc/trigger/drugs.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; const data = { dope_actions: {}, diff --git a/src/inc/trigger/mcmaniac.mjs b/src/inc/trigger/mcmaniac.mjs index 32bd22f..fe296e5 100644 --- a/src/inc/trigger/mcmaniac.mjs +++ b/src/inc/trigger/mcmaniac.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; let _query_get = ` select item, diff --git a/src/inc/trigger/quotes.mjs b/src/inc/trigger/quotes.mjs index f73288b..06c5e9b 100644 --- a/src/inc/trigger/quotes.mjs +++ b/src/inc/trigger/quotes.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; import fetch from "flumm-fetch-cookies"; let _query_get = ` diff --git a/src/inc/trigger/rape.mjs b/src/inc/trigger/rape.mjs index 4565928..bed54f0 100644 --- a/src/inc/trigger/rape.mjs +++ b/src/inc/trigger/rape.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; export default async bot => { diff --git a/src/inc/trigger/sandbox.mjs b/src/inc/trigger/sandbox.mjs index 6074cee..62a3f03 100644 --- a/src/inc/trigger/sandbox.mjs +++ b/src/inc/trigger/sandbox.mjs @@ -1,5 +1,5 @@ -import sql from "../sql"; -import { maxoutput, sandbox, bfgen } from "./lib/sandbox"; +import sql from "../sql.mjs"; +import { maxoutput, sandbox, bfgen } from "./lib/sandbox.mjs"; import vm from "vm"; import fetch from "flumm-fetch-cookies"; diff --git a/src/inc/trigger/useless_nxy.mjs b/src/inc/trigger/useless_nxy.mjs index 0a06af7..971084e 100644 --- a/src/inc/trigger/useless_nxy.mjs +++ b/src/inc/trigger/useless_nxy.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; import fetch from "flumm-fetch-cookies"; const data = { diff --git a/src/inc/trigger/useless_uwe.mjs b/src/inc/trigger/useless_uwe.mjs index 60dc3e3..0e3e879 100644 --- a/src/inc/trigger/useless_uwe.mjs +++ b/src/inc/trigger/useless_uwe.mjs @@ -1,4 +1,4 @@ -import sql from "../sql"; +import sql from "../sql.mjs"; import fetch from "flumm-fetch-cookies"; const data = { diff --git a/src/inc/trigger/wttr.mjs b/src/inc/trigger/wttr.mjs index ef3872f..cd05115 100644 --- a/src/inc/trigger/wttr.mjs +++ b/src/inc/trigger/wttr.mjs @@ -1,6 +1,6 @@ import fetch from "flumm-fetch-cookies"; import config from "../../../cfg/config.json"; -import { conds } from "./lib/wttr"; +import { conds } from "./lib/wttr.mjs"; export default async bot => {