userplugins/venfetch
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
duke dennis 2024-10-27 15:02:40 +00:00
commit 48af94224b
Signed by: duke
GPG key ID: A069D884579D2915
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
index.ts
View file

@ -15,12 +15,13 @@ import { PluginMeta } from "~plugins";
import SettingsPlugin from "../../plugins/_core/settings"; import SettingsPlugin from "../../plugins/_core/settings";
const clientVersion = (() => { const clientVersion = () => {
const version = IS_DISCORD_DESKTOP ? DiscordNative.app.getVersion() : IS_VESKTOP ? VesktopNative.app.getVersion() : null; const version = IS_DISCORD_DESKTOP ? DiscordNative.app.getVersion() : IS_VESKTOP ? VesktopNative.app.getVersion() : null;
// @ts-ignore
const name = IS_DISCORD_DESKTOP ? "Desktop" : IS_VESKTOP ? "Vesktop" : typeof unsafeWindow !== "undefined" ? "UserScript" : "Web"; const name = IS_DISCORD_DESKTOP ? "Desktop" : IS_VESKTOP ? "Vesktop" : typeof unsafeWindow !== "undefined" ? "UserScript" : "Web";
return `${name}${version ? ` v${version}` : ""}`; return `${name}${version ? ` v${version}` : ''}`;
})(); };
const uptime = Date.now(); const uptime = Date.now();
const lines = `\ const lines = `\
@ -113,7 +114,7 @@ export default definePlugin({
const { username } = UserStore.getCurrentUser(); const { username } = UserStore.getCurrentUser();
const info: Record<string, string | null> = { const info: Record<string, string | null> = {
version: `${VERSION} ~ ${gitHash}${SettingsPlugin.additionalInfo} - ${Intl.DateTimeFormat(navigator.language, { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`, version: `${VERSION} ~ ${gitHash}${SettingsPlugin.additionalInfo} - ${Intl.DateTimeFormat(navigator.language, { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
client: `${t(window.GLOBAL_ENV.RELEASE_CHANNEL)} ~ ${VERSION}`, client: `${t(window.GLOBAL_ENV.RELEASE_CHANNEL)} ~ ${clientVersion()}`,
// @ts-ignore // @ts-ignore
platform: navigator.userAgentData?.platform ?? navigator.platform, platform: navigator.userAgentData?.platform ?? navigator.platform,
plugins: getEnabledPlugins(), plugins: getEnabledPlugins(),