From 4ac7ff08430ff07f1c662035e24037e3565509ad Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:48:45 +0300
Subject: [PATCH] fix: remove old references to per-method lodash packages

See https://lodash.com/per-method-packages
---
 backend/package.json                            |  2 +-
 .../Automod/events/RunAutomodOnMemberUpdate.ts  |  8 ++++----
 .../plugins/Censor/util/applyFiltersToMsg.ts    |  2 +-
 .../src/plugins/Logs/util/onMessageUpdate.ts    |  2 +-
 .../src/plugins/Persist/events/LoadDataEvt.ts   |  2 +-
 package-lock.json                               | 17 ++++-------------
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 84bd7b9a..46b053c0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -83,7 +83,7 @@
     "@types/express": "^4.16.1",
     "@types/jest": "^24.0.15",
     "@types/js-yaml": "^3.12.1",
-    "@types/lodash.at": "^4.6.3",
+    "@types/lodash": "^4.17.7",
     "@types/moment-timezone": "^0.5.6",
     "@types/multer": "^1.4.7",
     "@types/passport": "^1.0.0",
diff --git a/backend/src/plugins/Automod/events/RunAutomodOnMemberUpdate.ts b/backend/src/plugins/Automod/events/RunAutomodOnMemberUpdate.ts
index aeea867d..2e9da994 100644
--- a/backend/src/plugins/Automod/events/RunAutomodOnMemberUpdate.ts
+++ b/backend/src/plugins/Automod/events/RunAutomodOnMemberUpdate.ts
@@ -1,6 +1,6 @@
 import { guildPluginEventListener } from "knub";
-import diff from "lodash.difference";
-import isEqual from "lodash.isequal";
+import { difference } from "lodash";
+import { isEqual } from "lodash";
 import { runAutomod } from "../functions/runAutomod.js";
 import { AutomodContext, AutomodPluginType } from "../types.js";
 
@@ -15,8 +15,8 @@ export const RunAutomodOnMemberUpdate = guildPluginEventListener<AutomodPluginTy
 
     if (isEqual(oldRoles, newRoles)) return;
 
-    const addedRoles = diff(newRoles, oldRoles);
-    const removedRoles = diff(oldRoles, newRoles);
+    const addedRoles = difference(newRoles, oldRoles);
+    const removedRoles = difference(oldRoles, newRoles);
 
     if (addedRoles.length || removedRoles.length) {
       const context: AutomodContext = {
diff --git a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts
index 2663f9e6..e190f05c 100644
--- a/backend/src/plugins/Censor/util/applyFiltersToMsg.ts
+++ b/backend/src/plugins/Censor/util/applyFiltersToMsg.ts
@@ -1,7 +1,7 @@
 import { Invite } from "discord.js";
 import escapeStringRegexp from "escape-string-regexp";
 import { GuildPluginData } from "knub";
-import cloneDeep from "lodash.clonedeep";
+import { cloneDeep } from "lodash";
 import { allowTimeout } from "../../../RegExpRunner.js";
 import { ZalgoRegex } from "../../../data/Zalgo.js";
 import { ISavedMessageEmbedData, SavedMessage } from "../../../data/entities/SavedMessage.js";
diff --git a/backend/src/plugins/Logs/util/onMessageUpdate.ts b/backend/src/plugins/Logs/util/onMessageUpdate.ts
index e5e1c019..9f40b371 100644
--- a/backend/src/plugins/Logs/util/onMessageUpdate.ts
+++ b/backend/src/plugins/Logs/util/onMessageUpdate.ts
@@ -1,6 +1,6 @@
 import { EmbedData, GuildTextBasedChannel, Snowflake } from "discord.js";
 import { GuildPluginData } from "knub";
-import cloneDeep from "lodash.clonedeep";
+import { cloneDeep } from "lodash";
 import { SavedMessage } from "../../../data/entities/SavedMessage.js";
 import { resolveUser } from "../../../utils.js";
 import { logMessageEdit } from "../logFunctions/logMessageEdit.js";
diff --git a/backend/src/plugins/Persist/events/LoadDataEvt.ts b/backend/src/plugins/Persist/events/LoadDataEvt.ts
index 47ccaedf..31e28767 100644
--- a/backend/src/plugins/Persist/events/LoadDataEvt.ts
+++ b/backend/src/plugins/Persist/events/LoadDataEvt.ts
@@ -1,6 +1,6 @@
 import { GuildMember, PermissionFlagsBits } from "discord.js";
 import { GuildPluginData } from "knub";
-import intersection from "lodash.intersection";
+import { intersection } from "lodash";
 import { PersistedData } from "../../../data/entities/PersistedData.js";
 import { SECONDS } from "../../../utils.js";
 import { canAssignRole } from "../../../utils/canAssignRole.js";
diff --git a/package-lock.json b/package-lock.json
index 4f9e92a0..1cfe2f36 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,7 @@
         "@types/express": "^4.16.1",
         "@types/jest": "^24.0.15",
         "@types/js-yaml": "^3.12.1",
-        "@types/lodash.at": "^4.6.3",
+        "@types/lodash": "^4.17.7",
         "@types/moment-timezone": "^0.5.6",
         "@types/multer": "^1.4.7",
         "@types/passport": "^1.0.0",
@@ -4077,20 +4077,11 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
+      "version": "4.17.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
+      "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==",
       "dev": true
     },
-    "node_modules/@types/lodash.at": {
-      "version": "4.6.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.at/-/lodash.at-4.6.9.tgz",
-      "integrity": "sha512-y+2AY+tRPkleNTXP9Q6HgUDL3e4Bq+IVxBT39INd9YdB0++hXUENlS6UPdBUQMEuZYAsAfpvdXbab78Qgf/V3g==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
     "node_modules/@types/long": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",