@manybot/manybot 4.0.1 → 4.0.2

package/package.json

@@ -5,7 +5,7 @@
     "name": "SyntaxError!",
     "email": "me@stxerr.dev"
   },
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "GPL-3.0-only",
   "private": false,
   "engines": {

package/src/config.js

@@ -1,11 +1,16 @@
 /**
  * config.js
  *
+<<<<<<< HEAD
+ * Reads and parses manybot.conf and manyplug.conf.
+ * Supports multiline lists and inline comments.
+=======
  * Loads:
  *   ~/.manybot/manybot.conf
  *   ~/.manybot/manyplug.conf
  *
  * Merges both files into a single configuration object.
+>>>>>>> dev
  */
 
 import fs from "fs/promises";
@@ -139,6 +144,10 @@ async function readFileSafe(file) {
   }
 }
 
+<<<<<<< HEAD
+const filePath = path.join(__dirname, "../manybot.conf");
+const plugFilePath = path.join(__dirname, "../manyplug.conf");
+=======
 const defaultConfig = 
 `
 # Many bot configuration file
@@ -150,6 +159,7 @@ CHATS=[]
 LANGUAGE=en
 PHONE_NUMBER=
 `;
+>>>>>>> dev
 
 try {
   await fs.stat(CONFIG_FILE);
@@ -160,31 +170,49 @@ try {
   await fs.writeFile(CONFIG_FILE, defaultConfig);
 }
 
-const baseConfig = await readFileSafe(CONFIG_FILE);
-const pluginConfig = await readFileSafe(PLUGIN_FILE);
-
-export const CONFIG = parseConf(baseConfig + "\n" + pluginConfig);
-
-/**
- * Common exports.
- */
-export const CLIENT_ID =
-  CONFIG.CLIENT_ID ?? "manybot";
-
-export const CMD_PREFIX =
-  CONFIG.CMD_PREFIX ?? "!";
-
-export const CHATS =
-  CONFIG.CHATS ?? [];
+<<<<<<< HEAD
+let plugRaw;
+try {
+  plugRaw = fs.readFileSync(plugFilePath, "utf8");
+} catch (err) {
+  if (err.code === "ENOENT") {
+    console.warn("Plugin file not found: manyplug.conf")
+    console.log("You probably don't have executed manyplug to install some plugins yet")
+  } else {
+    console.warn("Error when reading manyplug.conf: ", err.message);
+  }
+}
+const bringTogheter = plugRaw !== undefined;
 
-export const PLUGINS =
-  CONFIG.PLUGINS ?? [];
+let completeRaw;
+if (bringTogheter) {
+  completeRaw = raw + "\n" + plugRaw;
+} else {
+  completeRaw = raw;
+}
 
-export const LANGUAGE =
-  CONFIG.LANGUAGE ?? "en";
+const config = parseConf(completeRaw);
+=======
+const baseConfig = await readFileSafe(CONFIG_FILE);
+const pluginConfig = await readFileSafe(PLUGIN_FILE);
+>>>>>>> dev
+
+export const CONFIG = {
+  CMD_PREFIX: "!",
+  CLIENT_ID: "manybot",
+  CHATS: [],
+  PLUGINS: [],
+  LANGUAGE: "en",
+  PHONE_NUMBER: null,
+  ...parseConf(baseConfig + "\n" + pluginConfig),
+};
 
-export const PHONE_NUMBER =
-  CONFIG.PHONE_NUMBER ?? null;
+export const CLIENT_ID    = CONFIG.CLIENT_ID;
+export const CMD_PREFIX   = CONFIG.CMD_PREFIX;
+export const CHATS        = CONFIG.CHATS;
+export const PLUGINS      = CONFIG.PLUGINS;
+export const LANGUAGE     = CONFIG.LANGUAGE;
+export const PHONE_NUMBER = CONFIG.PHONE_NUMBER;
 
 /**
  * Useful paths for plugins/modules.