Blacklists / Topic Settings / many more changes

DiscordEvents/MessageEconomy.js

@@ -1,5 +1,6 @@
 const {
-  eco
+  eco,
+  db
 } = require("../utils");
 const {
   table
@@ -14,6 +15,10 @@ module.exports = {
     if (Message.author.bot) return;
     if (!Message.guild) return;
     if (Message.author.id !== '318044130796109825') return;
+
+    let UserFromDB = await db.blacklist(Message.author.id, 's')
+    if (UserFromDB.state) return;
+
     await eco.CalculateFromMessage(Message)
     // console.log(Message)
   }

DiscordEvents/MessageShortlink.js

@@ -1,6 +1,14 @@
-const { log, db } = require("../utils/index");
-const { ShortLinks } = require("../utils");
-const { table } = require("quick.db");
+const {
+  log,
+  db
+} = require("../utils/index");
+const {
+  ShortLinks,
+  topic
+} = require("../utils");
+const {
+  table
+} = require("quick.db");
 const Servers = new table("servers");
 const Users = new table("users");
 const Backend = new table("backend");
@@ -9,6 +17,12 @@ module.exports = {
   name: "message",
   run: async (client, Message) => {
     if (Message.author.bot) return;
+
+    let UserFromDB = await db.blacklist(Message.author.id, 's')
+    if (UserFromDB.state) return;
+    if (topic.includesSetting('thaldrin.no-SL', Message.channel.topic)) return;
+
+
     let Server = Servers.get(Message.guild.id);
     let Enabled;
     if (Server === null) {
@@ -18,4 +32,4 @@ module.exports = {
     }
     ShortLinks(Enabled, Message);
   }
-};
+};

DiscordEvents/MessageSourceFynnder.js

@@ -1,6 +1,14 @@
-const { log, db } = require("../utils/index");
-const { SourceFynnder } = require("../utils");
-const { table } = require("quick.db");
+const {
+  log,
+  db
+} = require("../utils/index");
+const {
+  SourceFynnder,
+  topic
+} = require("../utils");
+const {
+  table
+} = require("quick.db");
 const Servers = new table("servers");
 const Users = new table("users");
 const Backend = new table("backend");
@@ -9,6 +17,12 @@ module.exports = {
   name: "message",
   run: async (client, Message) => {
     if (Message.author.bot) return;
+
+    let UserFromDB = await db.blacklist(Message.author.id, 's')
+    if (UserFromDB.state) return;
+
+    if (topic.includesSetting('thaldrin.no-SF', Message.channel.topic)) return;
+
     let Server = Servers.get(Message.guild.id);
     let Enabled;
     if (Server === null) {
@@ -18,4 +32,4 @@ module.exports = {
     }
     SourceFynnder(Enabled, Message);
   }
-};
+};

DiscordEvents/message.js

@@ -1,23 +1,36 @@
-const { Collection, MessageEmbed } = require('discord.js');
-const { table } = require('quick.db');
+const {
+	Collection,
+	MessageEmbed
+} = require('discord.js');
+const {
+	table
+} = require('quick.db');
 const Servers = new table('servers');
 const Users = new table('users');
 const Backend = new table('backend');
 const Trello = require('trello');
 const config = require('../config');
+const {
+	db,
+	topic
+} = require('../utils')
 const vars = require('../vars');
 const trello = new Trello(config.trello.key, config.trello.token);
 module.exports = {
 	name: 'message',
 	run: async (client, msg) => {
-		//if (msg.author.id !== '318044130796109825') return;
 		if (msg.author.bot) return;
+		//if (msg.author.id !== '318044130796109825') return;
+		//console.log(msg.author.tag)
+
+		let UserFromDB = await db.blacklist(msg.author.id, 's')
+		if (UserFromDB.state) return;
 		const DefaultPrefix = client.config.prefixes;
 		const CustomPrefix = Servers.get(msg.guild.id);
 		if (!CustomPrefix) {
-			PrefixArray = [ DefaultPrefix /* , CustomPrefix */ ].flat(Infinity);
+			PrefixArray = [DefaultPrefix /* , CustomPrefix */ ].flat(Infinity);
 		} else {
-			PrefixArray = [ DefaultPrefix, CustomPrefix.prefix ].flat(Infinity);
+			PrefixArray = [DefaultPrefix, CustomPrefix.prefix].flat(Infinity);
 		}
 		let PREFIX;
 		let EXISTS;
@@ -28,10 +41,14 @@ module.exports = {
 			}
 		}
 		if (!EXISTS) return;
+		//console.log(topic.includesSetting('thaldrin.no-cmds', msg.channel.topic))
+		if (topic.includesSetting('thaldrin.no-cmd', msg.channel.topic)) return;
+
 		const args = msg.content.slice(PrefixArray[PREFIX].length).trim().split(/ +/g);
 		const command = args.shift().toLowerCase();
 		const cmd = client.commands.find((c) => c.name == command || (c.aliases && c.aliases.includes(command)));
 
+
 		const ctx = {
 			send: msg.channel.send.bind(msg.channel),
 			client,
@@ -44,7 +61,11 @@ module.exports = {
 			author: msg.author,
 			member: msg.member,
 			trello,
-			db: { users: Users, servers: Servers, backend: Backend },
+			db: {
+				users: Users,
+				servers: Servers,
+				backend: Backend
+			},
 			utils: require('../utils'),
 			config: require('../config'),
 			vars: require('../vars'),
@@ -119,4 +140,4 @@ module.exports = {
 			});
 		}
 	}
-};
+};