StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-23 17:45:03 +00:00
Code Releases Activity

refactor: require reason on warnings and notes

Browse source
This commit is contained in:
Hiroyuki 2021-09-14 11:25:45 -04:00
parent e5493742f5
commit c9a2259668
No known key found for this signature in database
GPG key ID: 258488F5F6FE3CAE
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/src/plugins/ModActions/commands/NoteCmd.ts
View file

@ -32,10 +32,9 @@ export const NoteCmd = modActionsCmd({
} }
const userName = user.tag; const userName = user.tag;
const config = pluginData.config.get(); const content = formatReasonWithAttachments(args.note, [...msg.attachments.values()]);
const reason = formatReasonWithAttachments(args.note, [...msg.attachments.values()]); if (!content) {
if (!reason && config.require_reason.includes("note")) { sendErrorMessage(pluginData, msg.channel, "You must include content for your note");
sendErrorMessage(pluginData, msg.channel, "You must include a reason in your note");
return; return;
} }
@ -44,18 +43,18 @@ export const NoteCmd = modActionsCmd({
userId: user.id, userId: user.id,
modId: msg.author.id, modId: msg.author.id,
type: CaseTypes.Note, type: CaseTypes.Note,
reason, reason: content,
}); });
pluginData.getPlugin(LogsPlugin).logMemberNote({ pluginData.getPlugin(LogsPlugin).logMemberNote({
mod: msg.author, mod: msg.author,
user, user,
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason: content,
}); });
sendSuccessMessage(pluginData, msg.channel, `Note added on **${userName}** (Case #${createdCase.case_number})`); sendSuccessMessage(pluginData, msg.channel, `Note added on **${userName}** (Case #${createdCase.case_number})`);
pluginData.state.events.emit("note", user.id, reason); pluginData.state.events.emit("note", user.id, content);
}, },
}); });

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

@ -64,7 +64,7 @@ export const WarnCmd = modActionsCmd({
const config = pluginData.config.get(); const config = pluginData.config.get();
const reason = formatReasonWithAttachments(args.reason, [...msg.attachments.values()]); const reason = formatReasonWithAttachments(args.reason, [...msg.attachments.values()]);
if (!reason && config.require_reason.includes("warn")) { if (!reason) {
sendErrorMessage(pluginData, msg.channel, "You must include a reason in your warning"); sendErrorMessage(pluginData, msg.channel, "You must include a reason in your warning");
return; return;
} }