diff --git a/src/equicordplugins/betterActivities/components/SpotifyIcon.tsx b/src/equicordplugins/betterActivities/components/SpotifyIcon.tsx deleted file mode 100644 index 9210169e..00000000 --- a/src/equicordplugins/betterActivities/components/SpotifyIcon.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Vencord, a Discord client mod - * Copyright (c) 2024 Vendicated and contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -import type { SVGProps } from "react"; - -export function SpotifyIcon(props: SVGProps) { - return (); -} diff --git a/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx b/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx index 16a1bc46..0a3c39bf 100644 --- a/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx +++ b/src/equicordplugins/betterActivities/patch-helpers/activityList.tsx @@ -10,7 +10,6 @@ import { React, Tooltip } from "@webpack/common"; import { JSX } from "react"; import { ActivityTooltip } from "../components/ActivityTooltip"; -import { SpotifyIcon } from "../components/SpotifyIcon"; import { TwitchIcon } from "../components/TwitchIcon"; import { settings } from "../settings"; import { ActivityListIcon, ActivityListProps, ApplicationIcon, IconCSSProperties } from "../types"; @@ -57,7 +56,6 @@ export function patchActivityList({ activities, user, hideTooltip }: ActivityLis } }; addActivityIcon("Twitch", TwitchIcon); - addActivityIcon("Spotify", SpotifyIcon); if (icons.length) { const iconStyle: IconCSSProperties = { diff --git a/src/equicordplugins/betterActivities/utils.tsx b/src/equicordplugins/betterActivities/utils.tsx index 4798ad44..748b45b0 100644 --- a/src/equicordplugins/betterActivities/utils.tsx +++ b/src/equicordplugins/betterActivities/utils.tsx @@ -39,11 +39,11 @@ export function getActivityApplication(activity: Activity | null) { export function getApplicationIcons(activities: Activity[], preferSmall = false): ApplicationIcon[] { const applicationIcons: ApplicationIcon[] = []; - const applications = activities.filter(activity => activity.application_id || activity.platform); + const applications = activities.filter(activity => activity.application_id || activity.platform || activity.id.startsWith("spotify:")); for (const activity of applications) { - const { assets, application_id, platform } = activity; - if (!application_id && !platform) continue; + const { assets, application_id, platform, id } = activity; + if (!application_id && !platform && !id.startsWith("spotify:")) continue; if (assets) { const { small_image, small_text, large_image, large_text } = assets; @@ -59,6 +59,12 @@ export function getApplicationIcons(activities: Activity[], preferSmall = false) activity }); } + } else if (image.startsWith("spotify:")) { + const url = `https://i.scdn.co/image/${image.split(":")[1]}`; + applicationIcons.push({ + image: { src: url, alt }, + activity + }); } else { const src = `https://cdn.discordapp.com/app-assets/${application_id}/${image}.png`; applicationIcons.push({