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

Button role improvements, proper validation

Browse source
This commit is contained in:
Dark 2021-06-22 02:49:31 +02:00
parent 7bf5e1f3c6
commit 653d6c1dc2
No known key found for this signature in database
GPG key ID: 384C4B4F5B1E25A8
5 changed files with 166 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/src/plugins/ReactionRoles/commands/PostButtonRolesCmd.ts
View file

@ -4,6 +4,7 @@ import { commandTypeHelpers as ct } from "../../../commandTypes";
import { reactionRolesCmd } from "../types";
import { createHash } from "crypto";
import moment from "moment";
import { splitButtonsIntoRows } from "../util/splitButtonsIntoRows";
export const PostButtonRolesCmd = reactionRolesCmd({
trigger: "reaction_roles post",
@ -16,6 +17,10 @@ export const PostButtonRolesCmd = reactionRolesCmd({
async run({ message: msg, args, pluginData }) {
const cfg = pluginData.config.get();
if (!cfg.button_groups) {
sendErrorMessage(pluginData, msg.channel, "No button groups defined in config");
return;
}
const group = cfg.button_groups[args.buttonGroup];
if (!group) {
@ -31,10 +36,11 @@ export const PostButtonRolesCmd = reactionRolesCmd({
.digest("hex");
const btn = new MessageButton()
.setLabel(button.label)
.setStyle("PRIMARY")
.setLabel(button.label ?? "")
.setStyle(button.style ?? "PRIMARY")
.setType("BUTTON")
.setCustomID(customId);
.setCustomID(customId)
.setDisabled(button.disabled ?? false);
if (button.emoji) {
const emo = pluginData.client.emojis.resolve(button.emoji) ?? button.emoji;
@ -44,10 +50,10 @@ export const PostButtonRolesCmd = reactionRolesCmd({
buttons.push(btn);
toInsert.push({ customId, buttonGroup: args.buttonGroup, buttonName });
}
const row = new MessageActionRow().addComponents(buttons);
const rows = splitButtonsIntoRows(buttons, Object.values(group.default_buttons)); // new MessageActionRow().addComponents(buttons);
try {
const newMsg = await args.channel.send({ content: group.message, components: [row], split: false });
const newMsg = await args.channel.send({ content: group.message, components: rows, split: false });
for (const btn of toInsert) {
await pluginData.state.buttonRoles.add(