Fix restart, slightly stabilize voice leave event
This commit is contained in:
parent
21e0914268
commit
2bd00d7845
|
@ -7,7 +7,7 @@ class RestartCommand extends Command {
|
||||||
this.success = false;
|
this.success = false;
|
||||||
return "Only the bot owner can restart me!";
|
return "Only the bot owner can restart me!";
|
||||||
}
|
}
|
||||||
await this.message.channel.createMessage(Object.assign({
|
await this.channel.createMessage(Object.assign({
|
||||||
content: "esmBot is restarting."
|
content: "esmBot is restarting."
|
||||||
}, this.reference));
|
}, this.reference));
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
|
|
|
@ -128,7 +128,6 @@
|
||||||
"$19 Fortnite Card",
|
"$19 Fortnite Card",
|
||||||
"Wild Woody",
|
"Wild Woody",
|
||||||
"RDI Halcyon",
|
"RDI Halcyon",
|
||||||
"cry about it",
|
|
||||||
"KFC",
|
"KFC",
|
||||||
"Cave Story",
|
"Cave Story",
|
||||||
"YouTube ads",
|
"YouTube ads",
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import { players, queues, skipVotes } from "../utils/soundplayer.js";
|
import { players, queues, skipVotes } from "../utils/soundplayer.js";
|
||||||
import AwaitRejoin from "../utils/awaitrejoin.js";
|
import AwaitRejoin from "../utils/awaitrejoin.js";
|
||||||
import { random } from "../utils/misc.js";
|
import { random } from "../utils/misc.js";
|
||||||
|
import { logger } from "../utils/logger.js";
|
||||||
|
|
||||||
const isWaiting = new Map();
|
const isWaiting = new Map();
|
||||||
|
|
||||||
|
@ -16,9 +17,10 @@ export default async (client, member, oldChannel) => {
|
||||||
content: "🔊 Waiting 10 seconds for someone to return..."
|
content: "🔊 Waiting 10 seconds for someone to return..."
|
||||||
});
|
});
|
||||||
const awaitRejoin = new AwaitRejoin(oldChannel, true, member.id);
|
const awaitRejoin = new AwaitRejoin(oldChannel, true, member.id);
|
||||||
awaitRejoin.on("end", async (rejoined, newMember) => {
|
awaitRejoin.once("end", async (rejoined, newMember, cancel) => {
|
||||||
isWaiting.delete(oldChannel.id);
|
isWaiting.delete(oldChannel.id);
|
||||||
if (rejoined) {
|
if (rejoined) {
|
||||||
|
if (cancel) return;
|
||||||
connection.player.setPaused(false);
|
connection.player.setPaused(false);
|
||||||
if (member.id !== newMember.id) {
|
if (member.id !== newMember.id) {
|
||||||
players.set(connection.voiceChannel.guildID, { player: connection.player, type: connection.type, host: newMember.id, voiceChannel: connection.voiceChannel, originalChannel: connection.originalChannel, loop: connection.loop, shuffle: connection.shuffle, playMessage: connection.playMessage });
|
players.set(connection.voiceChannel.guildID, { player: connection.player, type: connection.type, host: newMember.id, voiceChannel: connection.voiceChannel, originalChannel: connection.originalChannel, loop: connection.loop, shuffle: connection.shuffle, playMessage: connection.playMessage });
|
||||||
|
@ -29,19 +31,20 @@ export default async (client, member, oldChannel) => {
|
||||||
try {
|
try {
|
||||||
await waitMessage.delete();
|
await waitMessage.delete();
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to delete wait message ${waitMessage.id}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to delete wait message ${waitMessage.id}`);
|
||||||
}
|
}
|
||||||
|
if (cancel) return;
|
||||||
try {
|
try {
|
||||||
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to leave voice channel ${connection.originalChannel.guildID}`);
|
||||||
}
|
}
|
||||||
players.delete(connection.originalChannel.guildID);
|
players.delete(connection.originalChannel.guildID);
|
||||||
queues.delete(connection.originalChannel.guildID);
|
queues.delete(connection.originalChannel.guildID);
|
||||||
|
@ -58,13 +61,13 @@ export default async (client, member, oldChannel) => {
|
||||||
content: "🔊 Waiting 10 seconds for the host to return..."
|
content: "🔊 Waiting 10 seconds for the host to return..."
|
||||||
});
|
});
|
||||||
const awaitRejoin = new AwaitRejoin(oldChannel, false, member.id);
|
const awaitRejoin = new AwaitRejoin(oldChannel, false, member.id);
|
||||||
awaitRejoin.on("end", async (rejoined) => {
|
awaitRejoin.once("end", async (rejoined) => {
|
||||||
isWaiting.delete(oldChannel.id);
|
isWaiting.delete(oldChannel.id);
|
||||||
if (rejoined) {
|
if (rejoined) {
|
||||||
try {
|
try {
|
||||||
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to delete wait message ${waitMessage.id}`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const members = oldChannel.voiceMembers.filter((i) => i.id !== client.user.id && !i.bot);
|
const members = oldChannel.voiceMembers.filter((i) => i.id !== client.user.id && !i.bot);
|
||||||
|
@ -72,12 +75,12 @@ export default async (client, member, oldChannel) => {
|
||||||
try {
|
try {
|
||||||
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
if (waitMessage.channel.messages.has(waitMessage.id)) await waitMessage.delete();
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to delete wait message ${waitMessage.id}`);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to leave voice channel ${connection.originalChannel.guildID}`);
|
||||||
}
|
}
|
||||||
players.delete(connection.originalChannel.guildID);
|
players.delete(connection.originalChannel.guildID);
|
||||||
queues.delete(connection.originalChannel.guildID);
|
queues.delete(connection.originalChannel.guildID);
|
||||||
|
@ -99,7 +102,7 @@ export default async (client, member, oldChannel) => {
|
||||||
try {
|
try {
|
||||||
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
connection.player.node.leaveChannel(connection.originalChannel.guildID);
|
||||||
} catch {
|
} catch {
|
||||||
// no-op
|
logger.warn(`Failed to leave voice channel ${connection.originalChannel.guildID}`);
|
||||||
}
|
}
|
||||||
players.delete(connection.originalChannel.guildID);
|
players.delete(connection.originalChannel.guildID);
|
||||||
queues.delete(connection.originalChannel.guildID);
|
queues.delete(connection.originalChannel.guildID);
|
||||||
|
|
Loading…
Reference in New Issue