From 28d9ec5af0c4240df967c9d216c8c97b59c9ec25 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Thu, 27 Mar 2025 11:45:50 -0400 Subject: [PATCH] Drop StatsFM by request of creator --- README.md | 3 +- misc/install.sh | 8 +- src/equicordplugins/fontLoader/index.tsx | 2 +- src/equicordplugins/statsfm/index.tsx | 389 ----------------------- src/utils/constants.ts | 4 - 5 files changed, 6 insertions(+), 400 deletions(-) delete mode 100644 src/equicordplugins/statsfm/index.tsx diff --git a/README.md b/README.md index 5abbf3b6..60489d73 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch ### Extra included plugins
-162 additional plugins +161 additional plugins ### All Platforms - AllCallTimers by MaxHerbold & D3SOX @@ -136,7 +136,6 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch - Slap by Korbo - SoundBoardLogger by Moxxie, fres, echo, maintained by thororen - SpotifyLyrics by Joona -- StatsfmRPC by Crxaw & vmohammad - StatusPresets by iamme - SteamStatusSync by niko - StickerBlocker by Samwich diff --git a/misc/install.sh b/misc/install.sh index 3b72aa2a..08fe8bdd 100644 --- a/misc/install.sh +++ b/misc/install.sh @@ -58,7 +58,7 @@ check_for_updates() { echo -e "${YELLOW}Warning: Could not fetch last modified date from GitHub. Using existing installer.${NC}" return fi - + local_modified=$(stat -c "%y" "$INSTALLER_PATH" | cut -d' ' -f1-2) || error "Failed to get local modified date" if [ "$local_modified" != "$latest_modified" ]; then @@ -92,11 +92,11 @@ main() { debug_log "Starting installation process" check_root check_for_updates - + local priv_cmd priv_cmd=$(find_privilege_cmd) debug_log "Using privilege command: $priv_cmd" - + echo -e "${YELLOW}Running installer with $priv_cmd...${NC}" debug_log "Executing installer: $priv_cmd $INSTALLER_PATH" if ! "$priv_cmd" "$INSTALLER_PATH"; then @@ -108,7 +108,7 @@ main() { echo -e "\n${GREEN}Installation completed successfully!${NC}" echo -e "\nCredits:" echo "Original script forked from Vencord" - echo "Modified by PhoenixAceVFX & Crxaw for Equicord Updater" + echo "Modified by PhoenixAceVFX for Equicord Updater" echo "Rewrite by PhoenixAceVFX" } diff --git a/src/equicordplugins/fontLoader/index.tsx b/src/equicordplugins/fontLoader/index.tsx index f1e94699..7bc5593d 100644 --- a/src/equicordplugins/fontLoader/index.tsx +++ b/src/equicordplugins/fontLoader/index.tsx @@ -196,7 +196,7 @@ const settings = definePluginSettings({ export default definePlugin({ name: "FontLoader", description: "Loads any font from Google Fonts", - authors: [EquicordDevs.Crxa, EquicordDevs.vmohammad], // Crxa's only here because he came up with the idea + authors: [EquicordDevs.vmohammad], settings, async start() { diff --git a/src/equicordplugins/statsfm/index.tsx b/src/equicordplugins/statsfm/index.tsx deleted file mode 100644 index 280dfc84..00000000 --- a/src/equicordplugins/statsfm/index.tsx +++ /dev/null @@ -1,389 +0,0 @@ -/* - * Vencord, a Discord client mod - * Copyright (c) 2025 Vendicated and contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -import { definePluginSettings } from "@api/Settings"; -import { getUserSettingLazy } from "@api/UserSettings"; -import { EquicordDevs } from "@utils/constants"; -import { Logger } from "@utils/Logger"; -import definePlugin, { OptionType } from "@utils/types"; -import { findByPropsLazy } from "@webpack"; -import { ApplicationAssetUtils, FluxDispatcher, Forms } from "@webpack/common"; - -interface ActivityAssets { - large_image?: string; - large_text?: string; - small_image?: string; - small_text?: string; -} - - -interface ActivityButton { - label: string; - url: string; -} - -interface Activity { - state: string; - details?: string; - timestamps?: { - start?: number; - }; - assets?: ActivityAssets; - buttons?: Array; - name: string; - application_id: string; - metadata?: { - button_urls?: Array; - }; - type: number; - flags: number; -} - -interface TrackData { - name: string; - albums: string; - artists: string; - url: string; - imageUrl?: string; -} - -// only relevant enum values -const enum ActivityType { - PLAYING = 0, - LISTENING = 2, -} - -const enum ActivityFlag { - INSTANCE = 1 << 0, -} - -const enum NameFormat { - StatusName = "status-name", - ArtistFirst = "artist-first", - SongFirst = "song-first", - ArtistOnly = "artist", - SongOnly = "song", - albumsName = "albums" -} - - - -interface Albums { - id: number; - image: string; - name: string; -} - -interface Artists { - id: number; - name: string; - image: string; -} - -interface ExternalIds { - spotify: string[]; - appleMusic: string[]; -} - -interface Track { - albums: Albums[]; - artists: Artists[]; - durationMs: number; - explicit: boolean; - externalIds: ExternalIds; - id: number; - name: string; - spotifyPopularity: number; - spotifyPreview: string; - appleMusicPreview: string; -} - -interface Item { - date: string; - isPlaying: boolean; - progressMs: number; - deviceName: string; - track: Track; - platform: string; -} - -interface SFMR { - item: Item; -} - -const ShowCurrentGame = getUserSettingLazy("status", "showCurrentGame")!; - -const applicationId = "1325126169179197500"; -const placeholderId = "2a96cbd8b46e442fc41c2b86b821562f"; - -const logger = new Logger("StatsfmPresence"); - -const PresenceStore = findByPropsLazy("getLocalPresence"); - -async function getApplicationAsset(key: string): Promise { - return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0]; -} - -function setActivity(activity: Activity | null) { - FluxDispatcher.dispatch({ - type: "LOCAL_ACTIVITY_UPDATE", - activity, - socketId: "StatsfmPresence", - }); -} - -const settings = definePluginSettings({ - username: { - description: "Stats.fm username", - type: OptionType.STRING, - }, - shareUsername: { - description: "Show link to stats.fm profile", - type: OptionType.BOOLEAN, - default: false, - }, - shareSong: { - description: "Show link to song on stats.fm", - type: OptionType.BOOLEAN, - default: true, - }, - hideWithSpotify: { - description: "Hide stats.fm presence if spotify is running", - type: OptionType.BOOLEAN, - default: false, - }, - hideWithExternalRPC: { - description: "Hides stats.fm presence if an external RPC is running", - type: OptionType.BOOLEAN, - default: false, - }, - enableGameActivity: { - description: "Enable game activity for Stats.fm", // Credit to LastfmPresence for this setting - type: OptionType.BOOLEAN, - default: false, - }, - statusName: { - description: "Custom status text", - type: OptionType.STRING, - default: "Stats.fm", - }, - nameFormat: { - description: "Show name of song and artist in status name", - type: OptionType.SELECT, - options: [ - { - label: "Use custom status name", - value: NameFormat.StatusName, - default: true - }, - { - label: "Use format 'artist - song'", - value: NameFormat.ArtistFirst - }, - { - label: "Use format 'song - artist'", - value: NameFormat.SongFirst - }, - { - label: "Use artist name only", - value: NameFormat.ArtistOnly - }, - { - label: "Use song name only", - value: NameFormat.SongOnly - }, - { - label: "Use albums name (falls back to custom status text if song has no albums)", - value: NameFormat.albumsName - } - ], - }, - useListeningStatus: { - description: 'Show "Listening to" status instead of "Playing"', - type: OptionType.BOOLEAN, - default: true, - }, - missingArt: { - description: "When albums or albums art is missing", - type: OptionType.SELECT, - options: [ - { - label: "Use large Stats.fm logo", - value: "StatsFmLogo", - default: true - }, - { - label: "Use generic placeholder", - value: "placeholder" - } - ], - }, - showStatsFmLogo: { - description: "Show the Stats.fm next to the albums cover", - type: OptionType.BOOLEAN, - default: true, - }, - alwaysHideArt: { - description: "Disable downloading album art", - type: OptionType.BOOLEAN, - default: false, - } -}); - -export default definePlugin({ - name: "StatsfmPresence", - description: "Statsfm presence to track your music", - authors: [EquicordDevs.Crxa, EquicordDevs.vmohammad], - - settingsAboutComponent: () => ( - <> - How does this work? - - Hey this is just here to explain how this works. By putting your stats.fm username in the settings, it will show what you're currently listening to on your discord profile. (this doesnt require an api but requires you to have your listening history public) - - - ), - - settings, - - start() { - this.updatePresence(); - this.updateInterval = setInterval(() => { this.updatePresence(); }, 16000); - }, - - stop() { - clearInterval(this.updateInterval); - }, - - async fetchTrackData(): Promise { - if (!settings.store.username) - return null; - - try { - - const res = await fetch(`https://api.stats.fm/api/v1/users/${settings.store.username}/streams/current`); - if (!res.ok) throw `${res.status} ${res.statusText}`; - - - const json = await res.json() as SFMR; - if (!json.item) { - logger.error("Error from Stats.fm API", json); - return null; - } - - const trackData = json.item.track; - if (settings.store.enableGameActivity && trackData) { - ShowCurrentGame.updateSetting(true); - } else if (settings.store.enableGameActivity) { - ShowCurrentGame.updateSetting(false); - } - if (!trackData) return null; - return { - name: trackData.name || "Unknown", - albums: trackData.albums.map(a => a.name).join(", ") ?? "Unknown", - artists: trackData.artists[0].name ?? "Unknown", - url: `https://stats.fm/track/${trackData.id}`, // https://stats.fm/track/665906 / https://twirl.cx/dj2gL.png reminder of what the id looks like to fetch track - imageUrl: trackData.albums[0].image - }; - } catch (e) { - logger.error("Failed to query Stats.fm API", e); - // will clear the rich presence if API fails - return null; - } - }, - - async updatePresence() { - setActivity(await this.getActivity()); - }, - - getLargeImage(track: TrackData): string | undefined { - if (!settings.store.alwaysHideArt && track.imageUrl && !track.imageUrl.includes(placeholderId)) - return track.imageUrl; - - if (settings.store.missingArt === "placeholder") - return "placeholder"; - }, - - async getActivity(): Promise { - if (settings.store.hideWithExternalRPC) { - if (PresenceStore.getActivities().some(a => a.application_id !== applicationId)) { - return null; - } - } - - if (settings.store.hideWithSpotify) { - if (PresenceStore.getActivities().some(a => a.type === ActivityType.LISTENING && a.application_id !== applicationId)) { - // there is already music status because of Spotify or richerCider (probably more) - return null; - } - } - - const trackData = await this.fetchTrackData(); - if (!trackData) return null; - - const largeImage = this.getLargeImage(trackData); - const assets: ActivityAssets = largeImage ? - { - large_image: await getApplicationAsset(largeImage), - large_text: trackData.albums || undefined, - ...(settings.store.showStatsFmLogo && { - small_image: await getApplicationAsset("statsfm-large"), - small_text: "Stats.fm" - }), - } : { - large_image: await getApplicationAsset("statsfm-large"), - large_text: trackData.albums || undefined, - }; - - const buttons: ActivityButton[] = []; - - if (settings.store.shareUsername) - buttons.push({ - label: "Stats.fm Profile", - url: `https://stats.fm/${settings.store.username}`, - }); - - if (settings.store.shareSong) - buttons.push({ - label: "View Song", - url: trackData.url, - }); - - const statusName = (() => { - switch (settings.store.nameFormat) { - case NameFormat.ArtistFirst: - return trackData.artists + " - " + trackData.name; - case NameFormat.SongFirst: - return trackData.name + " - " + trackData.artists; - case NameFormat.ArtistOnly: - return trackData.artists; - case NameFormat.SongOnly: - return trackData.name; - case NameFormat.albumsName: - return trackData.albums || settings.store.statusName; - default: - return settings.store.statusName; - } - })(); - - return { - application_id: applicationId, - name: statusName, - - details: trackData.name, - state: trackData.artists, - assets, - - buttons: buttons.length ? buttons.map(v => v.label) : undefined, - metadata: { - button_urls: buttons.map(v => v.url), - }, - - type: settings.store.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING, - flags: ActivityFlag.INSTANCE, - }; - } -}); diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 76dd378d..c22859c2 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -807,10 +807,6 @@ export const EquicordDevs = Object.freeze({ name: "Hen", id: 279266228151779329n }, - Crxa: { - name: "Crxa", - id: 920290194886914069n - }, vmohammad: { name: "vMohammad", id: 921098159348924457n