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

Fix logAutomodAction error if Automod context doesn't include a user

Browse source
This commit is contained in:
Dragory 2021-08-21 01:41:42 +03:00
parent 204a8619ae
commit 3c8355babf
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/src/plugins/Logs/logFunctions/logAutomodAction.ts
View file

@ -8,7 +8,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
interface LogAutomodActionData { interface LogAutomodActionData {
rule: string; rule: string;
user: User; user?: User | null;
users: User[]; users: User[];
actionsTaken: string; actionsTaken: string;
matchSummary: string; matchSummary: string;
@ -20,14 +20,14 @@ export function logAutomodAction(pluginData: GuildPluginData<LogsPluginType>, da
LogType.AUTOMOD_ACTION, LogType.AUTOMOD_ACTION,
createTypedTemplateSafeValueContainer({ createTypedTemplateSafeValueContainer({
rule: data.rule, rule: data.rule,
user: userToTemplateSafeUser(data.user), user: data.user ? userToTemplateSafeUser(data.user) : null,
users: data.users.map(user => userToTemplateSafeUser(user)), users: data.users.map(user => userToTemplateSafeUser(user)),
actionsTaken: data.actionsTaken, actionsTaken: data.actionsTaken,
matchSummary: data.matchSummary ?? "", matchSummary: data.matchSummary ?? "",
}), }),
{ {
userId: data.user.id, userId: data.user ? data.user.id : null,
bot: data.user.bot, bot: data.user ? data.user.bot : false,
}, },
); );
} }

2
backend/src/plugins/Logs/types.ts
View file

@ -458,7 +458,7 @@ export const LogTypeData = z.object({
[LogType.AUTOMOD_ACTION]: z.object({ [LogType.AUTOMOD_ACTION]: z.object({
rule: z.string(), rule: z.string(),
user: z.instanceof(TemplateSafeUser), user: z.instanceof(TemplateSafeUser).nullable(),
users: z.array(z.instanceof(TemplateSafeUser)), users: z.array(z.instanceof(TemplateSafeUser)),
actionsTaken: z.string(), actionsTaken: z.string(),
matchSummary: z.string(), matchSummary: z.string(),