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

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

View file

@ -1,7 +1,7 @@
import { CooldownManager, PluginOptions } from "knub";
import { SelfGrantableRolesPluginType, ConfigSchema, defaultSelfGrantableRoleEntry } from "./types";
import { zeppelinPlugin } from "../ZeppelinPluginBlueprint";
import { trimPluginDescription } from "src/utils";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
import { trimPluginDescription } from "../../utils";
import { RoleAddCmd } from "./commands/RoleAddCmd";
import { RoleRemoveCmd } from "./commands/RoleRemoveCmd";
import { RoleHelpCmd } from "./commands/RoleHelpCmd";
@ -13,7 +13,7 @@ const defaultOptions: PluginOptions<SelfGrantableRolesPluginType> = {
},
};
export const SelfGrantableRolesPlugin = zeppelinPlugin<SelfGrantableRolesPluginType>()("self_grantable_roles", {
export const SelfGrantableRolesPlugin = zeppelinGuildPlugin<SelfGrantableRolesPluginType>()("self_grantable_roles", {
showInDocs: true,
configSchema: ConfigSchema,

View file

@ -1,7 +1,7 @@
import { selfGrantableRolesCmd } from "../types";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { getApplyingEntries } from "../util/getApplyingEntries";
import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { splitRoleNames } from "../util/splitRoleNames";
import { normalizeRoleNames } from "../util/normalizeRoleNames";
import { findMatchingRoles } from "../util/findMatchingRoles";

View file

@ -1,5 +1,5 @@
import { selfGrantableRolesCmd } from "../types";
import { asSingleLine, trimLines } from "src/utils";
import { asSingleLine, trimLines } from "../../../utils";
import { getApplyingEntries } from "../util/getApplyingEntries";
export const RoleHelpCmd = selfGrantableRolesCmd({
@ -19,7 +19,7 @@ export const RoleHelpCmd = selfGrantableRolesCmd({
}
}
const prefix = pluginData.guildConfig.prefix;
const prefix = pluginData.fullConfig.prefix;
const [firstRole, secondRole] = allPrimaryAliases;
const help1 = asSingleLine(`

View file

@ -1,7 +1,7 @@
import { selfGrantableRolesCmd } from "../types";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { getApplyingEntries } from "../util/getApplyingEntries";
import { sendErrorMessage, sendSuccessMessage } from "src/pluginUtils";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { splitRoleNames } from "../util/splitRoleNames";
import { normalizeRoleNames } from "../util/normalizeRoleNames";
import { findMatchingRoles } from "../util/findMatchingRoles";

View file

@ -1,5 +1,5 @@
import * as t from "io-ts";
import { BasePluginType, command, CooldownManager } from "knub";
import { BasePluginType, guildCommand, CooldownManager } from "knub";
const RoleMap = t.record(t.string, t.array(t.string));
@ -31,4 +31,4 @@ export interface SelfGrantableRolesPluginType extends BasePluginType {
};
}
export const selfGrantableRolesCmd = command<SelfGrantableRolesPluginType>();
export const selfGrantableRolesCmd = guildCommand<SelfGrantableRolesPluginType>();

View file

@ -1,6 +1,6 @@
import { TSelfGrantableRoleEntry } from "../types";
export function findMatchingRoles(roleNames, entries: TSelfGrantableRoleEntry[]): string[] {
export function findMatchingRoles(roleNames: string[], entries: TSelfGrantableRoleEntry[]): string[] {
const aliasToRoleId = entries.reduce((map, entry) => {
for (const [roleId, aliases] of Object.entries(entry.roles)) {
for (const alias of aliases) {

View file

@ -1,8 +1,8 @@
import { TSelfGrantableRoleEntry, SelfGrantableRolesPluginType } from "../types";
import { PluginData } from "knub";
import { GuildPluginData } from "knub";
export function getApplyingEntries(
pluginData: PluginData<SelfGrantableRolesPluginType>,
pluginData: GuildPluginData<SelfGrantableRolesPluginType>,
msg,
): TSelfGrantableRoleEntry[] {
const config = pluginData.config.getForMessage(msg);