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

Merge branch 'almeidx-knub30'

Browse source
This commit is contained in:
Dragory 2020-08-05 02:50:02 +03:00
commit ff05b28820
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
5 changed files with 6 additions and 7 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); await pluginData.guild.banMember(user.id, 1, encodeURIComponent(reason));
} 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); await pluginData.guild.banMember(userId, 1, encodeURIComponent(banReason));
await casesPlugin.createCase({ await casesPlugin.createCase({
userId, userId,

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

@ -42,17 +42,16 @@ export const UnbanCmd = modActionsCommand({
} }
pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_UNBAN, user.id); pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_UNBAN, user.id);
const reason = formatReasonWithAttachments(args.reason, msg.attachments);
try { try {
ignoreEvent(pluginData, IgnoredEventType.Unban, user.id); ignoreEvent(pluginData, IgnoredEventType.Unban, user.id);
await pluginData.guild.unbanMember(user.id); await pluginData.guild.unbanMember(user.id, encodeURIComponent(reason));
} 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;
} }
const reason = formatReasonWithAttachments(args.reason, msg.attachments);
// Create a case // Create a case
const casesPlugin = pluginData.getPlugin(CasesPlugin); const casesPlugin = pluginData.getPlugin(CasesPlugin);
const createdCase = await casesPlugin.createCase({ const createdCase = await casesPlugin.createCase({

2
backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts
View file

@ -88,7 +88,7 @@ export async function actualKickMemberCmd(
ignoreEvent(pluginData, IgnoredEventType.Unban, memberToKick.id); ignoreEvent(pluginData, IgnoredEventType.Unban, memberToKick.id);
try { try {
await pluginData.guild.unbanMember(memberToKick.id); await pluginData.guild.unbanMember(memberToKick.id, encodeURIComponent(reason));
} catch (e) { } catch (e) {
sendErrorMessage(pluginData, msg.channel, "Failed to unban the user after banning them (-clean)"); sendErrorMessage(pluginData, msg.channel, "Failed to unban the user after banning them (-clean)");
} }

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

@ -40,7 +40,7 @@ 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); await pluginData.guild.banMember(userId, deleteMessageDays, encodeURIComponent(reason));
} catch (e) { } catch (e) {
return { return {
status: "failed", status: "failed",