From 3f71519f8144b5af9d019171f77e9ab787e0330d Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Fri, 13 May 2022 16:26:12 +0000
Subject: [PATCH] config..

---
 package.json                   | 4 ++--
 src/bot.mjs                    | 2 +-
 src/inc/admin.mjs              | 2 +-
 src/inc/config.mjs             | 2 ++
 src/inc/sql.mjs                | 2 +-
 src/inc/trigger/google.mjs     | 4 ++--
 src/inc/trigger/help.mjs       | 6 +++---
 src/inc/trigger/hetzner.mjs    | 2 +-
 src/inc/trigger/lastfm.mjs     | 4 ++--
 src/inc/trigger/pr0gag.mjs     | 2 +-
 src/inc/trigger/soundcloud.mjs | 2 +-
 src/inc/trigger/viecher.mjs    | 8 ++++----
 src/inc/trigger/wttr.mjs       | 2 +-
 13 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 src/inc/config.mjs

diff --git a/package.json b/package.json
index 54cefca..ba2740c 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
   "author": "Flummi & jkhsjdhjs",
   "license": "WTFPL",
   "dependencies": {
-    "cleverbot-free": "^1.1.7",
-    "cuffeo": "^1.0.7-3",
+    "cleverbot-free": "^1.1.11",
+    "cuffeo": "^1.2.1",
     "flumm-fetch-cookies": "^1.4.0",
     "pg": "^8.3.0"
   }
diff --git a/src/bot.mjs b/src/bot.mjs
index e9c2ad0..f120b8e 100644
--- a/src/bot.mjs
+++ b/src/bot.mjs
@@ -1,7 +1,7 @@
 import _fs from "fs";
 import repl from "repl";
 import cuffeo from "cuffeo";
-import config from "../cfg/config.json";
+import config from "./inc/config.mjs";
 import logger from "./inc/log.mjs";
 import user from "./inc/user.mjs";
 
