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

Fix base plugins not being loaded by default

Browse source
This commit is contained in:
Dragory 2020-07-30 22:23:18 +03:00
parent a1219d6178
commit 2b92f726e1
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/index.ts
View file

@ -11,7 +11,7 @@ import { Configs } from "./data/Configs";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { Client, TextChannel } from "eris"; import { Client, TextChannel } from "eris";
import { connect } from "./data/db"; import { connect } from "./data/db";
import { globalPlugins, guildPlugins } from "./plugins/availablePlugins"; import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availablePlugins";
import { errorMessage, isDiscordHTTPError, isDiscordRESTError, successMessage } from "./utils"; import { errorMessage, isDiscordHTTPError, isDiscordRESTError, successMessage } from "./utils";
import { startUptimeCounter } from "./uptime"; import { startUptimeCounter } from "./uptime";
import { AllowedGuilds } from "./data/AllowedGuilds"; import { AllowedGuilds } from "./data/AllowedGuilds";
@ -156,8 +156,10 @@ connect().then(async () => {
*/ */
async getEnabledGuildPlugins(ctx, plugins): Promise<string[]> { async getEnabledGuildPlugins(ctx, plugins): Promise<string[]> {
const configuredPlugins = ctx.config.plugins || []; const configuredPlugins = ctx.config.plugins || [];
const basePluginNames = baseGuildPlugins.map(p => p.name);
return Array.from(plugins.keys()).filter(pluginName => { return Array.from(plugins.keys()).filter(pluginName => {
if (basePluginNames.includes(pluginName)) return true;
return configuredPlugins[pluginName] && configuredPlugins[pluginName].enabled !== false; return configuredPlugins[pluginName] && configuredPlugins[pluginName].enabled !== false;
}); });
}, },

10
backend/src/plugins/availablePlugins.ts
View file

@ -69,3 +69,13 @@ export const globalPlugins = [
GuildConfigReloaderPlugin, GuildConfigReloaderPlugin,
BotControlPlugin, BotControlPlugin,
]; ];
// prettier-ignore
export const baseGuildPlugins: Array<ZeppelinPluginBlueprint<any>> = [
GuildInfoSaverPlugin,
MessageSaverPlugin,
NameHistoryPlugin,
CasesPlugin,
MutesPlugin,
// TODO: Replace these with proper dependencies
];