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

4
backend/src/plugins/Utility/UtilityPlugin.ts
View file

@ -1,4 +1,4 @@
import { zeppelinPlugin } from "../ZeppelinPluginBlueprint";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
import { ConfigSchema, UtilityPluginType } from "./types";
import { GuildLogs } from "../../data/GuildLogs";
import { GuildCases } from "../../data/GuildCases";
@ -96,7 +96,7 @@ const defaultOptions: PluginOptions<UtilityPluginType> = {
],
};
export const UtilityPlugin = zeppelinPlugin<UtilityPluginType>()("utility", {
export const UtilityPlugin = zeppelinGuildPlugin<UtilityPluginType>()("utility", {
showInDocs: true,
info: {
prettyName: "Utility",

4
backend/src/plugins/Utility/commands/CleanCmd.ts
View file

@ -4,7 +4,7 @@ import { DAYS, getInviteCodesInString, noop, SECONDS, stripObjectToScalars } fro
import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { Message, TextChannel, User } from "eris";
import moment from "moment-timezone";
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType";
import { allowTimeout } from "../../../RegExpRunner";
@ -14,7 +14,7 @@ const MAX_CLEAN_TIME = 1 * DAYS;
const CLEAN_COMMAND_DELETE_DELAY = 5 * SECONDS;
async function cleanMessages(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
channel: TextChannel,
savedMessages: SavedMessage[],
mod: User,

4
backend/src/plugins/Utility/commands/HelpCmd.ts
View file

@ -2,7 +2,7 @@ import { utilityCmd } from "../types";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { createChunkedMessage } from "../../../utils";
import { PluginCommandDefinition } from "knub/dist/commands/commandUtils";
import { LoadedPlugin } from "knub";
import { LoadedGuildPlugin } from "knub";
export const HelpCmd = utilityCmd({
trigger: "help",
@ -18,7 +18,7 @@ export const HelpCmd = utilityCmd({
const searchStr = args.command.toLowerCase();
const matchingCommands: Array<{
plugin: LoadedPlugin<any>;
plugin: LoadedGuildPlugin<any>;
command: PluginCommandDefinition;
}> = [];

4
backend/src/plugins/Utility/functions/getChannelInfoEmbed.ts
View file

@ -1,4 +1,4 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import { Constants, EmbedOptions } from "eris";
import moment from "moment-timezone";
@ -14,7 +14,7 @@ const ANNOUNCEMENT_CHANNEL_ICON =
"https://cdn.discordapp.com/attachments/740650744830623756/740656841687564348/announcement-channel.png";
export async function getChannelInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
channelId: string,
requestMemberId?: string,
): Promise<EmbedOptions | null> {

4
backend/src/plugins/Utility/functions/getInviteInfoEmbed.ts
View file

@ -1,4 +1,4 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import { BaseInvite, Constants, EmbedOptions, RESTChannelInvite, RESTPrivateInvite } from "eris";
import { snowflakeToTimestamp } from "../../../utils/snowflakeToTimestamp";
@ -16,7 +16,7 @@ import {
} from "../../../utils";
export async function getInviteInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
inviteCode: string,
): Promise<EmbedOptions | null> {
const invite = await resolveInvite(pluginData.client, inviteCode, true);

6
backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts
View file

@ -1,4 +1,4 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import { Constants, EmbedOptions } from "eris";
import moment from "moment-timezone";
@ -10,7 +10,7 @@ import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
const MESSAGE_ICON = "https://cdn.discordapp.com/attachments/740650744830623756/740685652152025088/message.png";
export async function getMessageInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
channelId: string,
messageId: string,
requestMemberId?: string,
@ -132,7 +132,7 @@ export async function getMessageInfoEmbed(
}
if (message.embeds.length) {
const prefix = pluginData.guildConfig.prefix || getDefaultPrefix(pluginData.client);
const prefix = pluginData.fullConfig.prefix || getDefaultPrefix(pluginData.client);
embed.fields.push({
name: preEmbedPadding + "Embeds",
value: `Message contains an embed, use \`${prefix}source\` to see the embed source`,

4
backend/src/plugins/Utility/functions/getServerInfoEmbed.ts
View file

@ -1,4 +1,4 @@
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import { embedPadding, formatNumber, memoize, MINUTES, preEmbedPadding, resolveUser, trimLines } from "../../../utils";
import { CategoryChannel, EmbedOptions, Guild, RESTChannelInvite, TextChannel, VoiceChannel } from "eris";
@ -8,7 +8,7 @@ import { getGuildPreview } from "./getGuildPreview";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
export async function getServerInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
serverId: string,
requestMemberId?: string,
): Promise<EmbedOptions> {

8
backend/src/plugins/Utility/functions/getSnowflakeInfoEmbed.ts
View file

@ -1,9 +1,9 @@
import { Message, GuildTextableChannel, EmbedOptions } from "eris";
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import { UnknownUser, trimLines, embedPadding, resolveMember, resolveUser, preEmbedPadding } from "src/utils";
import { UnknownUser, trimLines, embedPadding, resolveMember, resolveUser, preEmbedPadding } from "../../../utils";
import moment from "moment-timezone";
import { CaseTypes } from "src/data/CaseTypes";
import { CaseTypes } from "../../../data/CaseTypes";
import humanizeDuration from "humanize-duration";
import { snowflakeToTimestamp } from "../../../utils/snowflakeToTimestamp";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
@ -11,7 +11,7 @@ import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
const SNOWFLAKE_ICON = "https://cdn.discordapp.com/attachments/740650744830623756/742020790471491668/snowflake.png";
export async function getSnowflakeInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
snowflake: string,
showUnknownWarning = false,
requestMemberId?: string,

8
backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
View file

@ -1,5 +1,5 @@
import { Message, GuildTextableChannel, EmbedOptions } from "eris";
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { UtilityPluginType } from "../types";
import {
UnknownUser,
@ -10,14 +10,14 @@ import {
preEmbedPadding,
sorter,
messageLink,
} from "src/utils";
} from "../../../utils";
import moment from "moment-timezone";
import { CaseTypes } from "src/data/CaseTypes";
import { CaseTypes } from "../../../data/CaseTypes";
import humanizeDuration from "humanize-duration";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
export async function getUserInfoEmbed(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
userId: string,
compact = false,
requestMemberId?: string,

18
backend/src/plugins/Utility/search.ts
View file

@ -3,7 +3,7 @@ import moment from "moment-timezone";
import escapeStringRegexp from "escape-string-regexp";
import { isFullMessage, MINUTES, multiSorter, noop, sorter, trimLines } from "../../utils";
import { getBaseUrl, sendErrorMessage } from "../../pluginUtils";
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
import { ArgsFromSignatureOrArray } from "knub/dist/commands/commandUtils";
import { searchCmdSignature } from "./commands/SearchCmd";
import { banSearchSignature } from "./commands/BanSearchCmd";
@ -29,19 +29,19 @@ type MemberSearchParams = ArgsFromSignatureOrArray<typeof searchCmdSignature>;
type BanSearchParams = ArgsFromSignatureOrArray<typeof banSearchSignature>;
export async function displaySearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: MemberSearchParams,
searchType: SearchType.MemberSearch,
msg: Message,
);
export async function displaySearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: BanSearchParams,
searchType: SearchType.BanSearch,
msg: Message,
);
export async function displaySearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: MemberSearchParams | BanSearchParams,
searchType: SearchType,
msg: Message,
@ -173,19 +173,19 @@ export async function displaySearch(
}
export async function archiveSearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: MemberSearchParams,
searchType: SearchType.MemberSearch,
msg: Message,
);
export async function archiveSearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: BanSearchParams,
searchType: SearchType.BanSearch,
msg: Message,
);
export async function archiveSearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: MemberSearchParams | BanSearchParams,
searchType: SearchType,
msg: Message,
@ -234,7 +234,7 @@ export async function archiveSearch(
}
async function performMemberSearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: MemberSearchParams,
page = 1,
perPage = SEARCH_RESULTS_PER_PAGE,
@ -368,7 +368,7 @@ async function performMemberSearch(
}
async function performBanSearch(
pluginData: PluginData<UtilityPluginType>,
pluginData: GuildPluginData<UtilityPluginType>,
args: BanSearchParams,
page = 1,
perPage = SEARCH_RESULTS_PER_PAGE,

6
backend/src/plugins/Utility/types.ts
View file

@ -1,5 +1,5 @@
import * as t from "io-ts";
import { BasePluginType, command, eventListener } from "knub";
import { BasePluginType, guildCommand, guildEventListener } from "knub";
import { GuildLogs } from "../../data/GuildLogs";
import { GuildCases } from "../../data/GuildCases";
import { GuildSavedMessages } from "../../data/GuildSavedMessages";
@ -48,5 +48,5 @@ export interface UtilityPluginType extends BasePluginType {
};
}
export const utilityCmd = command<UtilityPluginType>();
export const utilityEvent = eventListener<UtilityPluginType>();
export const utilityCmd = guildCommand<UtilityPluginType>();
export const utilityEvt = guildEventListener<UtilityPluginType>();