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

Fix being unable to !post to announcement channels or threads

Browse source
This commit is contained in:
Dragory 2021-08-21 00:59:51 +03:00
parent ca9ea60082
commit 05df81ddca
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/plugins/Logs/logFunctions/logRepeatedMessage.ts
View file

@ -3,12 +3,12 @@ import { LogsPluginType } from "../types";
import { LogType } from "../../../data/LogType";
import { log } from "../util/log";
import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter";
import { BaseGuildTextChannel, User } from "discord.js";
import { BaseGuildTextChannel, ThreadChannel, User } from "discord.js";
import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
interface LogRepeatedMessageData {
author: User;
channel: BaseGuildTextChannel;
channel: BaseGuildTextChannel | ThreadChannel;
datetime: string;
date: string;
time: string;

4
backend/src/plugins/Logs/logFunctions/logScheduledMessage.ts
View file

@ -3,12 +3,12 @@ import { LogsPluginType } from "../types";
import { LogType } from "../../../data/LogType";
import { log } from "../util/log";
import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter";
import { BaseGuildTextChannel, User } from "discord.js";
import { BaseGuildTextChannel, ThreadChannel, User } from "discord.js";
import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
interface LogScheduledMessageData {
author: User;
channel: BaseGuildTextChannel;
channel: BaseGuildTextChannel | ThreadChannel;
datetime: string;
date: string;
time: string;

4
backend/src/plugins/Logs/logFunctions/logScheduledRepeatedMessage.ts
View file

@ -3,12 +3,12 @@ import { LogsPluginType } from "../types";
import { LogType } from "../../../data/LogType";
import { log } from "../util/log";
import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter";
import { BaseGuildTextChannel, User } from "discord.js";
import { BaseGuildTextChannel, ThreadChannel, User } from "discord.js";
import { channelToTemplateSafeChannel, userToTemplateSafeUser } from "../../../utils/templateSafeObjects";
interface LogScheduledRepeatedMessageData {
author: User;
channel: BaseGuildTextChannel;
channel: BaseGuildTextChannel | ThreadChannel;
datetime: string;
date: string;
time: string;

10
backend/src/plugins/Post/util/actualPostCmd.ts
View file

@ -1,4 +1,4 @@
import { Channel, Message, TextChannel } from "discord.js";
import { Channel, Message, NewsChannel, TextChannel, ThreadChannel } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
@ -29,8 +29,12 @@ export async function actualPostCmd(
"repeat-times"?: number;
} = {},
) {
if (!(targetChannel instanceof TextChannel)) {
msg.channel.send(errorMessage("Channel is not a text channel"));
if (
!(targetChannel instanceof TextChannel) &&
!(targetChannel instanceof NewsChannel) &&
!(targetChannel instanceof ThreadChannel)
) {
msg.channel.send(errorMessage("Specified channel is not a text channel, announcement channel, or thread"));
return;
}

4
backend/src/plugins/Post/util/postMessage.ts
View file

@ -1,4 +1,4 @@
import { Message, MessageAttachment, MessageOptions, TextChannel } from "discord.js";
import { Message, MessageAttachment, MessageOptions, NewsChannel, TextChannel, ThreadChannel } from "discord.js";
import fs from "fs";
import { GuildPluginData } from "knub";
import { downloadFile } from "../../../utils";
@ -9,7 +9,7 @@ const fsp = fs.promises;
export async function postMessage(
pluginData: GuildPluginData<PostPluginType>,
channel: TextChannel,
channel: TextChannel | NewsChannel | ThreadChannel,
content: MessageOptions,
attachments: MessageAttachment[] = [],
enableMentions: boolean = false,