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

Allow more color formats in !post_embed / !edit_embed -color

Browse source
This commit is contained in:
Dragory 2020-08-09 20:21:01 +03:00
parent a641312853
commit 8826b2521d
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
6 changed files with 72 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/plugins/Post/commands/EditEmbedCmd.ts
View file

@ -4,6 +4,8 @@ import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
import { Embed } from "eris";
import { trimLines } from "src/utils";
import { formatContent } from "../util/formatContent";
import { parseColor } from "../../../utils/parseColor";
import { rgbToInt } from "../../../utils/rgbToInt";
const COLOR_MATCH_REGEX = /^#?([0-9a-f]{6})$/;
@ -31,13 +33,13 @@ export const EditEmbedCmd = postCmd({
let color = null;
if (args.color) {
const colorMatch = args.color.match(COLOR_MATCH_REGEX);
if (!colorMatch) {
sendErrorMessage(pluginData, msg.channel, "Invalid color specified, use hex colors");
const colorRgb = parseColor(args.color);
if (colorRgb) {
color = rgbToInt(colorRgb);
} else {
sendErrorMessage(pluginData, msg.channel, "Invalid color specified");
return;
}
color = parseInt(colorMatch[1], 16);
}
const embed: Embed = savedMessage.data.embeds[0] as Embed;

14
backend/src/plugins/Post/commands/PostEmbedCmd.ts
View file

@ -5,8 +5,8 @@ import { sendErrorMessage } from "src/pluginUtils";
import { Embed } from "eris";
import { isValidEmbed, trimLines } from "src/utils";
import { formatContent } from "../util/formatContent";
const COLOR_MATCH_REGEX = /^#?([0-9a-f]{6})$/;
import { parseColor } from "../../../utils/parseColor";
import { rgbToInt } from "../../../utils/rgbToInt";
export const PostEmbedCmd = postCmd({
trigger: "post_embed",
@ -37,13 +37,13 @@ export const PostEmbedCmd = postCmd({
let color = null;
if (args.color) {
const colorMatch = args.color.toLowerCase().match(COLOR_MATCH_REGEX);
if (!colorMatch) {
sendErrorMessage(pluginData, msg.channel, "Invalid color specified, use hex colors");
const colorRgb = parseColor(args.color);
if (colorRgb) {
color = rgbToInt(colorRgb);
} else {
sendErrorMessage(pluginData, msg.channel, "Invalid color specified");
return;
}
color = parseInt(colorMatch[1], 16);
}
let embed: Embed = { type: "rich" };