StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-11 20:55:01 +00:00
Code Releases Activity

Type fixes + use template safe values for renderTemplate() everywhere

Browse source
This commit is contained in:
Dragory 2021-08-18 20:32:45 +03:00
parent e16eb8c8d1
commit d109a58cb7
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
21 changed files with 190 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

32
backend/src/plugins/CustomEvents/CustomEventsPlugin.ts
View file

@ -1,9 +1,18 @@
import { parseSignature, typedGuildCommand } from "knub";
import { commandTypes } from "../../commandTypes";
import { stripObjectToScalars } from "../../utils";
import { stripObjectToScalars, UnknownUser } from "../../utils";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
import { runEvent } from "./functions/runEvent";
import { ConfigSchema, CustomEventsPluginType } from "./types";
import { createTypedTemplateSafeValueContainer, TemplateSafeValueContainer } from "../../templateFormatter";
import { Channel, GuildChannel, GuildMember, ThreadChannel, User } from "discord.js";
import {
channelToTemplateSafeChannel,
memberToTemplateSafeMember,
messageToTemplateSafeMessage,
userToTemplateSafeUser,
} from "../../utils/templateSafeObjects";
import { isScalar } from "../../utils/isScalar";
const defaultOptions = {
config: {
@ -28,8 +37,25 @@ export const CustomEventsPlugin = zeppelinGuildPlugin<CustomEventsPluginType>()(
permission: `events.${key}.trigger.can_use`,
signature,
run({ message, args }) {
const strippedMsg = stripObjectToScalars(message, ["channel", "author"]);
runEvent(pluginData, event, { msg: message, args }, { args, msg: strippedMsg });
const safeArgs = new TemplateSafeValueContainer();
for (const [argKey, argValue] of Object.entries(args as Record<string, unknown>)) {
if (argValue instanceof User || argValue instanceof UnknownUser) {
safeArgs[argKey] = userToTemplateSafeUser(argValue);
} else if (argValue instanceof GuildMember) {
safeArgs[argKey] = memberToTemplateSafeMember(argValue);
} else if (argValue instanceof GuildChannel || argValue instanceof ThreadChannel) {
safeArgs[argKey] = channelToTemplateSafeChannel(argValue);
} else if (isScalar(argValue)) {
safeArgs[argKey] = argValue;
}
}
const values = createTypedTemplateSafeValueContainer({
...args,
msg: messageToTemplateSafeMessage(message),
});
runEvent(pluginData, event, { msg: message, args }, values);
},
});
pluginData.commands.add(eventCommand);