fix merge conflict

index.ts

@@ -13,8 +13,9 @@ import { GuildMemberStore, UserStore } from "@webpack/common";
 
 import plugins, { PluginMeta } from "~plugins";
 
-import { isPluginDev } from "@utils/misc";
 import SettingsPlugin from "../../plugins/_core/settings";
+import { isPluginDev } from "@utils/misc";
+import { findByCodeLazy } from "@webpack";
 
 const clientVersion = () => {
     const version = IS_DISCORD_DESKTOP ? DiscordNative.app.getVersion() : IS_VESKTOP ? VesktopNative.app.getVersion() : null;
@@ -65,22 +66,28 @@ VV       VV
 const isApiPlugin = (plugin: Plugin) => plugin.name.endsWith("API") || plugin.required;
 
 function getEnabledPlugins() {
-    let counter = 0;
-    let total = 0;
-    let userpluginsCount = 0;
-    let totalUserplugins = 0;
+    const counters = {
+        official: {
+            enabled: 0,
+            total: 0
+        },
+        user: {
+            enabled: 0,
+            total: 0
+        }
+    };
 
-    Object.values(plugins).filter((plugin) => !isApiPlugin(plugin)).forEach((plugin) => {
-        if (PluginMeta[plugin.name].userPlugin) {
-            if (plugin.started) userpluginsCount++;
-            totalUserplugins++;
+    Object.values(Vencord.Plugins.plugins).filter((plugin) => !isApiPlugin(plugin)).forEach((plugin) => {
+        if (PluginMeta[plugin.name]?.userPlugin) {
+            if (plugin.started) counters.user.enabled++;
+            counters.user.total++;
         } else {
-            if (plugin.started) counter++;
-            total++;
-        };
+            if (plugin.started) counters.official.enabled++;
+            counters.official.total++;
+        }
     });
 
-    return `${counter} / ${total} (official)` + (totalUserplugins ? `, ${userpluginsCount} / ${totalUserplugins} (userplugins)` : "");
+    return `${counters.official.enabled} / ${counters.official.total} (official)` + (counters.user.total ? `, ${counters.user.enabled} / ${counters.user.total} (userplugins)` : "");
 }
 function getDonorStatus() {
     return GuildMemberStore.getMember("1015060230222131221", UserStore.getCurrentUser().id).roles.includes("1042507929485586532");
@@ -112,34 +119,12 @@ function humanFileSize(bytes, si = false, dp = 1) {
     return bytes.toFixed(dp) + " " + units[u];
 }
 
-let BUILD_NUMBER;
-let VERSION_HASH;
+const getVersions = findByCodeLazy("logsUploaded:new Date().toISOString(),");
 
 export default definePlugin({
     name: "venfetch",
     description: "neofetch for vencord",
     authors: [Devs.nin0dev],
-    patches: [
-        {
-            find: /.log\("[BUILD INFO]/,
-            replacement: [
-                {
-                    match: /Build Number: "\).concat\(("\d+")/,
-                    replace: "Build Number: \").concat($self.setBuildNumber($1)"
-                },
-                {
-                    match: /Version Hash: \"\).concat\(("\w+")/,
-                    replace: "Version Hash: \").concat($self.setVersionHash($1)"
-                }
-            ]
-        }
-    ],
-    setBuildNumber(buildNumber) {
-        return BUILD_NUMBER = buildNumber;
-    },
-    setVersionHash(versionHash) {
-        return VERSION_HASH = versionHash;
-    },
     commands: [
         {
             name: "venfetch",
@@ -147,23 +132,27 @@ export default definePlugin({
             inputType: ApplicationCommandInputType.BUILT_IN,
             execute: (args: Argument[], ctx: CommandContext) => {
                 const { username } = UserStore.getCurrentUser();
+                const versions = getVersions();
                 const info: Record<string, string | null> = {
                     version: `${VERSION} ~ ${gitHash}${SettingsPlugin.additionalInfo} - ${Intl.DateTimeFormat(navigator.language, { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
                     client: `${t(window.GLOBAL_ENV.RELEASE_CHANNEL)} ~ ${clientVersion()}`,
-                    // TODO: fix this
-                    // build: `${BUILD_NUMBER ?? "Unknown"} (${VERSION_HASH?.slice(0, 7) ?? 'unknown'})`,
+                    'Build Number': `${versions.buildNumber} ~ Hash: ${versions.versionHash?.slice(0, 7) ?? 'unknown'}`,
+
+                    _: null,
+
                     // @ts-ignore
                     platform: navigator.userAgentData?.platform ? `${navigator.userAgentData?.platform} (${navigator.platform})` : navigator.platform,
                     plugins: getEnabledPlugins(),
                     uptime: `${~~((Date.now() - window.GLOBAL_ENV.HTML_TIMESTAMP) / 1000)}s`,
                     // TODO: pr to vencord real and add to vencordnative
                     // memory: `${humanFileSize(VencordNative.memoryUsage().heapUsed)} / ${humanFileSize(VencordNative.memoryUsage().heapTotal)}`,
-                    _: null,
+
+                    __: null,
 
                     donor: getDonorStatus() ? "yes" : "no",
                     contributor: getContribStatus() ? "yes" : "no",
 
-                    __: null,
+                    ___: null,
 
                     __COLOR_TEST__: "███████████████████████████"