StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-12 04: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

17
backend/src/plugins/WelcomeMessage/events/SendWelcomeMessageEvt.ts
View file

@ -1,11 +1,12 @@
import { Snowflake, TextChannel } from "discord.js";
import {
channelToTemplateSafeChannel,
guildToTemplateSafeGuild,
memberToTemplateSafeMember,
userToTemplateSafeUser,
} from "../../../utils/templateSafeObjects";
import { LogType } from "../../../data/LogType";
import { renderTemplate, TemplateParseError } from "../../../templateFormatter";
import { renderTemplate, TemplateParseError, TemplateSafeValueContainer } from "../../../templateFormatter";
import { createChunkedMessage, stripObjectToScalars, verboseChannelMention, verboseUserMention } from "../../../utils";
import { sendDM } from "../../../utils/sendDM";
import { welcomeMessageEvt } from "../types";
@ -32,12 +33,14 @@ export const SendWelcomeMessageEvt = welcomeMessageEvt({
let formatted;
try {
const strippedMember = stripObjectToScalars(member, ["user", "guild"]);
formatted = await renderTemplate(config.message, {
member: strippedMember,
user: strippedMember["user"],
guild: strippedMember["guild"],
});
formatted = await renderTemplate(
config.message,
new TemplateSafeValueContainer({
member: memberToTemplateSafeMember(member),
user: userToTemplateSafeUser(member.user),
guild: guildToTemplateSafeGuild(member.guild),
}),
);
} catch (e) {
if (e instanceof TemplateParseError) {
pluginData.getPlugin(LogsPlugin).logBotAlert({