murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only delete messages if they exist, removes errors in console

Browse source
This commit is contained in:
TheEssem 2020-09-23 14:12:39 -05:00
parent 7047081f98
commit 6e8473d784
9 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
utils/pagination/pagination.js
View file

@ -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;

6
utils/soundplayer.js
View file

@ -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();
}
});
};