Finish preliminary rework, ready to test

This commit is contained in:
Dark 2021-06-02 04:07:50 +02:00
parent 57893e7f76
commit d0a1beb809
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
177 changed files with 854 additions and 707 deletions

View file

@ -2,6 +2,7 @@ import { postCmd } from "../types";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { formatContent } from "../util/formatContent";
import { TextChannel } from "discord.js";
export const EditCmd = postCmd({
trigger: "edit",
@ -24,7 +25,9 @@ export const EditCmd = postCmd({
return;
}
await pluginData.client.editMessage(savedMessage.channel_id, savedMessage.id, formatContent(args.content));
(pluginData.guild.channels.cache.get(savedMessage.channel_id) as TextChannel).messages.edit(savedMessage.id, {
content: formatContent(args.content),
});
sendSuccessMessage(pluginData, msg.channel, "Message edited");
},
});

View file

@ -6,6 +6,7 @@ import { trimLines } from "../../../utils";
import { formatContent } from "../util/formatContent";
import { parseColor } from "../../../utils/parseColor";
import { rgbToInt } from "../../../utils/rgbToInt";
import { MessageEmbed, TextChannel } from "discord.js";
const COLOR_MATCH_REGEX = /^#?([0-9a-f]{6})$/;
@ -42,17 +43,19 @@ export const EditEmbedCmd = postCmd({
}
}
const embed: Embed = savedMessage.data.embeds![0] as Embed;
const embed: MessageEmbed = savedMessage.data.embeds![0] as MessageEmbed;
if (args.title) embed.title = args.title;
if (content) embed.description = formatContent(content);
if (color) embed.color = color;
await pluginData.client.editMessage(savedMessage.channel_id, savedMessage.id, { embed });
(pluginData.guild.channels.cache.get(savedMessage.channel_id) as TextChannel).messages.edit(savedMessage.id, {
embed,
});
await sendSuccessMessage(pluginData, msg.channel, "Embed edited");
if (args.content) {
const prefix = pluginData.fullConfig.prefix || "!";
msg.channel.createMessage(
msg.channel.send(
trimLines(`
<@!${msg.author.id}> You can now specify an embed's content directly at the end of the command:
\`${prefix}edit_embed -title "Some title" content goes here\`

View file

@ -7,6 +7,7 @@ import { isValidEmbed, trimLines } from "../../../utils";
import { formatContent } from "../util/formatContent";
import { parseColor } from "../../../utils/parseColor";
import { rgbToInt } from "../../../utils/rgbToInt";
import { MessageEmbed, MessageEmbedOptions } from "discord.js";
export const PostEmbedCmd = postCmd({
trigger: "post_embed",
@ -46,7 +47,7 @@ export const PostEmbedCmd = postCmd({
}
}
let embed: Embed = { type: "rich" };
let embed: MessageEmbedOptions = {};
if (args.title) embed.title = args.title;
if (color) embed.color = color;
@ -73,7 +74,7 @@ export const PostEmbedCmd = postCmd({
if (args.content) {
const prefix = pluginData.fullConfig.prefix || "!";
msg.channel.createMessage(
msg.channel.send(
trimLines(`
<@!${msg.author.id}> You can now specify an embed's content directly at the end of the command:
\`${prefix}edit_embed -title "Some title" content goes here\`

View file

@ -20,7 +20,7 @@ export const ScheduledPostsListCmd = postCmd({
async run({ message: msg, pluginData }) {
const scheduledPosts = await pluginData.state.scheduledPosts.all();
if (scheduledPosts.length === 0) {
msg.channel.createMessage("No scheduled posts");
msg.channel.send("No scheduled posts");
return;
}

View file

@ -3,6 +3,7 @@ import { sorter } from "../../../utils";
import { sendErrorMessage } from "../../../pluginUtils";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { postMessage } from "../util/postMessage";
import { TextChannel } from "discord.js";
export const ScheduledPostsShowCmd = postCmd({
trigger: ["scheduled_posts", "scheduled_posts show"],