Skip to content

Commit 1062579

Browse files
fix: tsc not all code paths return a value errors
1 parent d053f47 commit 1062579

File tree

2 files changed

+40
-29
lines changed

2 files changed

+40
-29
lines changed

src/commands/music/connect.ts

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,42 @@ export class DisconnectCommand extends Command {
2424
public override async chatInputRun(
2525
interaction: Command.ChatInputCommandInteraction
2626
) {
27-
if (interaction.member instanceof GuildMember) {
28-
const { emojis, voice, options } = this.container.client.utils;
29-
const permissions = voice(interaction);
27+
if (!(interaction.member instanceof GuildMember)) {
28+
return interaction.reply('You need to be GuildMember');
29+
}
3030

31-
if (permissions.member)
32-
return interaction.reply({
33-
content: permissions.member,
34-
ephemeral: true,
35-
});
36-
if (permissions.client)
37-
return interaction.reply({
38-
content: permissions.client,
39-
ephemeral: true,
40-
});
41-
const queue = useQueue(interaction.guild!.id);
42-
const player = useMainPlayer();
31+
const { emojis, voice, options } = this.container.client.utils;
32+
const permissions = voice(interaction);
4333

44-
if (queue)
45-
return interaction.reply({
46-
content: `${emojis.error} | I am **already** in a voice channel`,
47-
ephemeral: true,
48-
});
34+
if (permissions.member) {
35+
return interaction.reply({
36+
content: permissions.member,
37+
ephemeral: true,
38+
});
39+
}
40+
if (permissions.client) {
41+
return interaction.reply({
42+
content: permissions.client,
43+
ephemeral: true,
44+
});
45+
}
4946

50-
const newQueue = player?.queues.create(
51-
interaction.guild!.id,
52-
options(interaction)
53-
);
54-
await newQueue?.connect(interaction.member.voice.channel!.id);
47+
const player = useMainPlayer();
48+
const queue = useQueue(interaction.guild!.id);
49+
if (queue) {
5550
return interaction.reply({
56-
content: `${emojis.success} | I have **successfully connected** to the voice channel`,
51+
content: `${emojis.error} | I am **already** in a voice channel`,
52+
ephemeral: true,
5753
});
5854
}
55+
56+
const newQueue = player?.queues.create(
57+
interaction.guild!.id,
58+
options(interaction)
59+
);
60+
await newQueue?.connect(interaction.member.voice.channel!.id);
61+
return interaction.reply({
62+
content: `${emojis.success} | I have **successfully connected** to the voice channel`,
63+
});
5964
}
6065
}

src/utilities/auricle-utils.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ export function voice(
6060
const memberVoice = (interaction.member as GuildMember).voice;
6161
return {
6262
get member() {
63-
if (!memberVoice.channel)
63+
if (!memberVoice.channel) {
6464
return `${emojis.error} | You **need** to be in a voice channel.`;
65+
}
66+
return;
6567
},
6668
get client() {
6769
const resolved = new PermissionsBitField([
@@ -73,19 +75,23 @@ export function voice(
7375
?.permissionsFor(interaction.guild!.members.me!)
7476
.missing(resolved);
7577

76-
if (missingPerms && missingPerms.length > 0)
78+
if (missingPerms && missingPerms.length > 0) {
7779
return `${
7880
emojis.error
7981
} | I am **missing** the required voice channel permissions: \`${missingPerms.join(
8082
', '
8183
)}\``;
84+
}
85+
return;
8286
},
8387
get clientToMember() {
8488
if (
8589
interaction.guild?.members.me?.voice.channelId &&
8690
memberVoice.channelId !== interaction.guild?.members.me?.voice.channelId
87-
)
91+
) {
8892
return `${emojis.error} | You are **not** in my voice channel`;
93+
}
94+
return;
8995
},
9096
};
9197
}

0 commit comments

Comments
 (0)