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

Improve voice connection checking, take advantage of optional chaining operators

Browse source
This commit is contained in:
Essem 2022-07-23 16:02:04 -05:00
parent df43f9eb9d
commit 398ce07bd2
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
11 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/handler.js
View file

@ -75,7 +75,7 @@ export async function update() {
};
info.set(name, cmdInfo);
}
if (cmdInfo && cmdInfo.slashAllowed) commandArray.push({
if (cmdInfo?.slashAllowed) commandArray.push({
name,
type: 1,
description: cmdInfo.description,

4
utils/misc.js
View file

@ -14,7 +14,7 @@ const optionalReplace = (token) => {
// clean(text) to clean message of any private info or mentions
export async function clean(text) {
if (text && text.constructor && text.constructor.name == "Promise")
if (text?.constructor?.name == "Promise")
text = await text;
if (typeof text !== "string")
text = util.inspect(text, { depth: 1 });
@ -26,7 +26,7 @@ export async function clean(text) {
const { parsed } = config();
const imageServers = JSON.parse(fs.readFileSync(new URL("../servers.json", import.meta.url), { encoding: "utf8" })).image;
if (imageServers && imageServers.length !== 0) {
if (imageServers?.length !== 0) {
for (const { server, auth } of imageServers) {
text = text.replaceAll(server, optionalReplace(server));
text = text.replaceAll(auth, optionalReplace(auth));

2
utils/services/image.js
View file

@ -153,7 +153,7 @@ class ImageWorker extends BaseServiceWorker {
if (connection.conn.readyState !== 0 && connection.conn.readyState !== 1) {
continue;
}
if (object.params.type && connection.formats[object.cmd] && !connection.formats[object.cmd].includes(object.params.type)) continue;
if (object.params.type && !connection.formats[object.cmd]?.includes(object.params.type)) continue;
idealServers.push({
addr: address,
load: connection.njobs / connection.max

33
utils/soundplayer.js
View file

@ -65,8 +65,8 @@ export async function play(client, sound, options, music = false) {
if (!options.channel.guild.permissionsOf(client.user.id).has("voiceConnect")) return "I can't join this voice channel!";
const voiceChannel = options.channel.guild.channels.get(options.member.voiceState.channelID);
if (!voiceChannel.permissionsOf(client.user.id).has("voiceConnect")) return "I don't have permission to join this voice channel!";
const player = players.get(options.channel.guild.id);
if (!music && manager.players.has(options.channel.guild.id) && (player && player.type === "music")) return "I can't play a sound effect while playing music!";
const playerMeta = players.get(options.channel.guild.id);
if (!music && manager.players.has(options.channel.guild.id) && (playerMeta?.type === "music")) return "I can't play a sound effect while playing music!";
let node = manager.getNode();
if (!node) {
const status = await checkStatus();
@ -94,17 +94,26 @@ export async function play(client, sound, options, music = false) {
const playlistTracks = response.playlistInfo.selectedTrack ? sortedTracks : [sortedTracks[0]];
queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, ...playlistTracks] : playlistTracks);
}
const connection = player && player.player && player.player.connection.state !== 3 && player.player.connection.state !== 1 ? player.player : await node.joinChannel({
let player;
if (node.players.has(voiceChannel.guild.id)) {
player = node.players.get(voiceChannel.guild.id);
} else if (playerMeta?.player) {
const storedState = playerMeta?.player?.connection.state;
if (storedState && storedState === 1) {
player = playerMeta?.player;
}
}
const connection = player ?? await node.joinChannel({
guildId: voiceChannel.guild.id,
channelId: voiceChannel.id,
shardId: voiceChannel.guild.shard.id,
deaf: true
});
if (oldQueue && oldQueue.length !== 0 && music) {
if (oldQueue?.length && music) {
return `Your ${response.playlistInfo.name ? "playlist" : "tune"} \`${response.playlistInfo.name ? response.playlistInfo.name.trim() : (response.tracks[0].info.title !== "" ? response.tracks[0].info.title.trim() : "(blank)")}\` has been added to the queue!`;
} else {
nextSong(client, options, connection, response.tracks[0].track, response.tracks[0].info, music, voiceChannel, player ? player.host : options.member.id, player ? player.loop : false, player ? player.shuffle : false);
nextSong(client, options, connection, response.tracks[0].track, response.tracks[0].info, music, voiceChannel, playerMeta?.host ?? options.member.id, playerMeta?.loop ?? false, playerMeta?.shuffle ?? false);
return;
}
}
@ -135,11 +144,11 @@ export async function nextSong(client, options, connection, track, info, music,
},
fields: [{
name: "ℹ️ Title:",
value: info.title && info.title.trim() !== "" ? info.title : "(blank)"
value: info.title?.trim() !== "" ? info.title : "(blank)"
},
{
name: "🎤 Artist:",
value: info.title && info.author.trim() !== "" ? info.author : "(blank)"
value: info.author?.trim() !== "" ? info.author : "(blank)"
},
{
name: "💬 Channel:",
@ -147,7 +156,7 @@ export async function nextSong(client, options, connection, track, info, music,
},
{
name: "🌐 Node:",
value: connection.node ? connection.node.name : "Unknown"
value: connection.node?.name ?? "Unknown"
},
{
name: `${"▬".repeat(parts)}🔘${"▬".repeat(10 - parts)}`,
@ -209,7 +218,7 @@ export async function nextSong(client, options, connection, track, info, music,
players.set(voiceChannel.guild.id, player);
}
let newQueue;
if (player && player.shuffle) {
if (player?.shuffle) {
if (player.loop) {
queue.push(queue.shift());
} else {
@ -217,7 +226,7 @@ export async function nextSong(client, options, connection, track, info, music,
}
queue.unshift(queue.splice(Math.floor(Math.random() * queue.length), 1)[0]);
newQueue = queue;
} else if (player && player.loop) {
} else if (player?.loop) {
queue.push(queue.shift());
newQueue = queue;
} else {
@ -246,14 +255,14 @@ export async function nextSong(client, options, connection, track, info, music,
}
try {
if (playingMessage.channel.messages.has(playingMessage.id)) await playingMessage.delete();
if (player && player.playMessage.channel.messages.has(player.playMessage.id)) await player.playMessage.delete();
if (player?.playMessage.channel.messages.has(player.playMessage.id)) await player.playMessage.delete();
} catch {
// no-op
}
} else {
try {
if (playingMessage.channel.messages.has(playingMessage.id)) await playingMessage.delete();
if (player && player.playMessage.channel.messages.has(player.playMessage.id)) await player.playMessage.delete();
if (player?.playMessage.channel.messages.has(player.playMessage.id)) await player.playMessage.delete();
} catch {
// no-op
}