StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't send null/undefined as audit log reasons

Browse source
This commit is contained in:
Dragory 2020-08-05 02:54:02 +03:00
parent b2a67523a1
commit ceb567ad9a
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/ModActions/commands/ForcebanCmd.ts
View file

@ -64,7 +64,7 @@ export const ForcebanCmd = modActionsCommand({
pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_BAN, user.id); pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_BAN, user.id);
try { try {
await pluginData.guild.banMember(user.id, 1, encodeURIComponent(reason)); await pluginData.guild.banMember(user.id, 1, reason != null ? encodeURIComponent(reason) : undefined);
} catch (e) { } catch (e) {
sendErrorMessage(pluginData, msg.channel, "Failed to forceban member"); sendErrorMessage(pluginData, msg.channel, "Failed to forceban member");
return; return;

2
backend/src/plugins/ModActions/commands/MassBanCmd.ts
View file

@ -66,7 +66,7 @@ export const MassbanCmd = modActionsCommand({
const casesPlugin = pluginData.getPlugin(CasesPlugin); const casesPlugin = pluginData.getPlugin(CasesPlugin);
for (const userId of args.userIds) { for (const userId of args.userIds) {
try { try {
await pluginData.guild.banMember(userId, 1, encodeURIComponent(banReason)); await pluginData.guild.banMember(userId, 1, banReason != null ? encodeURIComponent(banReason) : undefined);
await casesPlugin.createCase({ await casesPlugin.createCase({
userId, userId,

2
backend/src/plugins/ModActions/commands/UnbanCmd.ts
View file

@ -46,7 +46,7 @@ export const UnbanCmd = modActionsCommand({
try { try {
ignoreEvent(pluginData, IgnoredEventType.Unban, user.id); ignoreEvent(pluginData, IgnoredEventType.Unban, user.id);
await pluginData.guild.unbanMember(user.id, encodeURIComponent(reason)); await pluginData.guild.unbanMember(user.id, reason != null ? encodeURIComponent(reason) : undefined);
} catch (e) { } catch (e) {
sendErrorMessage(pluginData, msg.channel, "Failed to unban member; are you sure they're banned?"); sendErrorMessage(pluginData, msg.channel, "Failed to unban member; are you sure they're banned?");
return; return;

6
backend/src/plugins/ModActions/functions/banUserId.ts
View file

@ -40,7 +40,11 @@ export async function banUserId(
ignoreEvent(pluginData, IgnoredEventType.Ban, userId); ignoreEvent(pluginData, IgnoredEventType.Ban, userId);
try { try {
const deleteMessageDays = Math.min(30, Math.max(0, banOptions.deleteMessageDays ?? 1)); const deleteMessageDays = Math.min(30, Math.max(0, banOptions.deleteMessageDays ?? 1));
await pluginData.guild.banMember(userId, deleteMessageDays, encodeURIComponent(reason)); await pluginData.guild.banMember(
userId,
deleteMessageDays,
reason != null ? encodeURIComponent(reason) : undefined,
);
} catch (e) { } catch (e) {
return { return {
status: "failed", status: "failed",