3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-11 04:45:02 +00:00

Fix merge conflict

This commit is contained in:
Dragory 2020-08-05 02:39:03 +03:00
commit f27050a44c
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
12 changed files with 51 additions and 10 deletions

View file

@ -64,6 +64,7 @@ export async function banUserId(
pluginData.state.serverLogs.log(LogType.MEMBER_BAN, {
mod: stripObjectToScalars(mod),
user: stripObjectToScalars(user),
caseNumber: createdCase.case_number,
reason,
});

View file

@ -62,6 +62,7 @@ export async function kickMember(
pluginData.state.serverLogs.log(LogType.MEMBER_KICK, {
mod: stripObjectToScalars(mod),
user: stripObjectToScalars(member.user),
caseNumber: createdCase.case_number,
reason,
});

View file

@ -57,6 +57,7 @@ export async function warnMember(
pluginData.state.serverLogs.log(LogType.MEMBER_WARN, {
mod: stripObjectToScalars(mod),
member: stripObjectToScalars(member, ["user", "roles"]),
caseNumber: createdCase.case_number,
reason,
});