From 7c946949d6fca80a24deaf14cd613c055a597881 Mon Sep 17 00:00:00 2001 From: Tiago R Date: Fri, 29 Dec 2023 11:43:36 +0000 Subject: [PATCH 01/13] automod match_link fixes (#432) * remove trailing dot from FQDN for TLD check Signed-off-by: GitHub * yeet all trailing characters from TLDs Signed-off-by: GitHub * oops Signed-off-by: GitHub * move dumb loop to regex replace Signed-off-by: GitHub --------- Signed-off-by: GitHub Co-authored-by: Almeida --- backend/src/utils.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/utils.ts b/backend/src/utils.ts index 1bb4d6ce..c6c705db 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -647,7 +647,13 @@ export function getUrlsInString(str: string, onlyUnique = false): MatchedURL[] { return urls; } - const hostnameParts = matchUrl.hostname.split("."); + let hostname = matchUrl.hostname.toLowerCase(); + + if (hostname.length > 3) { + hostname = hostname.replace(/[^a-z]+$/, ""); + } + + const hostnameParts = hostname.split("."); const tld = hostnameParts[hostnameParts.length - 1]; if (tlds.includes(tld)) { urls.push(matchUrl); From b2fc4d69e3205ed6e0690f3d2307f8944a43b7c0 Mon Sep 17 00:00:00 2001 From: Miikka <2606411+Dragory@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:21:58 +0200 Subject: [PATCH 02/13] chore: update .clabot --- .clabot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 381bf599..0dcbf7f3 100644 --- a/.clabot +++ b/.clabot @@ -23,7 +23,11 @@ "iamshoXy", "Scraayp", "app/dependabot", - "zayKenyon" + "zayKenyon", + "rukogit", + "Obliie", + "brawaru", + "Benricheson101" ], "message": "Thank you for contributing to Zeppelin! We require contributors to sign our Contributor License Agreement (CLA). To let us review and merge your code, please visit https://github.com/ZeppelinBot/CLA to sign the CLA!" } From e7eacb330b4d21962ecbf8d4eff6905e86b0365e Mon Sep 17 00:00:00 2001 From: Miikka <2606411+Dragory@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:26:20 +0200 Subject: [PATCH 03/13] chore: update .clabot --- .clabot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 0dcbf7f3..43dcfc5f 100644 --- a/.clabot +++ b/.clabot @@ -27,7 +27,8 @@ "rukogit", "Obliie", "brawaru", - "Benricheson101" + "Benricheson101", + "hawkeye7662" ], "message": "Thank you for contributing to Zeppelin! We require contributors to sign our Contributor License Agreement (CLA). To let us review and merge your code, please visit https://github.com/ZeppelinBot/CLA to sign the CLA!" } From 1cb8431a02476d88f90d21105e46d53a178b65c6 Mon Sep 17 00:00:00 2001 From: hawkeye7662 <82515230+hawkeye7662@users.noreply.github.com> Date: Fri, 29 Dec 2023 17:59:28 +0530 Subject: [PATCH 04/13] Fix loose matching for automod (#428) Added a missing closing bracket for the regex to work. Co-authored-by: Almeida --- backend/src/plugins/Automod/triggers/matchWords.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/plugins/Automod/triggers/matchWords.ts b/backend/src/plugins/Automod/triggers/matchWords.ts index c5ca79fc..1deb64e5 100644 --- a/backend/src/plugins/Automod/triggers/matchWords.ts +++ b/backend/src/plugins/Automod/triggers/matchWords.ts @@ -54,7 +54,7 @@ export const MatchWordsTrigger = automodTrigger()({ const looseMatchingThreshold = Math.min(Math.max(trigger.loose_matching_threshold, 1), 64); const patterns = trigger.words.map((word) => { let pattern = trigger.loose_matching - ? [...word].map((c) => escapeStringRegexp(c)).join(`(?:\\s*|.{0,${looseMatchingThreshold})`) + ? [...word].map((c) => escapeStringRegexp(c)).join(`(?:\\s*|.{0,${looseMatchingThreshold}})`) : escapeStringRegexp(word); if (trigger.only_full_words) { From d51461ee3af2a1229578817c2169bdfd2f4ec243 Mon Sep 17 00:00:00 2001 From: hawkeye7662 <82515230+hawkeye7662@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:02:48 +0530 Subject: [PATCH 05/13] Catch Too Many Reactions error (#326) Catches Maximum number of reactions reached (20) error by checking for error code 30010 Co-authored-by: Almeida --- .../util/applyReactionRoleReactionsToMessage.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts b/backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts index 94de8631..5d1b3a37 100644 --- a/backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts +++ b/backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts @@ -86,6 +86,12 @@ export async function applyReactionRoleReactionsToMessage( body: `Error ${e.code} while applying reaction role reactions to ${channelId}/${messageId}: ${e.message}`, }); break; + } else if (e.code === 30010) { + errors.push(`Maximum number of reactions reached (20)`); + logs.logBotAlert({ + body: `Error ${e.code} while applying reaction role reactions to ${channelId}/${messageId}: ${e.message}`, + }); + break; } } From 8a4a2d36478036e31f9b547e23d5bf5a31acff59 Mon Sep 17 00:00:00 2001 From: Ben Richeson <36977340+Benricheson101@users.noreply.github.com> Date: Fri, 29 Dec 2023 07:52:43 -0500 Subject: [PATCH 06/13] feat: option to trigger antiraid_level only on change (#424) Co-authored-by: Almeida --- .../plugins/Automod/events/runAutomodOnAntiraidLevel.ts | 6 ++++-- .../src/plugins/Automod/functions/setAntiraidLevel.ts | 3 ++- backend/src/plugins/Automod/triggers/antiraidLevel.ts | 9 +++++++++ backend/src/plugins/Automod/types.ts | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts b/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts index 2dfc4bac..05dbb6f3 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts @@ -5,13 +5,15 @@ import { AutomodContext, AutomodPluginType } from "../types"; export async function runAutomodOnAntiraidLevel( pluginData: GuildPluginData, - level: string | null, + newLevel: string | null, + oldLevel: string | null, user?: User, ) { const context: AutomodContext = { timestamp: Date.now(), antiraid: { - level, + level: newLevel, + oldLevel, }, user, }; diff --git a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts index a21d58b0..c76555c2 100644 --- a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts +++ b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts @@ -9,10 +9,11 @@ export async function setAntiraidLevel( newLevel: string | null, user?: User, ) { + const oldLevel = pluginData.state.cachedAntiraidLevel; pluginData.state.cachedAntiraidLevel = newLevel; await pluginData.state.antiraidLevels.set(newLevel); - runAutomodOnAntiraidLevel(pluginData, newLevel, user); + runAutomodOnAntiraidLevel(pluginData, newLevel, oldLevel, user); const logs = pluginData.getPlugin(LogsPlugin); diff --git a/backend/src/plugins/Automod/triggers/antiraidLevel.ts b/backend/src/plugins/Automod/triggers/antiraidLevel.ts index 7c6d17af..f5caa3f0 100644 --- a/backend/src/plugins/Automod/triggers/antiraidLevel.ts +++ b/backend/src/plugins/Automod/triggers/antiraidLevel.ts @@ -7,6 +7,7 @@ interface AntiraidLevelTriggerResult {} export const AntiraidLevelTrigger = automodTrigger()({ configType: t.type({ level: tNullable(t.string), + only_on_change: tNullable(t.boolean), }), defaultConfig: {}, @@ -20,6 +21,14 @@ export const AntiraidLevelTrigger = automodTrigger() return; } + if ( + triggerConfig.only_on_change && + context.antiraid.oldLevel !== undefined && + context.antiraid.level === context.antiraid.oldLevel + ) { + return; + } + return { extra: {}, }; diff --git a/backend/src/plugins/Automod/types.ts b/backend/src/plugins/Automod/types.ts index bd3f05ee..b9900089 100644 --- a/backend/src/plugins/Automod/types.ts +++ b/backend/src/plugins/Automod/types.ts @@ -130,6 +130,7 @@ export interface AutomodContext { }; antiraid?: { level: string | null; + oldLevel?: string | null; }; threadChange?: { created?: ThreadChannel; From 3217f350178104a813a25ac9b488ae3e59ba9187 Mon Sep 17 00:00:00 2001 From: Tiago R Date: Fri, 29 Dec 2023 14:30:40 +0000 Subject: [PATCH 07/13] implement MEMBER_MUTE_EXPIRED (#437) Signed-off-by: GitHub --- backend/src/plugins/Mutes/functions/clearMute.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/plugins/Mutes/functions/clearMute.ts b/backend/src/plugins/Mutes/functions/clearMute.ts index 0bef1881..f96068c7 100644 --- a/backend/src/plugins/Mutes/functions/clearMute.ts +++ b/backend/src/plugins/Mutes/functions/clearMute.ts @@ -57,9 +57,10 @@ export async function clearMute( await member.timeout(null); } } + pluginData.getPlugin(LogsPlugin).logMemberMuteExpired({ member }); } catch { pluginData.getPlugin(LogsPlugin).logBotAlert({ - body: `Failed to remove mute role from ${verboseUserMention(member.user)}`, + body: `Failed to clear mute from ${verboseUserMention(member.user)}`, }); } finally { lock.unlock(); From 3912523c920bff1772a5c58380d0525973239661 Mon Sep 17 00:00:00 2001 From: zay <87788699+zayKenyon@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:09:37 +0000 Subject: [PATCH 08/13] Moderation Guide (#356) * create Moderation Guide * code review * fix: enable mod_actions plugin * Apply suggestions from code review Co-authored-by: Almeida * style: code review Suggestions that were not automatically resolvable. --------- Co-authored-by: Almeida --- dashboard/src/components/docs/Moderation.vue | 156 +++++++++++++++++++ dashboard/src/routes.ts | 2 +- 2 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 dashboard/src/components/docs/Moderation.vue diff --git a/dashboard/src/components/docs/Moderation.vue b/dashboard/src/components/docs/Moderation.vue new file mode 100644 index 00000000..ff2151e6 --- /dev/null +++ b/dashboard/src/components/docs/Moderation.vue @@ -0,0 +1,156 @@ + + + diff --git a/dashboard/src/routes.ts b/dashboard/src/routes.ts index 15ac3d96..b70c38db 100644 --- a/dashboard/src/routes.ts +++ b/dashboard/src/routes.ts @@ -51,7 +51,7 @@ export const router = new VueRouter({ }, { path: "setup-guides/moderation", - component: () => import("./components/docs/WorkInProgress.vue"), + component: () => import("./components/docs/Moderation.vue"), }, { path: "setup-guides/counters", From 094e94f0f4226d9173aa9f344ae06494e31adabf Mon Sep 17 00:00:00 2001 From: Ben Richeson <36977340+Benricheson101@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:41:12 -0500 Subject: [PATCH 09/13] Add `pause_invites` automod action (#423) * feat(AutomodPlugin): toggle invite action * feat: rename and change config shape * refactor: rename disable_invites to pause_invites * fix: make options an object, else setting an action to `false` ignores it --- .../plugins/Automod/actions/availableActions.ts | 3 +++ .../src/plugins/Automod/actions/pauseInvites.ts | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 backend/src/plugins/Automod/actions/pauseInvites.ts diff --git a/backend/src/plugins/Automod/actions/availableActions.ts b/backend/src/plugins/Automod/actions/availableActions.ts index 3f253bc0..b77f3942 100644 --- a/backend/src/plugins/Automod/actions/availableActions.ts +++ b/backend/src/plugins/Automod/actions/availableActions.ts @@ -11,6 +11,7 @@ import { CleanAction } from "./clean"; import { KickAction } from "./kick"; import { LogAction } from "./log"; import { MuteAction } from "./mute"; +import { PauseInvitesAction } from "./pauseInvites"; import { RemoveRolesAction } from "./removeRoles"; import { ReplyAction } from "./reply"; import { SetAntiraidLevelAction } from "./setAntiraidLevel"; @@ -38,6 +39,7 @@ export const availableActions: Record> = { start_thread: StartThreadAction, archive_thread: ArchiveThreadAction, change_perms: ChangePermsAction, + pause_invites: PauseInvitesAction, }; export const AvailableActions = t.type({ @@ -59,4 +61,5 @@ export const AvailableActions = t.type({ start_thread: StartThreadAction.configType, archive_thread: ArchiveThreadAction.configType, change_perms: ChangePermsAction.configType, + pause_invites: PauseInvitesAction.configType, }); diff --git a/backend/src/plugins/Automod/actions/pauseInvites.ts b/backend/src/plugins/Automod/actions/pauseInvites.ts new file mode 100644 index 00000000..1bbea34f --- /dev/null +++ b/backend/src/plugins/Automod/actions/pauseInvites.ts @@ -0,0 +1,14 @@ +import * as t from "io-ts"; +import { automodAction } from "../helpers"; + +export const PauseInvitesAction = automodAction({ + configType: t.type({ + paused: t.boolean, + }), + + defaultConfig: {}, + + async apply({ pluginData, actionConfig }) { + await pluginData.guild.disableInvites(actionConfig.paused); + }, +}); From f58e7f5eb71a329d2b8e9dd08a79e17cc4d0717d Mon Sep 17 00:00:00 2001 From: Tiago R Date: Sun, 7 Jan 2024 21:12:50 +0000 Subject: [PATCH 10/13] Fix automod cooldown logic (#442) * fix automod cooldowns Signed-off-by: GitHub * almeida fixes Signed-off-by: GitHub * https://shr2.i0.tf/82e683c8/bd310b9c-7492-44f0-aed5-af6a22a3c196.png Signed-off-by: GitHub --------- Signed-off-by: GitHub --- .../Automod/functions/applyCooldown.ts | 10 ++++++++ .../functions/checkAndUpdateCooldown.ts | 24 ------------------- .../Automod/functions/checkCooldown.ts | 8 +++++++ .../plugins/Automod/functions/runAutomod.ts | 7 ++++-- 4 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 backend/src/plugins/Automod/functions/applyCooldown.ts delete mode 100644 backend/src/plugins/Automod/functions/checkAndUpdateCooldown.ts create mode 100644 backend/src/plugins/Automod/functions/checkCooldown.ts diff --git a/backend/src/plugins/Automod/functions/applyCooldown.ts b/backend/src/plugins/Automod/functions/applyCooldown.ts new file mode 100644 index 00000000..387ac448 --- /dev/null +++ b/backend/src/plugins/Automod/functions/applyCooldown.ts @@ -0,0 +1,10 @@ +import { GuildPluginData } from "knub"; +import { convertDelayStringToMS } from "../../../utils"; +import { AutomodContext, AutomodPluginType, TRule } from "../types"; + +export function applyCooldown(pluginData: GuildPluginData, rule: TRule, context: AutomodContext) { + const cooldownKey = `${rule.name}-${context.user?.id}`; + + const cooldownTime = convertDelayStringToMS(rule.cooldown, "s"); + if (cooldownTime) pluginData.state.cooldownManager.setCooldown(cooldownKey, cooldownTime); +} diff --git a/backend/src/plugins/Automod/functions/checkAndUpdateCooldown.ts b/backend/src/plugins/Automod/functions/checkAndUpdateCooldown.ts deleted file mode 100644 index 6338d698..00000000 --- a/backend/src/plugins/Automod/functions/checkAndUpdateCooldown.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { GuildPluginData } from "knub"; -import { convertDelayStringToMS } from "../../../utils"; -import { AutomodContext, AutomodPluginType, TRule } from "../types"; - -export function checkAndUpdateCooldown( - pluginData: GuildPluginData, - rule: TRule, - context: AutomodContext, -) { - const cooldownKey = `${rule.name}-${context.user?.id}`; - - if (cooldownKey) { - if (pluginData.state.cooldownManager.isOnCooldown(cooldownKey)) { - return true; - } - - const cooldownTime = convertDelayStringToMS(rule.cooldown, "s"); - if (cooldownTime) { - pluginData.state.cooldownManager.setCooldown(cooldownKey, cooldownTime); - } - } - - return false; -} diff --git a/backend/src/plugins/Automod/functions/checkCooldown.ts b/backend/src/plugins/Automod/functions/checkCooldown.ts new file mode 100644 index 00000000..3640c142 --- /dev/null +++ b/backend/src/plugins/Automod/functions/checkCooldown.ts @@ -0,0 +1,8 @@ +import { GuildPluginData } from "knub"; +import { AutomodContext, AutomodPluginType, TRule } from "../types"; + +export function checkCooldown(pluginData: GuildPluginData, rule: TRule, context: AutomodContext) { + const cooldownKey = `${rule.name}-${context.user?.id}`; + + return pluginData.state.cooldownManager.isOnCooldown(cooldownKey); +} diff --git a/backend/src/plugins/Automod/functions/runAutomod.ts b/backend/src/plugins/Automod/functions/runAutomod.ts index e9c2e3a7..4ccc38de 100644 --- a/backend/src/plugins/Automod/functions/runAutomod.ts +++ b/backend/src/plugins/Automod/functions/runAutomod.ts @@ -7,7 +7,8 @@ import { CleanAction } from "../actions/clean"; import { AutomodTriggerMatchResult } from "../helpers"; import { availableTriggers } from "../triggers/availableTriggers"; import { AutomodContext, AutomodPluginType } from "../types"; -import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown"; +import { applyCooldown } from "./applyCooldown"; +import { checkCooldown } from "./checkCooldown"; export async function runAutomod(pluginData: GuildPluginData, context: AutomodContext) { const userId = context.user?.id || context.member?.id || context.message?.user_id; @@ -46,7 +47,7 @@ export async function runAutomod(pluginData: GuildPluginData, } if (!rule.affects_self && userId && userId === pluginData.client.user?.id) continue; - if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) { + if (rule.cooldown && checkCooldown(pluginData, rule, context)) { continue; } @@ -84,6 +85,8 @@ export async function runAutomod(pluginData: GuildPluginData, } if (matchResult) { + if (rule.cooldown) applyCooldown(pluginData, rule, context); + contexts = [context, ...(matchResult.extraContexts || [])]; for (const _context of contexts) { From 47ad8fa4d3329e0009d1a369d40740a7e6ae503e Mon Sep 17 00:00:00 2001 From: Almeida Date: Mon, 8 Jan 2024 11:15:57 +0000 Subject: [PATCH 11/13] only call `disableInvites()` if value has changed (#443) --- backend/src/plugins/Automod/actions/pauseInvites.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/plugins/Automod/actions/pauseInvites.ts b/backend/src/plugins/Automod/actions/pauseInvites.ts index 1bbea34f..262b6912 100644 --- a/backend/src/plugins/Automod/actions/pauseInvites.ts +++ b/backend/src/plugins/Automod/actions/pauseInvites.ts @@ -1,3 +1,4 @@ +import { GuildFeature } from "discord.js"; import * as t from "io-ts"; import { automodAction } from "../helpers"; @@ -9,6 +10,10 @@ export const PauseInvitesAction = automodAction({ defaultConfig: {}, async apply({ pluginData, actionConfig }) { - await pluginData.guild.disableInvites(actionConfig.paused); + const hasInvitesDisabled = pluginData.guild.features.includes(GuildFeature.InvitesDisabled); + + if (actionConfig.paused !== hasInvitesDisabled) { + await pluginData.guild.disableInvites(actionConfig.paused); + } }, }); From c07e4321a72cbb58a6d9e05dc07e0bb5d9dd3e68 Mon Sep 17 00:00:00 2001 From: Almeida Date: Mon, 8 Jan 2024 15:35:55 +0000 Subject: [PATCH 12/13] remove erlpack (#444) --- backend/package-lock.json | 24 ------------------------ backend/package.json | 1 - 2 files changed, 25 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index b1d6d189..2949ed98 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -17,7 +17,6 @@ "discord.js": "^14.11.0", "dotenv": "^4.0.0", "emoji-regex": "^8.0.0", - "erlpack": "github:discord/erlpack", "escape-string-regexp": "^1.0.5", "express": "^4.17.0", "fp-ts": "^2.0.1", @@ -1553,14 +1552,6 @@ "node": ">=8" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, "node_modules/bit-twiddle": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bit-twiddle/-/bit-twiddle-1.0.2.tgz", @@ -3467,16 +3458,6 @@ "resolved": "https://registry.npmjs.org/env-string/-/env-string-1.0.1.tgz", "integrity": "sha512-/DhCJDf5DSFK32joQiWRpWrT0h7p3hVQfMKxiBb7Nt8C8IF8BYyPtclDnuGGLOoj16d/8udKeiE7JbkotDmorQ==" }, - "node_modules/erlpack": { - "version": "0.1.3", - "resolved": "git+ssh://git@github.com/discord/erlpack.git#cbe76be04c2210fc9cb6ff95910f0937c1011d04", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.15.0" - } - }, "node_modules/es5-ext": { "version": "0.10.62", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", @@ -3941,11 +3922,6 @@ "url": "https://github.com/sindresorhus/file-type?sponsor=1" } }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", diff --git a/backend/package.json b/backend/package.json index 2ff53482..cf120ca5 100644 --- a/backend/package.json +++ b/backend/package.json @@ -38,7 +38,6 @@ "discord.js": "^14.11.0", "dotenv": "^4.0.0", "emoji-regex": "^8.0.0", - "erlpack": "github:discord/erlpack", "escape-string-regexp": "^1.0.5", "express": "^4.17.0", "fp-ts": "^2.0.1", From 39e8367f5fcbd890ba7a0b2a96e0598841f8e3f7 Mon Sep 17 00:00:00 2001 From: Tiago R Date: Mon, 15 Jan 2024 12:23:52 +0000 Subject: [PATCH 13/13] disable guildmembercache Signed-off-by: GitHub --- backend/src/plugins/Persist/PersistPlugin.ts | 3 +-- backend/src/plugins/Persist/events/StoreDataEvt.ts | 6 ++++-- backend/src/plugins/availablePlugins.ts | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/plugins/Persist/PersistPlugin.ts b/backend/src/plugins/Persist/PersistPlugin.ts index ecd50067..bc914c44 100644 --- a/backend/src/plugins/Persist/PersistPlugin.ts +++ b/backend/src/plugins/Persist/PersistPlugin.ts @@ -3,7 +3,6 @@ import { GuildLogs } from "../../data/GuildLogs"; import { GuildPersistedData } from "../../data/GuildPersistedData"; import { makeIoTsConfigParser } from "../../pluginUtils"; import { trimPluginDescription } from "../../utils"; -import { GuildMemberCachePlugin } from "../GuildMemberCache/GuildMemberCachePlugin"; import { LogsPlugin } from "../Logs/LogsPlugin"; import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; @@ -31,7 +30,7 @@ export const PersistPlugin = zeppelinGuildPlugin()({ configSchema: ConfigSchema, }, - dependencies: () => [LogsPlugin, RoleManagerPlugin, GuildMemberCachePlugin], + dependencies: () => [LogsPlugin, RoleManagerPlugin], configParser: makeIoTsConfigParser(ConfigSchema), defaultOptions, diff --git a/backend/src/plugins/Persist/events/StoreDataEvt.ts b/backend/src/plugins/Persist/events/StoreDataEvt.ts index 537c7b62..9385c279 100644 --- a/backend/src/plugins/Persist/events/StoreDataEvt.ts +++ b/backend/src/plugins/Persist/events/StoreDataEvt.ts @@ -1,5 +1,4 @@ import { PersistedData } from "../../../data/entities/PersistedData"; -import { GuildMemberCachePlugin } from "../../GuildMemberCache/GuildMemberCachePlugin"; import { persistEvt } from "../types"; export const StoreDataEvt = persistEvt({ @@ -9,8 +8,11 @@ export const StoreDataEvt = persistEvt({ const config = await pluginData.config.getForUser(member.user); const persistData: Partial = {}; + // FIXME: New caching thing, or fix deadlocks with this plugin if (member.partial) { + return; // Djs hasn't cached member data => use db cache + /* const data = await pluginData.getPlugin(GuildMemberCachePlugin).getCachedMemberData(member.id); if (!data) { return; @@ -22,7 +24,7 @@ export const StoreDataEvt = persistEvt({ } if (config.persist_nicknames && data.nickname) { persistData.nickname = data.nickname; - } + }*/ } else { // Djs has cached member data => use that const memberRoles = Array.from(member.roles.cache.keys()); diff --git a/backend/src/plugins/availablePlugins.ts b/backend/src/plugins/availablePlugins.ts index 58af41fc..3df9c347 100644 --- a/backend/src/plugins/availablePlugins.ts +++ b/backend/src/plugins/availablePlugins.ts @@ -12,7 +12,6 @@ import { CustomEventsPlugin } from "./CustomEvents/CustomEventsPlugin"; import { GuildAccessMonitorPlugin } from "./GuildAccessMonitor/GuildAccessMonitorPlugin"; import { GuildConfigReloaderPlugin } from "./GuildConfigReloader/GuildConfigReloaderPlugin"; import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin"; -import { GuildMemberCachePlugin } from "./GuildMemberCache/GuildMemberCachePlugin"; import { InternalPosterPlugin } from "./InternalPoster/InternalPosterPlugin"; import { LocateUserPlugin } from "./LocateUser/LocateUserPlugin"; import { LogsPlugin } from "./Logs/LogsPlugin"; @@ -54,7 +53,7 @@ export const guildPlugins: Array> = [ PostPlugin, ReactionRolesPlugin, MessageSaverPlugin, - GuildMemberCachePlugin, + // GuildMemberCachePlugin, // FIXME: New caching thing, or fix deadlocks with this plugin ModActionsPlugin, NameHistoryPlugin, RemindersPlugin, @@ -93,7 +92,7 @@ export const baseGuildPlugins: Array> = [ GuildInfoSaverPlugin, MessageSaverPlugin, NameHistoryPlugin, - GuildMemberCachePlugin, + // GuildMemberCachePlugin, // FIXME: New caching thing, or fix deadlocks with this plugin CasesPlugin, MutesPlugin, TimeAndDatePlugin,