From 145e026bcecd1ce5dc3a4fd6b6f7f9f42531033e Mon Sep 17 00:00:00 2001 From: NaOH-dev <77104443+CuSO4-c3c@users.noreply.github.com> Date: Mon, 4 Oct 2021 18:51:06 +0700 Subject: [PATCH] fix ping prefix --- app.js | 12 ++++++------ package-lock.json | 44 +++++++++++++++++++++++++++++++++++--------- package.json | 1 + 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/app.js b/app.js index b0e550e..a829b44 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,4 @@ -const { Client, Collection, MessageEmbed } = require("discord.js"); +const { Client, Collection, MessageEmbed, Message } = require("discord.js"); const { DiscordUNO } = require("discord-uno"); const fs = require("fs"); const childProcess = require('child_process') @@ -48,7 +48,7 @@ const main = async () => { client.commands = new Collection(); client.aliases = new Collection(); client.categories = fs.readdirSync("./commands/"); - ["command"].forEach(handler => { + fs.readdirSync('./handlers').forEach(handler => { require(`./handlers/${handler}`)(client); }); client.on('ready', () => { @@ -87,12 +87,12 @@ const main = async () => { } client.on("message", async message => { const prefixes = await client.prefix(message) - if(message.content.includes(`<@!${config.Admin}>`)) if(!message.author.id == client.user.id) message.reply('Tag ad bo may cc dmm') + if (message.content.includes(`<@!${config.Admin}>`)) if (!message.author.id == client.user.id) message.reply('Tag ad bo may cc dmm') if (message.content == `<@!${client.user.id}>` || message.content == `<@${client.user.id}>`) { return message.reply(`**Use ${prefixes}help to display all commands available.**`); } else { - if (!message.content.startsWith(`<@!${client.user.id}>`) && message.content.includes(`<@!${client.user.id}>`)) return message.reply(`**Use ${prefixes}help to display all commands available.**`); - if (!message.content.startsWith(`<@${client.user.id}>`) && message.content.includes(`<@${client.user.id}>`)) return message.reply(`**Use ${prefixes}help to display all commands available.**`); + if (!message.content.startsWith(config.prefix) && !message.content.startsWith(`<@!${client.user.id}>`) && message.content.includes(`<@!${client.user.id}>`)) return message.reply(`**Use ${prefixes}help to display all commands available.**`); + if (!message.content.startsWith(config.prefix) &&!message.content.startsWith(`<@${client.user.id}>`) && message.content.includes(`<@${client.user.id}>`)) return message.reply(`**Use ${prefixes}help to display all commands available.**`); } if (config.loglevel == 'message') { if (message.content.startsWith(prefixes) && message.content.startsWith(`<@!${client.user.id}>`)) { @@ -121,7 +121,7 @@ const main = async () => { } if (message.author.bot) return; if (!message.guild) return; - console.log(!message.content.startsWith(prefixes) && (!message.content.startsWith(`<@!${client.user.id}>` || !message.content.startsWith(`<@${client.user.id}>`)))) + //console.log(!message.content.startsWith(prefixes) && (!message.content.startsWith(`<@!${client.user.id}>` || !message.content.startsWith(`<@${client.user.id}>`)))) if (!message.content.startsWith(prefixes)) { if (!message.content.startsWith(`<@!${client.user.id}>`)) if (!message.content.startsWith(`<@${client.user.id}>`)) return; diff --git a/package-lock.json b/package-lock.json index 28a6dc9..d6582a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2253,20 +2253,35 @@ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "mongodb": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.1.tgz", - "integrity": "sha512-fbACrWEyvr6yl0sSiCGV0sqEiBwTtDJ8iSojmkDjAfw9JnOZSAkUyv9seFSPYhPPKwxp1PDtyjvBNfMDz0WBLQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.2.tgz", + "integrity": "sha512-pHCKDoOy1h6mVurziJmXmTMPatYWOx8pbnyFgSgshja9Y36Q+caHUzTDY6rrIy9HCSrjnbXmx3pCtvNZHmR8xg==", "requires": { - "bson": "^4.5.1", - "denque": "^1.5.0", + "bson": "^4.5.2", + "denque": "^2.0.1", "mongodb-connection-string-url": "^2.0.0", - "saslprep": "^1.0.0" + "saslprep": "^1.0.3" + }, + "dependencies": { + "bson": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.5.2.tgz", + "integrity": "sha512-8CEMJpwc7qlQtrn2rney38jQSEeMar847lz0LyitwRmVknAW8iHXrzW4fTjHfyWm0E3sukyD/zppdH+QU1QefA==", + "requires": { + "buffer": "^5.6.0" + } + }, + "denque": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz", + "integrity": "sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==" + } } }, "mongodb-connection-string-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.0.0.tgz", - "integrity": "sha512-M0I1vyLoq5+HQTuPSJWbt+hIXsMCfE8sS1fS5mvP9R2DOMoi2ZD32yWqgBIITyu0dFu4qtS50erxKjvUeBiyog==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.1.0.tgz", + "integrity": "sha512-Qf9Zw7KGiRljWvMrrUFDdVqo46KIEiDuCzvEN97rh/PcKzk2bd6n9KuzEwBwW9xo5glwx69y1mI6s+jFUD/aIQ==", "requires": { "@types/whatwg-url": "^8.2.1", "whatwg-url": "^9.1.0" @@ -2299,6 +2314,17 @@ "sliced": "1.0.1" }, "dependencies": { + "mongodb": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.1.1.tgz", + "integrity": "sha512-fbACrWEyvr6yl0sSiCGV0sqEiBwTtDJ8iSojmkDjAfw9JnOZSAkUyv9seFSPYhPPKwxp1PDtyjvBNfMDz0WBLQ==", + "requires": { + "bson": "^4.5.1", + "denque": "^1.5.0", + "mongodb-connection-string-url": "^2.0.0", + "saslprep": "^1.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/package.json b/package.json index babc7a0..fef96c6 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "distube": "^2.8.18", "ffmpeg-static": "^4.4.0", "moment": "^2.29.1", + "mongodb": "^4.1.2", "mongoose": "^6.0.5", "ms": "^2.1.3", "nekos.life": "^2.0.7",