diff --git a/src/ddpbridge.js b/src/ddpbridge.js index 58f0a43..4bdea1b 100644 --- a/src/ddpbridge.js +++ b/src/ddpbridge.js @@ -4,7 +4,7 @@ var WebSocket = require('ws'); var Discord = require('discord.js'); var createWsMessageCollector = require('./datacollector'); -var webhook = new Discord.WebhookClient(config.webhooks.ddp[0], config.webhooks.ddp[1], {disableEveryone:true}); +var webhook = new Discord.WebhookClient(config.webhooks.ddp[0], config.webhooks.ddp[1], {disableMentions:'all'}); var ws; var wasConnected = false; diff --git a/src/main.js b/src/main.js index 0559071..ad26e13 100755 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ if (config.testmode) console.log('TEST MODE'); global.exitHook = require('async-exit-hook'); global.Discord = require('discord.js'); global.fs = require('fs'); -global.dClient = new Discord.Client({ disableEveryone: true }); +global.dClient = new Discord.Client({ disableMentions: 'all' }); // error handling { diff --git a/src/misc.js b/src/misc.js index 7260fab..e830b75 100755 --- a/src/misc.js +++ b/src/misc.js @@ -3,11 +3,11 @@ var webhook = new Discord.WebhookClient(config.webhooks.welcome[0], config.webhooks.welcome[1]); dClient.on('local_guildMemberAdd', async member => { let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username; - webhook.send(`${member} joined.`, {username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048}), disableEveryone:true}); + webhook.send(`${member} joined.`, {username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048}), disableMentions:'all'}); }); dClient.on('local_guildMemberRemove', async member => { let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username; - webhook.send(`${member.user.tag} left.`, {username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048}), disableEveryone:true}); + webhook.send(`${member.user.tag} left.`, {username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048}), disableMentions:'all'}); }); })(); diff --git a/src/mppbridger/index.js b/src/mppbridger/index.js index da6af81..1353cdc 100755 --- a/src/mppbridger/index.js +++ b/src/mppbridger/index.js @@ -4,7 +4,7 @@ global.clients = {}; global.createMPPbridge = function createMPPbridge(room, DiscordChannelID, site = 'MPP', webhookID, webhookToken) { var DiscordChannel = dClient.channels.resolve(DiscordChannelID); if (!DiscordChannel) return console.error(`Couldn't bridge ${site} ${room} because Discord Channel ${DiscordChannelID} is missing!`); - if (webhookID && webhookToken) var webhook = new Discord.WebhookClient(webhookID, webhookToken, {disableEveryone:true}); + if (webhookID && webhookToken) var webhook = new Discord.WebhookClient(webhookID, webhookToken, {disableMentions:'all'}); // discord message sending diff --git a/src/rocketbridge.js b/src/rocketbridge.js index f7387a8..9900130 100644 --- a/src/rocketbridge.js +++ b/src/rocketbridge.js @@ -95,7 +95,7 @@ username: `${m.u.username} @ fookat.tk`.substr(0,32), avatarURL: `https://fookat.tk/avatar/${m.u.username}?${process.pid}`, split: true, - disableEveryone: true, + disableMentions: 'all', embeds: m.attachments ? m.attachments.map(a => ({ title: a.title, url: a.title_link ? "https://fookat.tk" + a.title_link : undefined,