Update djs & knub (#395)

* update pkgs Signed-off-by: GitHub <noreply@github.com> * new knub typings Signed-off-by: GitHub <noreply@github.com> * more pkg updates Signed-off-by: GitHub <noreply@github.com> * more fixes Signed-off-by: GitHub <noreply@github.com> * channel typings Signed-off-by: GitHub <noreply@github.com> * more message utils typings fixes Signed-off-by: GitHub <noreply@github.com> * migrate permissions Signed-off-by: GitHub <noreply@github.com> * fix: InternalPoster webhookables Signed-off-by: GitHub <noreply@github.com> * djs typings: Attachment & Util Signed-off-by: GitHub <noreply@github.com> * more typings Signed-off-by: GitHub <noreply@github.com> * fix: rename permissionNames Signed-off-by: GitHub <noreply@github.com> * more fixes Signed-off-by: GitHub <noreply@github.com> * half the number of errors * knub commands => messageCommands Signed-off-by: GitHub <noreply@github.com> * configPreprocessor => configParser Signed-off-by: GitHub <noreply@github.com> * fix channel.messages Signed-off-by: GitHub <noreply@github.com> * revert automod any typing Signed-off-by: GitHub <noreply@github.com> * more configParser typings Signed-off-by: GitHub <noreply@github.com> * revert Signed-off-by: GitHub <noreply@github.com> * remove knub type params Signed-off-by: GitHub <noreply@github.com> * fix more MessageEmbed / MessageOptions Signed-off-by: GitHub <noreply@github.com> * dumb commit for @almeidx to see why this is stupid Signed-off-by: GitHub <noreply@github.com> * temp disable custom_events Signed-off-by: GitHub <noreply@github.com> * more minor typings fixes - 23 err left Signed-off-by: GitHub <noreply@github.com> * update djs dep * +debug build method (revert this) Signed-off-by: GitHub <noreply@github.com> * Revert "+debug build method (revert this)" This reverts commit a80af1e729b742d1aad1097df538d224fbd32ce7. * Redo +debug build (Revert this) Signed-off-by: GitHub <noreply@github.com> * uniform before/after Load shorthands Signed-off-by: GitHub <noreply@github.com> * remove unused imports & add prettier plugin Signed-off-by: GitHub <noreply@github.com> * env fixes for web platform hosting Signed-off-by: GitHub <noreply@github.com> * feat: knub v32-next; related fixes * fix: allow legacy keys in change_perms action * fix: request Message Content intent * fix: use Knub's config validation logic in API * fix(dashboard): fix error when there are no message and/or slash commands in a plugin * fix(automod): start_thread action thread options * fix(CustomEvents): message command types * chore: remove unneeded type annotation * feat: add forum channel icon; use thread icon for news threads * chore: make tslint happy * chore: fix formatting --------- Signed-off-by: GitHub <noreply@github.com> Co-authored-by: almeidx <almeidx@pm.me> Co-authored-by: Dragory <2606411+Dragory@users.noreply.github.com>
2023-04-01 12:58:17 +01:00 · 2023-04-01 12:58:17 +01:00 · 06877e90cc
commit 06877e90cc
parent 293115af22
476 changed files with 2965 additions and 3251 deletions
--- a/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts
+++ b/backend/src/plugins/InternalPoster/InternalPosterPlugin.ts
@ -1,18 +1,11 @@
-import { PluginOptions, typedGuildCommand } from "knub";
-import { GuildPingableRoles } from "../../data/GuildPingableRoles";
-import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
-import { ConfigSchema, InternalPosterPluginType } from "./types";
-import {
-  getPhishermanDomainInfo,
-  hasPhishermanMasterAPIKey,
-  phishermanApiKeyIsValid,
-  reportTrackedDomainsToPhisherman,
-} from "../../data/Phisherman";
-import { mapToPublicFn } from "../../pluginUtils";
+import { PluginOptions } from "knub";
 import { Webhooks } from "../../data/Webhooks";
+import { makeIoTsConfigParser, mapToPublicFn } from "../../pluginUtils";
 import { Queue } from "../../Queue";
-import { sendMessage } from "./functions/sendMessage";
+import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
 import { editMessage } from "./functions/editMessage";
+import { sendMessage } from "./functions/sendMessage";
+import { ConfigSchema, InternalPosterPluginType } from "./types";

 const defaultOptions: PluginOptions<InternalPosterPluginType> = {
  config: {},
@ -23,7 +16,7 @@ export const InternalPosterPlugin = zeppelinGuildPlugin<InternalPosterPluginType
  name: "internal_poster",
  showInDocs: false,

-  configSchema: ConfigSchema,
+  configParser: makeIoTsConfigParser(ConfigSchema),
  defaultOptions,

  // prettier-ignore
@ -33,9 +26,11 @@ export const InternalPosterPlugin = zeppelinGuildPlugin<InternalPosterPluginType
  },

  async beforeLoad(pluginData) {
-    pluginData.state.webhooks = new Webhooks();
-    pluginData.state.queue = new Queue();
-    pluginData.state.missingPermissions = false;
-    pluginData.state.webhookClientCache = new Map();
+    const { state } = pluginData;
+
+    state.webhooks = new Webhooks();
+    state.queue = new Queue();
+    state.missingPermissions = false;
+    state.webhookClientCache = new Map();
  },
 });
--- a/backend/src/plugins/InternalPoster/functions/editMessage.ts
+++ b/backend/src/plugins/InternalPoster/functions/editMessage.ts
@ -1,14 +1,7 @@
-import {
-  Message,
-  MessageEditOptions,
-  NewsChannel,
-  TextChannel,
-  WebhookClient,
-  WebhookEditMessageOptions,
-} from "discord.js";
+import { Message, MessageEditOptions, WebhookClient, WebhookMessageEditOptions } from "discord.js";
 import { GuildPluginData } from "knub";
