diff --git a/packages/discord-types/src/stores/PresenceStore.d.ts b/packages/discord-types/src/stores/PresenceStore.d.ts index f94df8f49..ff2fdf874 100644 --- a/packages/discord-types/src/stores/PresenceStore.d.ts +++ b/packages/discord-types/src/stores/PresenceStore.d.ts @@ -8,15 +8,17 @@ export interface UserAndActivity { export type DiscordPlatform = "desktop" | "mobile" | "web" | "embedded" | "vr"; +export type ClientStatusMap = Partial>; + export interface PresenceStoreState { - presencesForGuilds: Record>; }>>; + presencesForGuilds: Record>; statuses: Record; activities: Record; filteredActivities: Record; hiddenActivities: Record; // TODO: finish typing activityMetadata: Record; - clientStatuses: Record>>; + clientStatuses: Record; } export class PresenceStore extends FluxStore { @@ -26,7 +28,7 @@ export class PresenceStore extends FluxStore { getActivityMetadata(userId: string): any; getAllApplicationActivities(applicationId: string): UserAndActivity[]; getApplicationActivity(userId: string, applicationId: string, guildId?: string): Activity | null; - getClientStatus(userId: string): Record; + getClientStatus(userId: string): ClientStatusMap; getHiddenActivities(): Activity[]; /** literally just getActivities(...)[0] */ getPrimaryActivity(userId: string, guildId?: string): Activity | null; diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx index 4801da0d8..b6fcda42d 100644 --- a/src/plugins/platformIndicators/index.tsx +++ b/src/plugins/platformIndicators/index.tsx @@ -24,7 +24,7 @@ import { addMessageDecoration, removeMessageDecoration } from "@api/MessageDecor import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; -import { DiscordPlatform, OnlineStatus, User } from "@vencord/discord-types"; +import { ClientStatusMap, DiscordPlatform, OnlineStatus, User } from "@vencord/discord-types"; import { filters, findStoreLazy, mapMangledModuleLazy } from "@webpack"; import { AuthenticationStore, PresenceStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common"; @@ -47,7 +47,7 @@ const { useStatusFillColor } = mapMangledModuleLazy([".5625*", "translate"], { }); const platformMap = { - embedded: "Console", + embedded: "Embedded (Console or Game)", vr: "VR" }; @@ -60,9 +60,7 @@ const badge: ProfileBadge = { const indicatorLocations = { list: { description: "In the member list", - onEnable: () => addMemberListDecorator("platform-indicator", ({ user }) => - user && !user.bot ? : null - ), + onEnable: () => addMemberListDecorator("platform-indicator", ({ user }) => renderPlatformIndicators(user, true)), onDisable: () => removeMemberListDecorator("platform-indicator") }, badges: { @@ -72,10 +70,7 @@ const indicatorLocations = { }, messages: { description: "Inside messages", - onEnable: () => addMessageDecoration("platform-indicator", props => { - const user = props.message?.author; - return user && !user.bot ? : null; - }), + onEnable: () => addMessageDecoration("platform-indicator", props => renderPlatformIndicators(props.message?.author, false)), onDisable: () => removeMessageDecoration("platform-indicator") } }; @@ -84,7 +79,7 @@ const Icons = { desktop: Icon("M4 2.5c-1.103 0-2 .897-2 2v11c0 1.104.897 2 2 2h7v2H7v2h10v-2h-4v-2h7c1.103 0 2-.896 2-2v-11c0-1.103-.897-2-2-2H4Zm16 2v9H4v-9h16Z"), web: Icon("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2Zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93Zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39Z"), mobile: Icon("M 187 0 L 813 0 C 916.277 0 1000 83.723 1000 187 L 1000 1313 C 1000 1416.277 916.277 1500 813 1500 L 187 1500 C 83.723 1500 0 1416.277 0 1313 L 0 187 C 0 83.723 83.723 0 187 0 Z M 125 1000 L 875 1000 L 875 250 L 125 250 Z M 500 1125 C 430.964 1125 375 1180.964 375 1250 C 375 1319.036 430.964 1375 500 1375 C 569.036 1375 625 1319.036 625 1250 C 625 1180.964 569.036 1125 500 1125 Z", { viewBox: "0 0 1000 1500", height: 17, width: 17 }), - embedded: Icon("M14.8 2.7 9 3.1V47h3.3c1.7 0 6.2.3 10 .7l6.7.6V2l-4.2.2c-2.4.1-6.9.3-10 .5zm1.8 6.4c1 1.7-1.3 3.6-2.7 2.2C12.7 10.1 13.5 8 15 8c.5 0 1.2.5 1.6 1.1zM16 33c0 6-.4 10-1 10s-1-4-1-10 .4-10 1-10 1 4 1 10zm15-8v23.3l3.8-.7c2-.3 4.7-.6 6-.6H43V3h-2.2c-1.3 0-4-.3-6-.6L31 1.7V25z", { viewBox: "0 0 50 50" }), + embedded: Icon("M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z", { viewBox: "0 0 24 24", height: 20, width: 20 }), vr: Icon("M8.46 8.64a1 1 0 0 1 1 1c0 .44-.3.8-.72.92l-.11.07c-.08.06-.2.19-.2.41a.99.99 0 0 1-.98.86h-.06a1 1 0 0 1-.94-1.05l.02-.32c.05-1.06.92-1.9 1.99-1.9ZM15.55 5a5.5 5.5 0 0 1 5.15 3.67h.3a2 2 0 0 1 2 2v3.18a2 2 0 0 1-2 1.99h-.2A4.54 4.54 0 0 1 16.55 19a4.45 4.45 0 0 1-3.6-1.83 1.2 1.2 0 0 0-1.9 0 4.44 4.44 0 0 1-3.9 1.82 4.54 4.54 0 0 1-3.94-3.15H3a2 2 0 0 1-2-2v-3.18c0-1.1.9-1.99 2-1.99h.3A5.5 5.5 0 0 1 8.46 5h7.09Zm-7.1 2C6.6 7 5.06 8.5 4.97 10.41l-.02.66v3.18c0 1.43 1.05 2.66 2.34 2.74.85.06 1.63-.32 2.14-1.01a3.2 3.2 0 0 1 2.57-1.3c1 0 1.97.48 2.57 1.3.5.69 1.3 1.08 2.14 1.01 1.3-.08 2.34-1.31 2.34-2.74l-.02-3.84a3.54 3.54 0 0 0-3.49-3.43H8.45Z", { viewBox: "0 4 24 16", height: 20, width: 20 }), } satisfies Record; @@ -138,28 +133,24 @@ const PlatformIcon = ({ platform, status, small }: { platform: DiscordPlatform, return ; }; -function ensureOwnStatus(user: User) { - if (user.id === AuthenticationStore.getId()) { - const sessions = SessionsStore.getSessions(); - if (typeof sessions !== "object") return null; - const sortedSessions = Object.values(sessions).sort(({ status: a }, { status: b }) => { - if (a === b) return 0; - if (a === "online") return 1; - if (b === "online") return -1; - if (a === "idle") return 1; - if (b === "idle") return -1; - return 0; - }); +function getOwnStatus() { + const sessions = SessionsStore.getSessions(); + if (typeof sessions !== "object") return null; - const ownStatus = Object.values(sortedSessions).reduce((acc, curr) => { - if (curr.clientInfo.client !== "unknown") - acc[curr.clientInfo.client] = curr.status; - return acc; - }, {}); + const sortedSessions = Object.values(sessions).sort(({ status: a }, { status: b }) => { + if (a === b) return 0; + if (a === "online") return 1; + if (b === "online") return -1; + if (a === "idle") return 1; + if (b === "idle") return -1; + return 0; + }); - const { clientStatuses } = PresenceStore.getState(); - clientStatuses[AuthenticationStore.getId()] = ownStatus; - } + return Object.values(sortedSessions).reduce((acc, curr) => { + if (curr.clientInfo.client !== "unknown") + acc[curr.clientInfo.client] = curr.status; + return acc; + }, {} as ClientStatusMap); } function getBadges({ userId }: BadgeUserArgs): ProfileBadge[] { @@ -167,18 +158,18 @@ function getBadges({ userId }: BadgeUserArgs): ProfileBadge[] { if (!user || user.bot) return []; - ensureOwnStatus(user); + const status = user.id === AuthenticationStore.getId() + ? getOwnStatus() + : PresenceStore.getClientStatus(user.id); - const status = PresenceStore.getClientStatus(user.id); if (!status) return []; return Object.entries(status).map(([platform, status]) => ({ key: `vc-platform-indicator-${platform}`, id: `vc-platform-indicator-${platform}`, component: () => ( - + { - ensureOwnStatus(user); - - const status = useStateFromStores([PresenceStore], () => PresenceStore.getClientStatus(user.id)); - if (!status) return null; - - const icons = Object.entries(status).map(([platform, status]) => ( +function PlatformIndicators({ statusMap, small }: { statusMap: ClientStatusMap; small: boolean; }) { + const icons = Object.entries(statusMap).map(([platform, status]) => ( ); -}; +} + +function renderPlatformIndicators(user: User, small: boolean) { + if (!user || user.bot) return null; + if (user.id === AuthenticationStore.getId()) return ; + return ; +} + +function CurrentUserPlatformIndicators({ small }: { small: boolean; }) { + const statusMap = useStateFromStores([SessionsStore], getOwnStatus); + return statusMap ? : null; +} + +function OtherUserPlatformIndicators({ user, small = false }: { user: User; small?: boolean; }) { + const statusMap = useStateFromStores([PresenceStore], () => PresenceStore.getClientStatus(user.id)); + return statusMap ? : null; +} export default definePlugin({ name: "PlatformIndicators",