StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-15 13:51:51 +00:00
Code Releases Activity

fix: leave_voice_channel not triggering

Browse source
This commit is contained in:
Almeida 2021-05-07 20:32:33 +01:00 • committed by almeidx
parent 03ead92c19
commit ca7b05ce78
No known key found for this signature in database
GPG key ID: C5FF0C40763546C5
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/src/plugins/Automod/triggers/joinVoiceChannel.ts
View file

@ -1,5 +1,6 @@
import * as t from "io-ts";
import { automodTrigger } from "../helpers";
import { Constants } from "eris";
interface JoinVoiceChannelResult {
matchedChannelId: string;
@ -11,18 +12,19 @@ export const JoinVoiceChannelTrigger = automodTrigger<JoinVoiceChannelResult>()(
defaultConfig: "",
async match({ triggerConfig, context }) {
if (!context.member || !context.voiceChannel) {
const matchedChannelId = context.voiceChannel?.joined?.id;
if (!context.member || !matchedChannelId) {
return;
}
const triggerChannels = Array.isArray(triggerConfig) ? triggerConfig : [triggerConfig];
if (!triggerChannels.includes(context.voiceChannel.id)) {
if (!triggerChannels.includes(matchedChannelId)) {
return;
}
return {
extra: {
matchedChannelId: context.voiceChannel.id,
matchedChannelId,
},
};
},
@ -32,6 +34,7 @@ export const JoinVoiceChannelTrigger = automodTrigger<JoinVoiceChannelResult>()(
const channelName = channel?.name || "Unknown";
const member = contexts[0].member!;
const memberName = `**${member.user.username}#${member.user.discriminator}** (\`${member.id}\`)`;
return `${memberName} has joined the ${channelName} (\`${matchResult.extra.matchedChannelId}\`) voice channel`;
const voiceOrStage = channel?.type === Constants.ChannelTypes.GUILD_STAGE ? "stage" : "voice";
return `${memberName} has joined the ${channelName} (\`${matchResult.extra.matchedChannelId}\`) ${voiceOrStage} channel`;
},
});

11
backend/src/plugins/Automod/triggers/leaveVoiceChannel.ts
View file

@ -1,3 +1,4 @@
import { Constants } from "eris";
import * as t from "io-ts";
import { automodTrigger } from "../helpers";
@ -11,18 +12,19 @@ export const LeaveVoiceChannelTrigger = automodTrigger<LeaveVoiceChannelResult>(
defaultConfig: "",
async match({ triggerConfig, context }) {
if (!context.member || !context.voiceChannel) {
const matchedChannelId = context.voiceChannel?.left?.id;
if (!context.member || !matchedChannelId) {
return;
}
const triggerChannels = Array.isArray(triggerConfig) ? triggerConfig : [triggerConfig];
if (!triggerChannels.includes(context.voiceChannel.id)) {
if (!triggerChannels.includes(matchedChannelId)) {
return;
}
return {
extra: {
matchedChannelId: context.voiceChannel.id,
matchedChannelId,
},
};
},
@ -32,6 +34,7 @@ export const LeaveVoiceChannelTrigger = automodTrigger<LeaveVoiceChannelResult>(
const channelName = channel?.name || "Unknown";
const member = contexts[0].member!;
const memberName = `**${member.user.username}#${member.user.discriminator}** (\`${member.id}\`)`;
return `${memberName} has left the ${channelName} (\`${matchResult.extra.matchedChannelId}\`) voice channel`;
const voiceOrStage = channel?.type === Constants.ChannelTypes.GUILD_STAGE ? "stage" : "voice";
return `${memberName} has left the ${channelName} (\`${matchResult.extra.matchedChannelId}\`) ${voiceOrStage} channel`;
},
});