mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-03-14 06:00:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Update WhosWatching

Browse source
This commit is contained in:
thororen1234 2024-10-10 15:27:51 -04:00
parent 827a2dfa41
commit 56ee61957c
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/equicordplugins/whosWatching/index.tsx
View file

@ -37,20 +37,9 @@ const settings = definePluginSettings({
}, },
}); });
function encodeStreamKey(stream) {
const { streamType, guildId, channelId, ownerId } = stream;
switch (streamType) {
case "guild":
return [streamType, guildId, channelId, ownerId].join(":");
case "call":
return [streamType, channelId, ownerId].join(":");
default:
throw console.log("Unknown stream type ".concat(streamType));
}
}
function Watching({ userIds, guildId }: WatchingProps): JSX.Element { function Watching({ userIds, guildId }: WatchingProps): JSX.Element {
// Missing Users happen when UserStore.getUser(id) returns null -- The client should automatically cache spectators, so this might not be possible but it's better to be sure just in case // Missing Users happen when UserStore.getUser(id) returns null
// The client should automatically cache spectators, so this might not be possible but it's better to be sure just in case
let missingUsers = 0; let missingUsers = 0;
const users = userIds.map(id => UserStore.getUser(id)).filter(user => Boolean(user) ? true : (missingUsers += 1, false)); const users = userIds.map(id => UserStore.getUser(id)).filter(user => Boolean(user) ? true : (missingUsers += 1, false));
return ( return (
@ -82,13 +71,13 @@ export default definePlugin({
name: "WhosWatching", name: "WhosWatching",
description: "Hover over the screenshare icon to view what users are watching your stream", description: "Hover over the screenshare icon to view what users are watching your stream",
authors: [EquicordDevs.Fres], authors: [EquicordDevs.Fres],
settings: settings, settings,
patches: [ patches: [
{ {
find: ".Masks.STATUS_SCREENSHARE,width:32", find: ".Masks.STATUS_SCREENSHARE,width:32",
replacement: { replacement: {
match: /(\i):function\(\)\{return (\i)\}/, match: /jsx\)\((\i\.\i),{mask:/,
replace: "$1:function(){return $self.component({OriginalComponent:$2})}" replace: "jsx)($self.component({OriginalComponent:$1}),{mask:"
} }
}, },
{ {
@ -102,11 +91,9 @@ export default definePlugin({
], ],
WrapperComponent: ErrorBoundary.wrap(props => { WrapperComponent: ErrorBoundary.wrap(props => {
const stream = useStateFromStores([ApplicationStreamingStore], () => ApplicationStreamingStore.getCurrentUserActiveStream()); const stream = useStateFromStores([ApplicationStreamingStore], () => ApplicationStreamingStore.getCurrentUserActiveStream());
if (!stream) return <div {...props}>{props.children}</div>; if (!stream) return <div {...props}>{props.children}</div>;
const userIds = ApplicationStreamingStore.getViewerIds(encodeStreamKey(stream)); const userIds: string[] = ApplicationStreamingStore.getViewerIds(stream);
let missingUsers = 0; let missingUsers = 0;
const users = userIds.map(id => UserStore.getUser(id)).filter(user => Boolean(user) ? true : (missingUsers += 1, false)); const users = userIds.map(id => UserStore.getUser(id)).filter(user => Boolean(user) ? true : (missingUsers += 1, false));
@ -133,15 +120,15 @@ export default definePlugin({
<div className={classes(cl("spectators_panel"), Margins.top8)}> <div className={classes(cl("spectators_panel"), Margins.top8)}>
{users.length ? {users.length ?
<> <>
<Forms.FormTitle tag="h3" style={{ marginTop: 8, marginBottom: 0, textTransform: "uppercase" }}>{i18n.Messages.SPECTATORS.format({ numViewers: userIds.length })}</Forms.FormTitle> <Forms.FormTitle tag="h3" style={{ marginTop: 8, marginBottom: 0, textTransform: "uppercase" }}>
{i18n.Messages.SPECTATORS.format({ numViewers: userIds.length })}
</Forms.FormTitle>
<UserSummaryItem <UserSummaryItem
users={users} users={users}
count={userIds.length} count={userIds.length}
renderIcon={false} renderIcon={false}
max={12} max={12}
showDefaultAvatarsForNullUsers showDefaultAvatarsForNullUsers
showUserPopout
guildId={stream.guildId}
renderMoreUsers={renderMoreUsers} renderMoreUsers={renderMoreUsers}
renderUser={(user: User) => ( renderUser={(user: User) => (
<Clickable <Clickable
@ -166,8 +153,12 @@ export default definePlugin({
}), }),
component: function ({ OriginalComponent }) { component: function ({ OriginalComponent }) {
return ErrorBoundary.wrap((props: any) => { return ErrorBoundary.wrap((props: any) => {
const stream = useStateFromStores([ApplicationStreamingStore], () => ApplicationStreamingStore.getCurrentUserActiveStream()); const stream = useStateFromStores(
const viewers = ApplicationStreamingStore.getViewerIds(encodeStreamKey(stream)); [ApplicationStreamingStore],
() => ApplicationStreamingStore.getCurrentUserActiveStream()
);
if (!stream) return null;
const viewers = ApplicationStreamingStore.getViewerIds(stream);
return <Tooltip text={<Watching userIds={viewers} guildId={stream.guildId} />}> return <Tooltip text={<Watching userIds={viewers} guildId={stream.guildId} />}>
{({ onMouseEnter, onMouseLeave }) => ( {({ onMouseEnter, onMouseLeave }) => (
<div onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}> <div onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>