diff --git a/index.ts b/index.ts index a620f56..51728bc 100644 --- a/index.ts +++ b/index.ts @@ -13,9 +13,8 @@ import { GuildMemberStore, UserStore } from "@webpack/common"; import plugins, { PluginMeta } from "~plugins"; -import SettingsPlugin from "../../plugins/_core/settings"; import { isPluginDev } from "@utils/misc"; -import { findByCodeLazy } from "@webpack"; +import SettingsPlugin from "../../plugins/_core/settings"; const clientVersion = () => { const version = IS_DISCORD_DESKTOP ? DiscordNative.app.getVersion() : IS_VESKTOP ? VesktopNative.app.getVersion() : null; @@ -66,28 +65,22 @@ VV VV const isApiPlugin = (plugin: Plugin) => plugin.name.endsWith("API") || plugin.required; function getEnabledPlugins() { - const counters = { - official: { - enabled: 0, - total: 0 - }, - user: { - enabled: 0, - total: 0 - } - }; + let counter = 0; + let total = 0; + let userpluginsCount = 0; + let totalUserplugins = 0; - 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++; + Object.values(plugins).filter((plugin) => !isApiPlugin(plugin)).forEach((plugin) => { + if (PluginMeta[plugin.name].userPlugin) { + if (plugin.started) userpluginsCount++; + totalUserplugins++; } else { - if (plugin.started) counters.official.enabled++; - counters.official.total++; - } + if (plugin.started) counter++; + total++; + }; }); - return `${counters.official.enabled} / ${counters.official.total} (official)` + (counters.user.total ? `, ${counters.user.enabled} / ${counters.user.total} (userplugins)` : ""); + return `${counter} / ${total} (official)` + (totalUserplugins ? `, ${userpluginsCount} / ${totalUserplugins} (userplugins)` : ""); } function getDonorStatus() { return GuildMemberStore.getMember("1015060230222131221", UserStore.getCurrentUser().id).roles.includes("1042507929485586532"); @@ -119,12 +112,34 @@ function humanFileSize(bytes, si = false, dp = 1) { return bytes.toFixed(dp) + " " + units[u]; } -const getVersions = findByCodeLazy("logsUploaded:new Date().toISOString(),"); +let BUILD_NUMBER; +let VERSION_HASH; 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", @@ -132,27 +147,23 @@ export default definePlugin({ inputType: ApplicationCommandInputType.BUILT_IN, execute: (args: Argument[], ctx: CommandContext) => { const { username } = UserStore.getCurrentUser(); - const versions = getVersions(); const info: Record = { version: `${VERSION} ~ ${gitHash}${SettingsPlugin.additionalInfo} - ${Intl.DateTimeFormat(navigator.language, { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`, client: `${t(window.GLOBAL_ENV.RELEASE_CHANNEL)} ~ ${clientVersion()}`, - 'Build Number': `${versions.buildNumber} ~ Hash: ${versions.versionHash?.slice(0, 7) ?? 'unknown'}`, - - _: null, - + // TODO: fix this + // build: `${BUILD_NUMBER ?? "Unknown"} (${VERSION_HASH?.slice(0, 7) ?? 'unknown'})`, // @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__: "███████████████████████████"