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

10
events/voiceChannelLeave.js
View file

@ -10,14 +10,14 @@ export default async (client, cluster, worker, ipc, member, oldChannel) => {
connection.player.pause(true);
const waitMessage = await client.createMessage(connection.originalChannel.id, "🔊 Waiting 10 seconds for someone to return...");
const awaitRejoin = new AwaitRejoin(oldChannel, true);
awaitRejoin.on("end", (rejoined, member) => {
awaitRejoin.on("end", async (rejoined, member) => {
if (rejoined) {
connection.player.pause(false);
players.set(connection.voiceChannel.guild.id, { player: connection.player, type: connection.type, host: member.id, voiceChannel: connection.voiceChannel, originalChannel: connection.originalChannel, loop: connection.loop, shuffle: connection.shuffle, playMessage: connection.playMessage });
waitMessage.edit(`🔊 ${member.mention} is the new voice channel host.`);
} else {
try {
if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete();
if (waitMessage.channel.messages.get(waitMessage.id)) await waitMessage.delete();
} catch {
// no-op
}
@ -33,10 +33,10 @@ export default async (client, cluster, worker, ipc, member, oldChannel) => {
} else if (member.id === connection.host) {
const waitMessage = await client.createMessage(connection.originalChannel.id, "🔊 Waiting 10 seconds for the host to return...");
const awaitRejoin = new AwaitRejoin(oldChannel, false, member.id);
awaitRejoin.on("end", (rejoined) => {
awaitRejoin.on("end", async (rejoined) => {
if (rejoined) {
try {
if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete();
if (waitMessage.channel.messages.get(waitMessage.id)) await waitMessage.delete();
} catch {
// no-op
}
@ -44,7 +44,7 @@ export default async (client, cluster, worker, ipc, member, oldChannel) => {
const members = oldChannel.voiceMembers.filter((i) => i.id !== client.user.id && !i.bot);
if (members.length === 0) {
try {
if (waitMessage.channel.messages.get(waitMessage.id)) waitMessage.delete();
if (waitMessage.channel.messages.get(waitMessage.id)) await waitMessage.delete();
} catch {
// no-op
}