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

disable guildmembercache

Browse source 
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Tiago R 2024-01-15 12:23:52 +00:00 • committed by GitHub
parent b47db15ad2
commit 39e8367f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/src/plugins/Persist/PersistPlugin.ts
View file

@ -3,7 +3,6 @@ import { GuildLogs } from "../../data/GuildLogs";
import { GuildPersistedData } from "../../data/GuildPersistedData"; import { GuildPersistedData } from "../../data/GuildPersistedData";
import { makeIoTsConfigParser } from "../../pluginUtils"; import { makeIoTsConfigParser } from "../../pluginUtils";
import { trimPluginDescription } from "../../utils"; import { trimPluginDescription } from "../../utils";
import { GuildMemberCachePlugin } from "../GuildMemberCache/GuildMemberCachePlugin";
import { LogsPlugin } from "../Logs/LogsPlugin"; import { LogsPlugin } from "../Logs/LogsPlugin";
import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin"; import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
@ -31,7 +30,7 @@ export const PersistPlugin = zeppelinGuildPlugin<PersistPluginType>()({
configSchema: ConfigSchema, configSchema: ConfigSchema,
}, },
dependencies: () => [LogsPlugin, RoleManagerPlugin, GuildMemberCachePlugin], dependencies: () => [LogsPlugin, RoleManagerPlugin],
configParser: makeIoTsConfigParser(ConfigSchema), configParser: makeIoTsConfigParser(ConfigSchema),
defaultOptions, defaultOptions,

6
backend/src/plugins/Persist/events/StoreDataEvt.ts
View file

@ -1,5 +1,4 @@
import { PersistedData } from "../../../data/entities/PersistedData"; import { PersistedData } from "../../../data/entities/PersistedData";
import { GuildMemberCachePlugin } from "../../GuildMemberCache/GuildMemberCachePlugin";
import { persistEvt } from "../types"; import { persistEvt } from "../types";
export const StoreDataEvt = persistEvt({ export const StoreDataEvt = persistEvt({
@ -9,8 +8,11 @@ export const StoreDataEvt = persistEvt({
const config = await pluginData.config.getForUser(member.user); const config = await pluginData.config.getForUser(member.user);
const persistData: Partial<PersistedData> = {}; const persistData: Partial<PersistedData> = {};
// FIXME: New caching thing, or fix deadlocks with this plugin
if (member.partial) { if (member.partial) {
return;
// Djs hasn't cached member data => use db cache // Djs hasn't cached member data => use db cache
/*
const data = await pluginData.getPlugin(GuildMemberCachePlugin).getCachedMemberData(member.id); const data = await pluginData.getPlugin(GuildMemberCachePlugin).getCachedMemberData(member.id);
if (!data) { if (!data) {
return; return;
@ -22,7 +24,7 @@ export const StoreDataEvt = persistEvt({
} }
if (config.persist_nicknames && data.nickname) { if (config.persist_nicknames && data.nickname) {
persistData.nickname = data.nickname; persistData.nickname = data.nickname;
} }*/
} else { } else {
// Djs has cached member data => use that // Djs has cached member data => use that
const memberRoles = Array.from(member.roles.cache.keys()); const memberRoles = Array.from(member.roles.cache.keys());

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

@ -12,7 +12,6 @@ import { CustomEventsPlugin } from "./CustomEvents/CustomEventsPlugin";
import { GuildAccessMonitorPlugin } from "./GuildAccessMonitor/GuildAccessMonitorPlugin"; import { GuildAccessMonitorPlugin } from "./GuildAccessMonitor/GuildAccessMonitorPlugin";
import { GuildConfigReloaderPlugin } from "./GuildConfigReloader/GuildConfigReloaderPlugin"; import { GuildConfigReloaderPlugin } from "./GuildConfigReloader/GuildConfigReloaderPlugin";
import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin"; import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin";
import { GuildMemberCachePlugin } from "./GuildMemberCache/GuildMemberCachePlugin";
import { InternalPosterPlugin } from "./InternalPoster/InternalPosterPlugin"; import { InternalPosterPlugin } from "./InternalPoster/InternalPosterPlugin";
import { LocateUserPlugin } from "./LocateUser/LocateUserPlugin"; import { LocateUserPlugin } from "./LocateUser/LocateUserPlugin";
import { LogsPlugin } from "./Logs/LogsPlugin"; import { LogsPlugin } from "./Logs/LogsPlugin";
@ -54,7 +53,7 @@ export const guildPlugins: Array<ZeppelinGuildPluginBlueprint<any>> = [
PostPlugin, PostPlugin,
ReactionRolesPlugin, ReactionRolesPlugin,
MessageSaverPlugin, MessageSaverPlugin,
GuildMemberCachePlugin, // GuildMemberCachePlugin, // FIXME: New caching thing, or fix deadlocks with this plugin
ModActionsPlugin, ModActionsPlugin,
NameHistoryPlugin, NameHistoryPlugin,
RemindersPlugin, RemindersPlugin,
@ -93,7 +92,7 @@ export const baseGuildPlugins: Array<ZeppelinGuildPluginBlueprint<any>> = [
GuildInfoSaverPlugin, GuildInfoSaverPlugin,
MessageSaverPlugin, MessageSaverPlugin,
NameHistoryPlugin, NameHistoryPlugin,
GuildMemberCachePlugin, // GuildMemberCachePlugin, // FIXME: New caching thing, or fix deadlocks with this plugin
CasesPlugin, CasesPlugin,
MutesPlugin, MutesPlugin,
TimeAndDatePlugin, TimeAndDatePlugin,