diff --git a/commands/event.js b/commands/event.js index 6dc3728..032d692 100644 --- a/commands/event.js +++ b/commands/event.js @@ -48,6 +48,12 @@ module.exports = { type: CommandOptions.Channel, channel_types: [0], // Restrict to text channel required: true, + }, { + name: "role", + description: "Optional role to ping", + value: "role", + type: CommandOptions.Role, + required: false, }] }, { name: "delete", @@ -84,6 +90,7 @@ module.exports = { name: args[0].options[2].value, gamertag: args[0].options[0].value, channel: args[0].options[3].value, + role: args[0].options[4] ? args[0].options[4].value : null, time: args[0].options[1].value, creationDate: new Date(), }; diff --git a/package.json b/package.json index faabe52..3e02691 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "10.1.3", + "version": "10.2.0", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/util/AlarmsHandler.js b/util/AlarmsHandler.js index 5f0418a..4a9034b 100644 --- a/util/AlarmsHandler.js +++ b/util/AlarmsHandler.js @@ -19,7 +19,6 @@ const ExpireEvent = async(client, guild, e) => { const HandlePlayerTrackEvent = async (client, guild, e) => { let player = guild.playerstats.find(stat => stat.gamertag == e.gamertag ); - let hasMR = (guild.memberRole != "") let newDt = await client.getDateEST(player.time); let unixTime = Math.floor(newDt.getTime()/1000); @@ -30,7 +29,8 @@ const HandlePlayerTrackEvent = async (client, guild, e) => { if (!client.exists(e.channel)) return ExpireEvent(client, guild, e); // Expire event since it has invalid channel. const channel = client.GetChannel(e.channel); - channel.send({ embeds: [trackEvent], content: `${hasMR ? `\n<@&${guild.memberRole}>`:'@here'}` }); + if (e.role) channel.send({ content: `<@&${e.role}>`, embeds: [trackEvent] }); + else channel.send({ embeds: [trackEvent] }); let now = new Date(); let diff = ((now - e.creationDate) / 1000) / 60;