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

Update to new Knub 30 beta. Code clean-up.

Browse source
This commit is contained in:
Dragory 2020-10-01 01:43:38 +03:00
parent 5d579446c5
commit 2f470dc37a
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
299 changed files with 1075 additions and 1004 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/src/plugins/Censor/CensorPlugin.ts
View file

@ -1,8 +1,8 @@
import { zeppelinPlugin } from "../ZeppelinPluginBlueprint";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
import { PluginOptions } from "knub";
import { ConfigSchema, CensorPluginType } from "./types";
import { GuildLogs } from "src/data/GuildLogs";
import { GuildSavedMessages } from "src/data/GuildSavedMessages";
import { GuildLogs } from "../../data/GuildLogs";
import { GuildSavedMessages } from "../../data/GuildSavedMessages";
import { onMessageCreate } from "./util/onMessageCreate";
import { onMessageUpdate } from "./util/onMessageUpdate";
import { trimPluginDescription } from "../../utils";
@ -43,7 +43,7 @@ const defaultOptions: PluginOptions<CensorPluginType> = {
],
};
export const CensorPlugin = zeppelinPlugin<CensorPluginType>()("censor", {
export const CensorPlugin = zeppelinGuildPlugin<CensorPluginType>()("censor", {
showInDocs: true,
info: {
prettyName: "Censor",

12
backend/src/plugins/Censor/types.ts
View file

@ -1,9 +1,9 @@
import * as t from "io-ts";
import { BasePluginType, eventListener } from "knub";
import { tNullable } from "src/utils";
import { TRegex } from "src/validatorUtils";
import { GuildLogs } from "src/data/GuildLogs";
import { GuildSavedMessages } from "src/data/GuildSavedMessages";
import { BasePluginType } from "knub";
import { tNullable } from "../../utils";
import { TRegex } from "../../validatorUtils";
import { GuildLogs } from "../../data/GuildLogs";
import { GuildSavedMessages } from "../../data/GuildSavedMessages";
import { RegExpRunner } from "../../RegExpRunner";
export const ConfigSchema = t.type({
@ -35,5 +35,3 @@ export interface CensorPluginType extends BasePluginType {
onMessageUpdateFn;
};
}
export const censorEvent = eventListener<CensorPluginType>();

12
backend/src/plugins/Censor/util/applyFiltersToMsg.ts
View file

@ -1,8 +1,8 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types";
import { SavedMessage } from "src/data/entities/SavedMessage";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { AnyInvite, Embed, GuildInvite } from "eris";
import { ZalgoRegex } from "src/data/Zalgo";
import { ZalgoRegex } from "../../../data/Zalgo";
import {
getInviteCodesInString,
getUrlsInString,
@ -10,15 +10,15 @@ import {
resolveInvite,
isGuildInvite,
isRESTGuildInvite,
} from "src/utils";
} from "../../../utils";
import cloneDeep from "lodash.clonedeep";
import { censorMessage } from "./censorMessage";
import escapeStringRegexp from "escape-string-regexp";
import { logger } from "src/logger";
import { logger } from "../../../logger";
import { allowTimeout } from "../../../RegExpRunner";
export async function applyFiltersToMsg(
pluginData: PluginData<CensorPluginType>,
pluginData: GuildPluginData<CensorPluginType>,
savedMessage: SavedMessage,
): Promise<boolean> {
const member = await resolveMember(pluginData.client, pluginData.guild, savedMessage.user_id);

10
backend/src/plugins/Censor/util/censorMessage.ts
View file

@ -1,12 +1,12 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types";
import { SavedMessage } from "src/data/entities/SavedMessage";
import { LogType } from "src/data/LogType";
import { stripObjectToScalars, resolveUser } from "src/utils";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType";
import { stripObjectToScalars, resolveUser } from "../../../utils";
import { disableCodeBlocks, deactivateMentions } from "knub/dist/helpers";
export async function censorMessage(
pluginData: PluginData<CensorPluginType>,
pluginData: GuildPluginData<CensorPluginType>,
savedMessage: SavedMessage,
reason: string,
) {

6
backend/src/plugins/Censor/util/onMessageCreate.ts
View file

@ -1,9 +1,9 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types";
import { SavedMessage } from "src/data/entities/SavedMessage";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { applyFiltersToMsg } from "./applyFiltersToMsg";
export async function onMessageCreate(pluginData: PluginData<CensorPluginType>, savedMessage: SavedMessage) {
export async function onMessageCreate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) {
if (savedMessage.is_bot) return;
const lock = await pluginData.locks.acquire(`message-${savedMessage.id}`);

6
backend/src/plugins/Censor/util/onMessageUpdate.ts
View file

@ -1,9 +1,9 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { CensorPluginType } from "../types";
import { SavedMessage } from "src/data/entities/SavedMessage";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { applyFiltersToMsg } from "./applyFiltersToMsg";
export async function onMessageUpdate(pluginData: PluginData<CensorPluginType>, savedMessage: SavedMessage) {
export async function onMessageUpdate(pluginData: GuildPluginData<CensorPluginType>, savedMessage: SavedMessage) {
if (savedMessage.is_bot) return;
const lock = await pluginData.locks.acquire(`message-${savedMessage.id}`);