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

Add allowedMentions parameter to sendSuccessMessage()/sendErrorMessage()

Browse source
This commit is contained in:
Dragory 2021-01-17 21:24:23 +02:00
parent edaeb7ef0e
commit 564aaaded0
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
backend/src/pluginUtils.ts
View file

@ -2,7 +2,7 @@
* @file Utility functions that are plugin-instance-specific (i.e. use PluginData) * @file Utility functions that are plugin-instance-specific (i.e. use PluginData)
*/ */
import { GuildTextableChannel, Member, Message, TextableChannel } from "eris"; import { AdvancedMessageContent, AllowedMentions, GuildTextableChannel, Member, Message, TextableChannel } from "eris";
import { CommandContext, configUtils, ConfigValidationError, GuildPluginData, helpers, PluginOptions } from "knub"; import { CommandContext, configUtils, ConfigValidationError, GuildPluginData, helpers, PluginOptions } from "knub";
import { decodeAndValidateStrict, StrictValidationError, validate } from "./validatorUtils"; import { decodeAndValidateStrict, StrictValidationError, validate } from "./validatorUtils";
import { deepKeyIntersect, errorMessage, successMessage, tDeepPartial, tNullable } from "./utils"; import { deepKeyIntersect, errorMessage, successMessage, tDeepPartial, tNullable } from "./utils";
@ -141,10 +141,15 @@ export function sendSuccessMessage(
pluginData: AnyPluginData<any>, pluginData: AnyPluginData<any>,
channel: TextableChannel, channel: TextableChannel,
body: string, body: string,
allowedMentions?: AllowedMentions,
): Promise<Message | undefined> { ): Promise<Message | undefined> {
const emoji = pluginData.fullConfig.success_emoji || undefined; const emoji = pluginData.fullConfig.success_emoji || undefined;
const formattedBody = successMessage(body, emoji);
const content: AdvancedMessageContent = allowedMentions
? { content: formattedBody, allowedMentions }
: { content: formattedBody };
return channel return channel
.createMessage(successMessage(body, emoji)) // Force line break .createMessage(content) // Force line break
.catch(err => { .catch(err => {
const channelInfo = (channel as GuildTextableChannel).guild const channelInfo = (channel as GuildTextableChannel).guild
? `${channel.id} (${(channel as GuildTextableChannel).guild.id})` ? `${channel.id} (${(channel as GuildTextableChannel).guild.id})`
@ -158,10 +163,15 @@ export function sendErrorMessage(
pluginData: AnyPluginData<any>, pluginData: AnyPluginData<any>,
channel: TextableChannel, channel: TextableChannel,
body: string, body: string,
allowedMentions?: AllowedMentions,
): Promise<Message | undefined> { ): Promise<Message | undefined> {
const emoji = pluginData.fullConfig.error_emoji || undefined; const emoji = pluginData.fullConfig.error_emoji || undefined;
const formattedBody = errorMessage(body, emoji);
const content: AdvancedMessageContent = allowedMentions
? { content: formattedBody, allowedMentions }
: { content: formattedBody };
return channel return channel
.createMessage(errorMessage(body, emoji)) // Force line break .createMessage(content) // Force line break
.catch(err => { .catch(err => {
const channelInfo = (channel as GuildTextableChannel).guild const channelInfo = (channel as GuildTextableChannel).guild
? `${channel.id} (${(channel as GuildTextableChannel).guild.id})` ? `${channel.id} (${(channel as GuildTextableChannel).guild.id})`