Merge branch 'master' into custom-success-emoji

This commit is contained in:
Miikka 2020-01-12 13:39:59 +02:00 committed by GitHub
commit 4e22d521f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 7 deletions

View file

@ -4,7 +4,7 @@ import yaml from "js-yaml";
import fs from "fs";
const fsp = fs.promises;
import { Knub, logger, PluginError, Plugin, IGuildConfig } from "knub";
import { Knub, logger, PluginError, Plugin, IGlobalConfig, IGuildConfig, IGuildData } from "knub";
import { SimpleError } from "./SimpleError";
import DiscordRESTError from "eris/lib/errors/DiscordRESTError"; // tslint:disable-line
@ -75,7 +75,7 @@ import { customArgumentTypes } from "./customArgumentTypes";
import { errorMessage, successMessage } from "./utils";
import { startUptimeCounter } from "./uptime";
import { AllowedGuilds } from "./data/AllowedGuilds";
import { IGuildData } from "knub/dist/Knub";
import { IZeppelinGuildConfig, IZeppelinGlobalConfig } from "./types";
logger.info("Connecting to database");
connect().then(async conn => {
@ -94,7 +94,7 @@ connect().then(async conn => {
const allowedGuilds = new AllowedGuilds();
const guildConfigs = new Configs();
const bot = new Knub(client, {
const bot = new Knub<IZeppelinGuildConfig, IZeppelinGlobalConfig>(client, {
plugins: availablePlugins,
globalPlugins: availableGlobalPlugins,