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

Properly await message deletes, update packages

Browse source
This commit is contained in:
Essem 2021-12-13 15:46:08 -06:00
parent 14046a811a
commit c5fc1d0b0f
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
5 changed files with 210 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/pagination/pagination.js
View file

@ -104,7 +104,7 @@ export default async (client, message, pages, timeout = 120000) => {
maxMatches: 1
});
return messageCollector.on("message", async (response) => {
if (await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) askMessage.delete();
if (await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) await askMessage.delete();
if (manageMessages) await response.delete();
page = Number(response.content) - 1;
currentPage = await currentPage.edit(Object.assign(pages[page], options));

8
utils/soundplayer.js
View file

@ -93,7 +93,7 @@ export async function nextSong(client, message, connection, track, info, music,
const playMessage = players.get(voiceChannel.guild.id).playMessage;
try {
players.delete(voiceChannel.guild.id);
playMessage.delete();
await playMessage.delete();
} catch {
// no-op
}
@ -132,11 +132,11 @@ export async function nextSong(client, message, connection, track, info, music,
await connection.play(track);
await connection.volume(75);
players.set(voiceChannel.guild.id, { player: connection, type: music ? "music" : "sound", host: message.author.id, voiceChannel: voiceChannel, originalChannel: message.channel, loop: loop, shuffle: shuffle, playMessage: playingMessage });
connection.once("error", (error) => {
connection.once("error", async (error) => {
try {
if (playingMessage.channel.messages.get(playingMessage.id)) playingMessage.delete();
if (playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete();
const playMessage = players.get(voiceChannel.guild.id).playMessage;
if (playMessage.channel.messages.get(playMessage.id)) playMessage.delete();
if (playMessage.channel.messages.get(playMessage.id)) await playMessage.delete();
} catch {
// no-op
}