diff --git a/commands/caption.js b/commands/caption.js index 2881634..270762b 100644 --- a/commands/caption.js +++ b/commands/caption.js @@ -13,7 +13,7 @@ exports.run = async (message, args) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - await processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: outputFinal, name: `caption.${image.type}` diff --git a/commands/caption2.js b/commands/caption2.js index 8e45409..03ebdbe 100644 --- a/commands/caption2.js +++ b/commands/caption2.js @@ -13,7 +13,7 @@ exports.run = async (message, args) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - await processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: outputFinal, name: `caption2.${image.type}` diff --git a/commands/globe.js b/commands/globe.js index 38efa48..bc2d87b 100644 --- a/commands/globe.js +++ b/commands/globe.js @@ -10,7 +10,7 @@ exports.run = async (message) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - await processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: buffer, name: "globe.gif" diff --git a/commands/magik.js b/commands/magik.js index 17679ae..ff64816 100644 --- a/commands/magik.js +++ b/commands/magik.js @@ -10,7 +10,7 @@ exports.run = async (message) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - await processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: buffer, name: `magik.${image.type}` diff --git a/commands/motivate.js b/commands/motivate.js index 0417861..b243cfb 100644 --- a/commands/motivate.js +++ b/commands/motivate.js @@ -15,7 +15,7 @@ exports.run = async (message, args) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: buffer, name: `motivate.${image.type}` diff --git a/commands/spin.js b/commands/spin.js index 535cd1b..59cb3a3 100644 --- a/commands/spin.js +++ b/commands/spin.js @@ -10,7 +10,7 @@ exports.run = async (message) => { type: image.type.toUpperCase(), delay: image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0 }); - await processMessage.delete(); + if (processMessage.channel.messages.get(processMessage.id)) await processMessage.delete(); return { file: buffer, name: "spin.gif" diff --git a/events/voiceChannelLeave.js b/events/voiceChannelLeave.js index 508cdf5..efd46e4 100644 --- a/events/voiceChannelLeave.js +++ b/events/voiceChannelLeave.js @@ -14,7 +14,7 @@ module.exports = async (member, oldChannel) => { soundPlayer.players.set(connection.voiceChannel.guild.id, { player: connection.player, type: connection.type, host: member.id, voiceChannel: connection.voiceChannel, originalChannel: connection.originalChannel }); waitMessage.edit(`🔊 ${member.mention} is the new voice channel host.`); } else { - waitMessage.delete(); + if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete(); connection.player.stop(connection.originalChannel.guild.id); soundPlayer.manager.leave(connection.originalChannel.guild.id); connection.player.destroy(); @@ -28,11 +28,11 @@ module.exports = async (member, oldChannel) => { const awaitRejoin = new AwaitRejoin(oldChannel, false, member.id); awaitRejoin.on("end", (rejoined) => { if (rejoined) { - waitMessage.delete(); + if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete(); } else { const members = oldChannel.voiceMembers.filter((i) => i.id !== client.user.id); if (members.length === 0) { - waitMessage.delete(); + if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete(); connection.player.stop(connection.originalChannel.guild.id); soundPlayer.manager.leave(connection.originalChannel.guild.id); connection.player.destroy(); diff --git a/utils/pagination/pagination.js b/utils/pagination/pagination.js index bbc64bd..6c073cd 100644 --- a/utils/pagination/pagination.js +++ b/utils/pagination/pagination.js @@ -27,7 +27,7 @@ module.exports = async (message, pages, timeout = 120000) => { maxMatches: 1 }); return messageCollector.on("message", response => { - askMessage.delete(); + if (askMessage.channel.messages.get(askMessage.id)) askMessage.delete(); page = Number(response.content) - 1; currentPage.edit(pages[page]); if (manageMessages) msg.removeReaction("🔢", userID); @@ -44,7 +44,7 @@ module.exports = async (message, pages, timeout = 120000) => { case "🗑": deleted = true; reactionCollector.emit("end"); - currentPage.delete(); + if (currentPage.channel.messages.get(currentPage.id)) currentPage.delete(); return; default: break; diff --git a/utils/soundplayer.js b/utils/soundplayer.js index 9ce7c85..4c9f687 100644 --- a/utils/soundplayer.js +++ b/utils/soundplayer.js @@ -103,7 +103,7 @@ exports.nextSong = async (message, connection, track, info, music, voiceChannel, this.players.set(voiceChannel.guild.id, { player: connection, type: music ? "music" : "sound", host: message.author.id, voiceChannel: voiceChannel, originalChannel: message.channel }); if (inQueue) { connection.on("error", (error) => { - playingMessage.delete(); + if (playingMessage.channel.messages.get(playingMessage.id)) playingMessage.delete(); this.manager.leave(voiceChannel.guild.id); connection.destroy(); this.players.delete(voiceChannel.guild.id); @@ -122,11 +122,11 @@ exports.nextSong = async (message, connection, track, info, music, voiceChannel, this.players.delete(voiceChannel.guild.id); this.queues.delete(voiceChannel.guild.id); if (music) await client.createMessage(message.channel.id, "🔊 The current voice channel session has ended."); - await playingMessage.delete(); + if (playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); } else { const track = await fetch(`http://${connection.node.host}:${connection.node.port}/decodetrack?track=${encodeURIComponent(newQueue[0])}`, { headers: { Authorization: connection.node.password } }).then(res => res.json()); this.nextSong(message, connection, newQueue[0], track, music, voiceChannel, true); - await playingMessage.delete(); + if (playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); } }); };