diff --git a/index.js b/index.js index e2e4998732e1a5634ab99d7ef103bb0aa51fa5ae..3723312443c1a33e9ef04234347d6b3627fd3372 100644 --- a/index.js +++ b/index.js @@ -281,7 +281,7 @@ const { verify } = require('crypto'); // create a new Discord client const client = new Client({ intents: ["GUILDS", "GUILD_MESSAGES", "DIRECT_MESSAGES", "GUILD_MEMBERS"] }); -var mcChatWebhook, devMcChatWebhook; +var mcChatWebhook; client.on("ready", async function () { console.log('\n' + "SL-Projects Bot".brightCyan); @@ -582,7 +582,7 @@ async function checkAnniv() { let annivRole = await memberFetch.guild.roles.cache.find(role => role.id === config.get("ROLE_ANNIV")); if (annivRole) { memberFetch.roles.add(annivRole); - console.log('[' + 'INFO'.yellow + '] Le rôle '.brightWhite + annivRole.name.yellow + " a été donné à " + memberFetch.user.username.brightBlue); + console.log('[' + 'INFO'.yellow + '] Le rôle '.brightWhite + annivRole.name.yellow + "a été donné à " + memberFetch.user.username.brightBlue); client.channels.cache.get(config.get("CANAL_GENERAL")).send("Fêtons l'anniversaire de <@" + memberFetch.id + "> ! :partying_face:").catch(console.error); } @@ -625,41 +625,15 @@ async function createMcChatWebhook() { console.log("[" + 'INFO'.yellow + "] Le Webhook du serveur MC a été configuré avec succès."); }) .catch(console.error); - - // Dev - client.channels.cache.get(config.get("CANAL_CHAT_MC_DEV")).createWebhook('Chat Serveur Minecraft Dev', { - avatar: 'https://sl-craft.fr/data/images/logo/short-color.png', - }) - .then(webhook => { - botSettings.create({ - name: "devMcChatWebhookId", - value: webhook.id - }); - botSettings.create({ - name: "devMcChatWebhookToken", - value: webhook.token - }); - devMcChatWebhook = new WebhookClient({ id: devMcChatWebhookId.value, token: devMcChatWebhookToken.value }); - console.log("[" + 'INFO'.yellow + "] Le Webhook du serveur MC Dev a été configuré avec succès."); - }) - .catch(console.error); } -function sendMessageFromMcChat(username, message, serverType) { +function sendMessageFromMcChat(username, message) { if(username == "SL-Craft"){ - if(serverType == "dev"){ - devMcChatWebhook.send({ - content: message, - username: username, - avatarURL: 'https://sl-craft.fr/data/images/logo/favicon-color.png', - }); - }else{ - mcChatWebhook.send({ - content: message, - username: username, - avatarURL: 'https://sl-craft.fr/data/images/logo/favicon-color.png', - }); - } + mcChatWebhook.send({ + content: message, + username: username, + avatarURL: 'https://sl-craft.fr/data/images/logo/favicon-color.png', + }); }else{ // On va vérifier que le joueur ne fait pas de @everyone ou de @here message = message.replace("<@everyone>", "**everyone**"); @@ -681,20 +655,11 @@ function sendMessageFromMcChat(username, message, serverType) { } } - if(serverType == "dev"){ - devMcChatWebhook.send({ - content: message, - username: username, - avatarURL: 'https://live.mc.sl-projects.com/tiles/faces/32x32/' + username + '.png', - }); - }else{ - mcChatWebhook.send({ - content: message, - username: username, - avatarURL: 'https://live.mc.sl-projects.com/tiles/faces/32x32/' + username + '.png', - }); - } - + mcChatWebhook.send({ + content: message, + username: username, + avatarURL: 'https://live.mc.sl-projects.com/tiles/faces/32x32/' + username + '.png', + }); } } @@ -723,7 +688,7 @@ app.get('/channels/:id', (req, res) => { }) app.get('/mc/chat/:detail', (req, res) => { var detail = JSON.parse(decodeURI(req.params.detail)); - sendMessageFromMcChat(detail.username, detail.message, req.headers.serverType); + sendMessageFromMcChat(detail.username, detail.message); res.send("Envoyé!") })