aboutsummaryrefslogtreecommitdiff
path: root/events
diff options
context:
space:
mode:
Diffstat (limited to 'events')
-rw-r--r--events/message.js7
-rw-r--r--events/ready.js10
2 files changed, 11 insertions, 6 deletions
diff --git a/events/message.js b/events/message.js
index b93f081..c9234e0 100644
--- a/events/message.js
+++ b/events/message.js
@@ -19,6 +19,7 @@ module.exports = {
if(!settings["allowed-servers"].includes(message.guild.id)||message.author.bot||message.member==null)
return;
+
//spam messages
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());
@@ -37,7 +38,7 @@ module.exports = {
}
}
global.recent_messages.push(message)
- if(matching_ids.length > 3){
+ if(false && matching_ids.length > 3){
//let temp_msg = global.recent_messages;
global.recent_messages = global.recent_messages.filter(x => x.author != message.author)
let could_timeout = true
@@ -47,8 +48,8 @@ module.exports = {
could_timeout = false;
}
for(let mm of matching_ids){
- mm.delete();
- //try { await mm.delete(); } catch (e) {}
+ //mm.delete();
+ mm.delete().then().catch();
}
let embed = new EmbedBuilder()
diff --git a/events/ready.js b/events/ready.js
index c694c00..889c0b1 100644
--- a/events/ready.js
+++ b/events/ready.js
@@ -11,17 +11,21 @@ module.exports = {
async main (client,Discord){
await db._raw.sync()
let config = JSON.parse(fs.readFileSync(config_loc))
- client.once("ready", () => {
+ client.once("ready", async () => {
//preload
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))
+
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");
else
- global.channels[settings.preloads[guild][chan].name] = t_add
+ global.channels[settings.preloads[guild][chan].name] = t_add;
+
+
}
}
//end