-import { InternalPosterPluginType } from "../types";
 import { isDiscordAPIError, noop } from "../../../utils";
+import { InternalPosterPluginType } from "../types";

 /**
 * Sends a message using a webhook or direct API requests, preferring webhooks when possible.
@ -16,14 +9,13 @@ import { isDiscordAPIError, noop } from "../../../utils";
 export async function editMessage(
  pluginData: GuildPluginData<InternalPosterPluginType>,
  message: Message,
-  content: MessageEditOptions & WebhookEditMessageOptions,
+  content: MessageEditOptions & WebhookMessageEditOptions,
 ): Promise<void> {
-  if (!(message.channel instanceof TextChannel || message.channel instanceof NewsChannel)) {
+  const channel = message.channel;
+  if (!channel.isTextBased()) {
    return;
  }

-  const channel = message.channel as TextChannel | NewsChannel;
-
  await pluginData.state.queue.add(async () => {
    if (message.webhookId) {
      const webhook = await pluginData.state.webhooks.find(message.webhookId);
--- a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts
+++ b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookClientForChannel.ts
@ -1,6 +1,6 @@
+import { WebhookClient } from "discord.js";
 import { GuildPluginData } from "knub";
 import { InternalPosterPluginType } from "../types";
-import { WebhookClient } from "discord.js";
 import { getOrCreateWebhookForChannel, WebhookableChannel } from "./getOrCreateWebhookForChannel";

 export async function getOrCreateWebhookClientForChannel(
--- a/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts
+++ b/backend/src/plugins/InternalPoster/functions/getOrCreateWebhookForChannel.ts
@ -1,13 +1,13 @@
+import { GuildBasedChannel, PermissionsBitField } from "discord.js";
 import { GuildPluginData } from "knub";
-import { InternalPosterPluginType } from "../types";
-import { AnyChannel, GuildChannel, MessageManager, NewsChannel, Permissions, TextChannel } from "discord.js";
 import { isDiscordAPIError } from "../../../utils";
+import { InternalPosterPluginType } from "../types";

 type WebhookInfo = [id: string, token: string];

-export type WebhookableChannel = Extract<AnyChannel, { createWebhook: (...args: any[]) => any }>;
+export type WebhookableChannel = Extract<GuildBasedChannel, { createWebhook: (...args: any[]) => any }>;

-export function channelIsWebhookable(channel: AnyChannel): channel is WebhookableChannel {
+export function channelIsWebhookable(channel: GuildBasedChannel): channel is WebhookableChannel {
  return "createWebhook" in channel;
 }

@ -27,9 +27,9 @@ export async function getOrCreateWebhookForChannel(

  // Create new webhook
  const member = pluginData.client.user && pluginData.guild.members.cache.get(pluginData.client.user.id);
-  if (!member || member.permissions.has(Permissions.FLAGS.MANAGE_WEBHOOKS)) {
+  if (!member || member.permissions.has(PermissionsBitField.Flags.ManageWebhooks)) {
    try {
-      const webhook = await channel.createWebhook(`Zephook ${channel.id}`);
+      const webhook = await channel.createWebhook({ name: `Zephook ${channel.id}` });
      await pluginData.state.webhooks.create({
        id: webhook.id,
        guild_id: pluginData.guild.id,
--- a/backend/src/plugins/InternalPoster/functions/sendMessage.ts
+++ b/backend/src/plugins/InternalPoster/functions/sendMessage.ts
@ -1,9 +1,9 @@
-import { GuildTextBasedChannel, MessageOptions, WebhookClient } from "discord.js";
+import { GuildTextBasedChannel, MessageCreateOptions, WebhookClient } from "discord.js";
 import { GuildPluginData } from "knub";
-import { InternalPosterPluginType } from "../types";
-import { channelIsWebhookable } from "./getOrCreateWebhookForChannel";
 import { isDiscordAPIError } from "../../../utils";
+import { InternalPosterPluginType } from "../types";
 import { getOrCreateWebhookClientForChannel } from "./getOrCreateWebhookClientForChannel";
+import { channelIsWebhookable } from "./getOrCreateWebhookForChannel";

 export type InternalPosterMessageResult = {
  id: string;
@ -12,7 +12,7 @@ export type InternalPosterMessageResult = {

 async function sendDirectly(
  channel: GuildTextBasedChannel,
-  content: MessageOptions,
+  content: MessageCreateOptions,
 ): Promise<InternalPosterMessageResult | null> {
  return channel.send(content).then((message) => ({
    id: message.id,
@ -26,7 +26,7 @@ async function sendDirectly(
 export async function sendMessage(
  pluginData: GuildPluginData<InternalPosterPluginType>,
  channel: GuildTextBasedChannel,
-  content: MessageOptions,
+  content: MessageCreateOptions,
 ): Promise<InternalPosterMessageResult | null> {
  return pluginData.state.queue.add(async () => {
    let webhookClient: WebhookClient | null = null;
--- a/backend/src/plugins/InternalPoster/types.ts
+++ b/backend/src/plugins/InternalPoster/types.ts
@ -1,8 +1,8 @@
+import { WebhookClient } from "discord.js";
 import * as t from "io-ts";
 import { BasePluginType } from "knub";
 import { Webhooks } from "../../data/Webhooks";
 import { Queue } from "../../Queue";
-import { WebhookClient } from "discord.js";

 export const ConfigSchema = t.type({});
 export type TConfigSchema = t.TypeOf<typeof ConfigSchema>;