diff --git a/src/inc/admin.mjs b/src/inc/admin.mjs
index c896cee..be0da8d 100644
--- a/src/inc/admin.mjs
+++ b/src/inc/admin.mjs
@@ -1,4 +1,4 @@
-import config from "../../cfg/config.json";
+import config from "./config.mjs";
 
 export const getLevel = (network, user) => {
   let ret = {
diff --git a/src/inc/config.mjs b/src/inc/config.mjs
new file mode 100644
index 0000000..91dc5fe
--- /dev/null
+++ b/src/inc/config.mjs
@@ -0,0 +1,2 @@
+import config from "../../cfg/config.json" assert { type: "json" };
+export default config;
diff --git a/src/inc/sql.mjs b/src/inc/sql.mjs
index 1c64583..9a4704b 100644
--- a/src/inc/sql.mjs
+++ b/src/inc/sql.mjs
@@ -1,4 +1,4 @@
 import PG from "pg";
-import config from "../../cfg/config.json";
+import config from "./config.mjs";
 
 export default new PG.Pool(config.sql);
diff --git a/src/inc/trigger/google.mjs b/src/inc/trigger/google.mjs
index 12e94b3..afe41af 100644
--- a/src/inc/trigger/google.mjs
+++ b/src/inc/trigger/google.mjs
@@ -1,5 +1,5 @@
 import fetch from "flumm-fetch-cookies";
-import config from "../../../cfg/config.json";
+import config from "../config.mjs";
 
 export default async bot => {
   
@@ -11,4 +11,4 @@ export default async bot => {
       e.reply([ "Here are the top 3 Google results:", res.items.map((r, i) => `${i+1}: ${r.title} - ${r.link}`)].flat());
     }
   }];
-};
\ No newline at end of file
+};
diff --git a/src/inc/trigger/help.mjs b/src/inc/trigger/help.mjs
index 1266260..5caa254 100644
--- a/src/inc/trigger/help.mjs
+++ b/src/inc/trigger/help.mjs
@@ -3,7 +3,7 @@ export default async bot => {
   return [{
     name: "help",
     call: /^(\.|\/)help/i,
-    active: false,
+    active: true,
     f: e => {
       if(e.args[0] && [...bot._trigger.keys()].includes(e.args[0])) {
         const help = bot._trigger.get(e.args[0]).help;
@@ -13,10 +13,10 @@ export default async bot => {
       else {
         let triggers = [];
         [...bot._trigger.entries()]
-          .filter(trigger => trigger[1].help)
+          //.filter(trigger => trigger[1].help)
           .forEach(trigger => triggers.push(trigger[0]));
         e.reply(`(WIP) available commands: ${triggers.map(blah => `[b]${blah}[/b]`).join(", ")}`);
       }
     }
   }];
-};
\ No newline at end of file
+};
diff --git a/src/inc/trigger/hetzner.mjs b/src/inc/trigger/hetzner.mjs
index ecce617..3a0a895 100644
--- a/src/inc/trigger/hetzner.mjs
+++ b/src/inc/trigger/hetzner.mjs
@@ -1,5 +1,5 @@
 import fetch from "flumm-fetch-cookies";
-import config from "../../../cfg/config.json";
+import config from "../config.mjs";
 
 const api = `https://robot-ws.your-server.de`;
 const auth = {
diff --git a/src/inc/trigger/lastfm.mjs b/src/inc/trigger/lastfm.mjs
index b0563e7..77e2f2a 100644
--- a/src/inc/trigger/lastfm.mjs
+++ b/src/inc/trigger/lastfm.mjs
@@ -1,5 +1,5 @@
 import fetch from "flumm-fetch-cookies";
-import config from "../../../cfg/config.json";
+import config from "../config.mjs";
 import user from "../user.mjs";
 
 const api = `http://ws.audioscrobbler.com/2.0/?method=user.getRecentTracks&limit=1&api_key=${config.apis.lastfm.key}&format=json&user=`;
@@ -25,7 +25,7 @@ export default async bot => {
         return e.reply("nope");
       const u = user.get(e.user.prefix);
       if(u.lastfm === null || u.lastfm === "")
-        return e.reply("nope");
+        return e.reply("set up an account first: .np =username");
       
       const res = await (await fetch(`${api}${u.lastfm}`)).json();
       if(res.error)
diff --git a/src/inc/trigger/pr0gag.mjs b/src/inc/trigger/pr0gag.mjs
index 1923ae8..2a6bfbb 100644
--- a/src/inc/trigger/pr0gag.mjs
+++ b/src/inc/trigger/pr0gag.mjs
@@ -1,5 +1,5 @@
 import {default as fetch, cookieJar, Cookie} from "flumm-fetch-cookies";
-import cfg from "../../../cfg/config.json";
+import cfg from "../config.mjs";
 
 const apis = {
   reverse: "https://pr0gramm.com/api/items/get?flags=15&tags=!p:",
diff --git a/src/inc/trigger/soundcloud.mjs b/src/inc/trigger/soundcloud.mjs
index bc22437..339ee3e 100644
--- a/src/inc/trigger/soundcloud.mjs
+++ b/src/inc/trigger/soundcloud.mjs
@@ -1,5 +1,5 @@
 import fetch from "flumm-fetch-cookies";
-import config from "../../../cfg/config.json";
+import config from "../config.mjs";
 
 export default async bot => {
 
diff --git a/src/inc/trigger/viecher.mjs b/src/inc/trigger/viecher.mjs
index d4ffeca..5a20052 100644
--- a/src/inc/trigger/viecher.mjs
+++ b/src/inc/trigger/viecher.mjs
@@ -25,11 +25,11 @@ export default async bot => {
       return e.reply(meme.url);
     }
   }, {
-    name: "randomotter",
-    call: /^(\.|\/)otter$/i,
+    name: "randomvieh",
+    call: /^(\.|\/)(otter|bunny)$/i,
     f: async e => {
-      const otter = await (await fetch("https://api.tinyfox.dev/img?animal=otter&json")).json();
-      return e.reply(`https://api.tinyfox.dev${otter.loc}`);
+      const vieh = await (await fetch(`https://api.tinyfox.dev/img?animal=${e.cmd}&json`)).json();
+      return e.reply(`https://api.tinyfox.dev${vieh.loc}`);
     }
   }]
 };
diff --git a/src/inc/trigger/wttr.mjs b/src/inc/trigger/wttr.mjs
index cd05115..5f62688 100644
--- a/src/inc/trigger/wttr.mjs
+++ b/src/inc/trigger/wttr.mjs
@@ -1,5 +1,5 @@
 import fetch from "flumm-fetch-cookies";
-import config from "../../../cfg/config.json";
+import config from "../config.mjs";
 import { conds } from "./lib/wttr.mjs";
 
 export default async bot => {