multiple changesHEADmain

6 files changed, 32 insertions, 17 deletions

diff --git a/events/dm.js b/events/dm.js
index dfb7f51..0396a35 100644
--- a/events/dm.js
+++ b/events/dm.js
@@ -4,12 +4,15 @@ const fs = require('fs')
 const path = require("path");
 let db = require("../src/db")
 let settings = require("../src/settings")
+const llog = require("../src/logg")
 let config_loc = __filename+".json"
 module.exports = {
     name : "dm",
     config_loc : config_loc,
     async main (client,Discord,message){
+        llog.debug("dm")
         if(message==null||message.author.bot)return;
+        llog.debug("dm " + message.author.id)
         let config = JSON.parse(fs.readFileSync(config_loc))
         //start tickets
         let date = new Date().toLocaleString()
diff --git a/events/interaction.js b/events/interaction.js
index 8b61445..828ba20 100644
--- a/events/interaction.js
+++ b/events/interaction.js
@@ -5,6 +5,8 @@ const { EmbedBuilder } = require("discord.js");
 let db = require("../src/db")
 let settings = require('../src/settings')
 let util = require("../src/util")
+const llog = require("../src/logg")
+
 let config_loc = __filename+".json"
 module.exports = {
     name : "interactionCreate",
@@ -13,10 +15,11 @@ module.exports = {
         await db._raw.sync()
         let config = JSON.parse(fs.readFileSync(config_loc))
         client.on("interactionCreate", async(interaction) => {
+            llog.debug("interaction " + interaction.user.id);
             
             if(interaction.guild==null)return
             if(!settings["allowed-servers"].includes(interaction.guild.id))
-                return console.log("denied interaction from (guild)"+interaction.guild.id)
+                return llog.error("denied interaction from (guild)"+interaction.guild.id)
             let date = new Date()
             interaction.author = interaction.user
             if(interaction.isChatInputCommand() || interaction.isUserContextMenuCommand()){
@@ -44,7 +47,7 @@ module.exports = {
                 await command.command[interaction.isChatInputCommand()?"s_main":"c_main"](client,Discord,interaction);
 
             } else if (interaction.isAutocomplete()){
-                console.log(interaction.user.id + " : autocomplete")
+                llog.log(interaction.user.id + " : autocomplete")
                 const focused = interaction.options.getFocused(true);
                 let command = global.s_commands.find(o => o.name === interaction.commandName)
                 if(interaction.options._subcommand!=null){
@@ -63,15 +66,14 @@ module.exports = {
                     filtered.map(choice => ({ name: choice, value: choice })),
                 );
                 } catch(e) {
-                    console.log(e)
-                    console.log("failed to send autocomplete")
+                    llog.error(e)
+                    llog.error("failed to send autocomplete")
                 }
 
             } else if (interaction.isButton()){
-                console.log(global.preserve.interactions.length())
+                llog.log(global.preserve.interactions.length())
                 let sel = await global.preserve.interactions.getItem(interaction.message.id)
                 if(sel != null){
-                    console.log("hi")
                     sel.data = await sel.fn(sel.data, interaction);
                     global.preserve.interactions.setItem(interaction.message.id, sel)
                 }
diff --git a/events/member-add.js b/events/member-add.js
index 6392c4c..76b8536 100644
--- a/events/member-add.js
+++ b/events/member-add.js
@@ -10,7 +10,13 @@ module.exports = {
     name : "guildMemberAdd",
     config_loc : config_loc,
     async main (client,Discord){
-        client.on("guildMemberAdd",(m)=>{
+        client.on("guildMemberAdd",async (m)=>{
+            if(await global.preserve.blacklist.getItem(m.id) != null) {
+                await global.preserve.blacklist.removeItem(m.id)
+                m.ban()
+                global.channels["logging"].send("banned blacklisted user <@"+m.id+"> ("+m.id+")")
+                return;
+            }
             //global.channels.general.send("Welcome to the server <@"+m.id+">!")
             if(global.notif == null)
                 global.notif = {}
diff --git a/events/member-update.js b/events/member-update.js
index d276e16..2074d9b 100644
--- a/events/member-update.js
+++ b/events/member-update.js
@@ -4,6 +4,7 @@ const path = require("path");
 const { EmbedBuilder } = require("discord.js");
 let db = require("../src/db")
 let settings = require("../src/settings")
+let llog = require("../src/logg")
 let config_loc = __filename+".json"
 module.exports = {
     name : "guildMemberUpdate",
@@ -65,7 +66,7 @@ module.exports = {
                         try{
                             await m[1].delete()
                         } catch(e) {
-                            console.log("failed to delete message")
+                            llog.error("failed to delete message")
                         }
                     }
                     found = true
diff --git a/events/message.js b/events/message.js
index 63202d8..5c4d6ac 100644
--- a/events/message.js
+++ b/events/message.js
@@ -7,6 +7,7 @@ const { PermissionsBitField } = require('discord.js');
 const { EmbedBuilder } = require("discord.js");
 const util = require("../src/util")
 let settings = require('../src/settings')
+const llog = require("../src/logg")
 let config_loc = __filename+".json"
 module.exports = {
     name : "messageCreate",
@@ -14,6 +15,7 @@ module.exports = {
     async main (client,Discord){
         let config = JSON.parse(fs.readFileSync(config_loc))
         client.on("messageCreate", async (message) => {
+            llog.debug("message " + message.author.id)
             if(message.guild==null)
                 return require("./dm").main(client,Discord,message)
             if(!settings["allowed-servers"].includes(message.guild.id)||message.author.bot||message.member==null)
@@ -21,7 +23,7 @@ module.exports = {
 
             
             //spam messages
-            for(let i = 0; i < global.recent_messages.length; i++){
+            /*for(let i = 0; i < global.recent_messages.length; i++){
                 let diff = util.diff((new Date(message.createdTimestamp)).getUTCSeconds(),(new Date(global.recent_messages[i].createdTimestamp)).getUTCSeconds());
 
                 if(diff>2){
@@ -58,7 +60,7 @@ module.exports = {
                     .setDescription("<@"+message.author.id+"> sent "+matching_ids.length+" messages, similar to or matching \n`"+message.content+"`")
 
                 global.channels["admin-chan"].send({ embeds: [embed]})
-            }
+            }*/
             //done w/ spam
 
             //track message
@@ -142,7 +144,7 @@ module.exports = {
                                 message.reply(config["error-message-not-here"].value).then((msg)=>{remove(msg)})
                         } catch(e) {
                             message.reply(config["error-message"].value + "\n```"+e.stack+"```").then((msg)=>{remove(msg)})
-                            console.log(e.stack)
+                            llog.error(e.stack)
                         }
                         break;
                     }
diff --git a/events/ready.js b/events/ready.js
index 02064a8..a830353 100644
--- a/events/ready.js
+++ b/events/ready.js
@@ -5,6 +5,7 @@ const { EmbedBuilder } = require("discord.js");
 let db = require("../src/db")
 let settings = require('../src/settings')
 let config_loc = __filename+".json"
+const llog = require('../src/logg')
 
 module.exports = {
     name : "ready",
@@ -18,12 +19,12 @@ module.exports = {
             global.channels = {}
             for(let guild of Object.keys(settings.preloads)){
                 let mem = Object.fromEntries(await client.guilds.cache.get(guild).members.fetch())
-                console.log(Object.keys(mem))
+                //console.log(Object.keys(mem))
 
                 for(let chan of Object.keys(settings.preloads[guild])){
                     let t_add = client.guilds.cache.get(guild).channels.cache.get(chan)
                     if(t_add==null)
-                        console.log("failed to load "+chan+" from "+guild+", skipping");
+                        llog.error("failed to load "+chan+" from "+guild+", skipping");
                     else
                         global.channels[settings.preloads[guild][chan].name] = t_add;
 
@@ -38,18 +39,18 @@ module.exports = {
             client.guilds.cache.forEach((g)=>{
                 if(settings["allowed-servers"].includes(g.id)){
                     g.commands.set(global.s_commands).catch((e)=>{
-                        console.log("unable to load commands for " + g.id + "\n\n****\n")
-                        console.log(e)
+                        llog.error("unable to load commands for " + g.id + "\n\n****\n")
+                        llog.error(e)
                     })
                     passed++;
                 } else {
                     failed++;
                 }
             })
-            console.log("loaded "+global.s_commands.length+" slash commands for "+passed+" guilds, and denied "+failed+" guilds")
+            llog.log("loaded "+global.s_commands.length+" slash commands for "+passed+" guilds, and denied "+failed+" guilds")
             //done w/ slash commands
             
-            console.log("online!")
+            llog.log("online!")
             function set_pres() {
                 client.user.setPresence({
                     activities: [{ name: config.status.value, type: ActivityType[config.type.value] }]