Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(threads): group thread members by role and show role colors (#3558)

Tarek1848cf8fcc7b
diff --git a/fluxer_app/src/features/channel/components/ChannelMembers.tsx b/fluxer_app/src/features/channel/components/ChannelMembers.tsx
index 3c1594502..723f76dd2 100644
--- a/fluxer_app/src/features/channel/components/ChannelMembers.tsx
+++ b/fluxer_app/src/features/channel/components/ChannelMembers.tsx
@@ -13,6 +13,7 @@ import Authentication from '@app/features/auth/state/Authentication';
import styles from '@app/features/channel/components/ChannelMembers.module.css';
import {hasVisibleCompactMemberCustomStatus} from '@app/features/channel/components/CompactMemberCustomStatus';
import {MemberListContainer} from '@app/features/channel/components/MemberListContainer';
+import {MemberListGroupHeader} from '@app/features/channel/components/MemberListGroupHeader';
import {MemberListItem} from '@app/features/channel/components/MemberListItem';
import {
MEMBER_LIST_GROUP_HEADER_HEIGHT_PX,
@@ -30,7 +31,6 @@ import {MemberListUnavailableFallback} from '@app/features/channel/components/sh
import type {Channel} from '@app/features/channel/models/Channel';
import type {Guild} from '@app/features/guild/models/Guild';
import {OFFLINE_DESCRIPTOR, ONLINE_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
import {useMemberListSubscription} from '@app/features/member/hooks/useMemberListSubscription';
import {resolveMemberListViewportModel} from '@app/features/member/state/MemberListViewportStateMachine';
import MemberSidebar from '@app/features/member/state/MemberSidebar';
@@ -53,7 +53,6 @@ import * as MemberListUtils from '@app/features/member/utils/MemberListUtils';
import * as PermissionUtils from '@app/features/permissions/utils/PermissionUtils';
import Presence from '@app/features/presence/state/Presence';
import {getRemScaleForDocument} from '@app/features/theme/layout/RemFromPx';
-import {openRoleContextMenu, openRoleContextMenuForElement} from '@app/features/ui/action_menu/RoleContextMenu';
import type {ScrollerHandle} from '@app/features/ui/components/Scroller';
import {getAppRemScale} from '@app/features/ui/utils/AppZoomUtils';
import type {User} from '@app/features/user/models/User';
@@ -137,37 +136,6 @@ function useGroupHeadingWidthTracking(): GroupHeadingWidthTracking {
return trackingRef.current;
}
-interface MemberListGroupHeaderContentProps {
- name: string;
- count: number;
-}
-
-function MemberListGroupHeaderContent({name, count}: MemberListGroupHeaderContentProps) {
- const {i18n} = useLingui();
- return (
- <>
- <span
- className={styles.groupHeaderLabel}
- data-flx="channel.channel-members.member-list-group-header-content.group-header-label"
- >
- {name}
- </span>
- <span
- className={styles.groupHeaderSeparator}
- data-flx="channel.channel-members.member-list-group-header-content.group-header-separator"
- >
- {'—'}
- </span>
- <span
- className={styles.groupHeaderCount}
- data-flx="channel.channel-members.member-list-group-header-content.group-header-count"
- >
- {getCachedNumberFormat(i18n.locale).format(count)}
- </span>
- </>
- );
-}
-
interface GroupDMMemberListGroupProps {
group: GroupDMMemberGroup;
channelId: string;
@@ -177,18 +145,14 @@ interface GroupDMMemberListGroupProps {
const GroupDMMemberListGroup = observer(({group, channelId, ownerId, onHeadingRef}: GroupDMMemberListGroupProps) => (
<div className={styles.groupContainer} data-flx="channel.channel-members.group-dm-member-list-group.group-container">
- <div
+ <MemberListGroupHeader
ref={onHeadingRef}
- data-member-group-id={group.id}
+ groupId={group.id}
+ guildRole={null}
+ name={group.displayName}
+ count={group.count}
className={styles.groupHeader}
- data-flx="channel.channel-members.group-dm-member-list-group.group-header"
- >
- <MemberListGroupHeaderContent
- name={group.displayName}
- count={group.count}
- data-flx="channel.channel-members.group-dm-member-list-group.member-list-group-header-content"
- />
- </div>
+ />
<div className={styles.membersList} data-flx="channel.channel-members.group-dm-member-list-group.members-list">
{group.users.map((user) => {
const status = Presence.getStatus(user.id);
@@ -468,41 +432,17 @@ const LazyMemberList = observer(function LazyMemberList({guild, channel}: LazyMe
if (rowIndex === layout.headerRowIndex) {
const group = groupById.get(layout.id) ?? {id: layout.id, count: layout.count};
const role = group.id === 'online' || group.id === 'offline' ? null : (guild.getRole(group.id) ?? null);
- const groupName = getGroupName(group.id);
- const groupRowContent = (
- <MemberListGroupHeaderContent
- name={groupName}
- count={group.count}
- data-flx="channel.channel-members.lazy-member-list.member-list-group-header-content"
- />
- );
-
virtualRows.push(
- // biome-ignore lint/a11y/noStaticElementInteractions: Role headings have button semantics and handlers; other headings have neither.
- <div
+ <MemberListGroupHeader
key={`group-${group.id}`}
ref={registerGroupHeading}
- data-member-group-id={group.id}
+ groupId={group.id}
+ guildRole={role}
+ name={getGroupName(group.id)}
+ count={group.count}
className={clsx(styles.virtualRow, styles.virtualGroupRow)}
style={rowStyle}
- role={role ? 'button' : undefined}
- tabIndex={role ? 0 : undefined}
- onContextMenu={role ? (event) => openRoleContextMenu(event, role.id) : undefined}
- onKeyDown={
- role
- ? (event) => {
- if (event.key !== 'ContextMenu' && !(event.shiftKey && event.key === 'F10')) return;
- event.preventDefault();
- event.stopPropagation();
- openRoleContextMenuForElement(event.currentTarget, role.id);
- }
- : undefined
- }
- data-member-list-focus-item={role ? 'true' : undefined}
- data-flx="channel.channel-members.lazy-member-list.virtual-row.group"
- >
- {groupRowContent}
- </div>,
+ />,
);
continue;
diff --git a/fluxer_app/src/features/channel/components/MemberListGroupHeader.tsx b/fluxer_app/src/features/channel/components/MemberListGroupHeader.tsx
new file mode 100644
index 000000000..63a90872e
--- /dev/null
+++ b/fluxer_app/src/features/channel/components/MemberListGroupHeader.tsx
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import styles from '@app/features/channel/components/ChannelMembers.module.css';
+import type {GuildRole} from '@app/features/guild/models/GuildRole';
+import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
+import {openRoleContextMenu, openRoleContextMenuForElement} from '@app/features/ui/action_menu/RoleContextMenu';
+import {useLingui} from '@lingui/react/macro';
+import type {CSSProperties, Ref} from 'react';
+
+interface MemberListGroupHeaderProps {
+ groupId: string;
+ guildRole: GuildRole | null;
+ name: string;
+ count: number;
+ className: string;
+ style?: CSSProperties;
+ ref?: Ref<HTMLDivElement>;
+}
+
+export function MemberListGroupHeader({
+ groupId,
+ guildRole,
+ name,
+ count,
+ className,
+ style,
+ ref,
+}: MemberListGroupHeaderProps) {
+ const {i18n} = useLingui();
+ return (
+ // biome-ignore lint/a11y/noStaticElementInteractions: Role headings have button semantics and handlers; other headings have neither.
+ <div
+ ref={ref}
+ data-member-group-id={groupId}
+ className={className}
+ style={style}
+ role={guildRole ? 'button' : undefined}
+ tabIndex={guildRole ? 0 : undefined}
+ onContextMenu={guildRole ? (event) => openRoleContextMenu(event, guildRole.id) : undefined}
+ onKeyDown={
+ guildRole
+ ? (event) => {
+ if (event.key !== 'ContextMenu' && !(event.shiftKey && event.key === 'F10')) return;
+ event.preventDefault();
+ event.stopPropagation();
+ openRoleContextMenuForElement(event.currentTarget, guildRole.id);
+ }
+ : undefined
+ }
+ data-member-list-focus-item={guildRole ? 'true' : undefined}
+ data-flx="channel.member-list-group-header"
+ >
+ <span className={styles.groupHeaderLabel} data-flx="channel.member-list-group-header.label">
+ {name}
+ </span>
+ <span className={styles.groupHeaderSeparator} data-flx="channel.member-list-group-header.separator">
+ {'—'}
+ </span>
+ <span className={styles.groupHeaderCount} data-flx="channel.member-list-group-header.count">
+ {getCachedNumberFormat(i18n.locale).format(count)}
+ </span>
+ </div>
+ );
+}
diff --git a/fluxer_app/src/features/threads/components/ThreadMembersPanel.tsx b/fluxer_app/src/features/threads/components/ThreadMembersPanel.tsx
index 4f398f019..38730424d 100644
--- a/fluxer_app/src/features/threads/components/ThreadMembersPanel.tsx
+++ b/fluxer_app/src/features/threads/components/ThreadMembersPanel.tsx
@@ -4,12 +4,15 @@ import {OutlineFrame} from '@app/features/app/components/layout/OutlineFrame';
import Authentication from '@app/features/auth/state/Authentication';
import styles from '@app/features/channel/components/ChannelMembers.module.css';
import {MemberListContainer} from '@app/features/channel/components/MemberListContainer';
+import {MemberListGroupHeader} from '@app/features/channel/components/MemberListGroupHeader';
import {MemberListItem} from '@app/features/channel/components/MemberListItem';
import {MemberListSkeleton, MemberListSkeletonVariant} from '@app/features/channel/components/MemberListSkeleton';
import type {Channel} from '@app/features/channel/models/Channel';
+import type {Guild} from '@app/features/guild/models/Guild';
+import type {GuildRole} from '@app/features/guild/models/GuildRole';
import Guilds from '@app/features/guild/state/Guilds';
import {OFFLINE_DESCRIPTOR, ONLINE_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
-import {getCachedNumberFormat} from '@app/features/i18n/utils/IntlCache';
+import type {GuildMember} from '@app/features/member/models/GuildMember';
import GuildMembers from '@app/features/member/state/GuildMembers';
import LocalPresence from '@app/features/presence/state/LocalPresence';
import ThreadRoster, {type ThreadRosterMember} from '@app/features/threads/state/ThreadRoster';
@@ -33,6 +36,7 @@ export function useThreadRosterSubscription(thread: Channel | undefined): void {
interface RosterRow {
user: User;
+ member: GuildMember | undefined;
status: StatusType;
mobile?: boolean;
customStatus: CustomStatus | null;
@@ -40,40 +44,33 @@ interface RosterRow {
interface RosterGroupProps {
id: string;
+ guildRole: GuildRole | null;
label: string;
members: ReadonlyArray<RosterRow>;
thread: Channel;
ownerId: string | null;
}
-const RosterGroup = observer(({id, label, members, thread, ownerId}: RosterGroupProps) => {
- const {i18n} = useLingui();
+const RosterGroup = observer(({id, guildRole, label, members, thread, ownerId}: RosterGroupProps) => {
if (members.length === 0) return null;
return (
<div className={styles.groupContainer} data-flx="threads.thread-members-panel.roster-group.group-container">
- <div
+ <MemberListGroupHeader
+ groupId={id}
+ guildRole={guildRole}
+ name={label}
+ count={members.length}
className={styles.groupHeader}
- data-member-group-id={id}
- data-flx="threads.thread-members-panel.roster-group.group-header"
- >
- <span className={styles.groupHeaderLabel} data-flx="threads.thread-members-panel.roster-group.label">
- {label}
- </span>
- <span className={styles.groupHeaderSeparator} data-flx="threads.thread-members-panel.roster-group.separator">
- {'—'}
- </span>
- <span className={styles.groupHeaderCount} data-flx="threads.thread-members-panel.roster-group.count">
- {getCachedNumberFormat(i18n.locale).format(members.length)}
- </span>
- </div>
+ />
<div className={styles.membersList} data-flx="threads.thread-members-panel.roster-group.members-list">
- {members.map(({user, status, mobile, customStatus}) => (
+ {members.map(({user, member, status, mobile, customStatus}) => (
<MemberListItem
key={user.id}
user={user}
channelId={thread.id}
guildId={thread.guildId}
- guildMember={thread.guildId ? (GuildMembers.getMember(thread.guildId, user.id) ?? undefined) : undefined}
+ guildMember={member}
+ roleColor={member?.getColorString()}
status={status}
isMobile={mobile}
customStatus={customStatus}
@@ -93,11 +90,12 @@ function resolveMembers(guildId: string | undefined, roster: ReadonlyArray<Threa
for (const entry of roster) {
const user = Users.getUser(entry.userId);
if (!user) continue;
+ const member = guildId ? (GuildMembers.getMember(guildId, entry.userId) ?? undefined) : undefined;
if (user.id === Authentication.currentUserId) {
const status = LocalPresence.getStatus();
- members.push({user, status, customStatus: isOfflineStatus(status) ? null : LocalPresence.customStatus});
+ members.push({user, member, status, customStatus: isOfflineStatus(status) ? null : LocalPresence.customStatus});
} else {
- members.push({user, status: entry.status, mobile: entry.mobile, customStatus: entry.customStatus});
+ members.push({user, member, status: entry.status, mobile: entry.mobile, customStatus: entry.customStatus});
}
}
members.sort((a, b) =>
@@ -106,6 +104,13 @@ function resolveMembers(guildId: string | undefined, roster: ReadonlyArray<Threa
return members;
}
+function getHoistedRoles(guild: Guild | undefined): Array<GuildRole> {
+ if (!guild) return [];
+ return Object.values(guild.roles)
+ .filter((role) => role.hoist && role.id !== guild.id)
+ .sort((a, b) => b.effectiveHoistPosition - a.effectiveHoistPosition || (BigInt(a.id) < BigInt(b.id) ? -1 : 1));
+}
+
export const ThreadMembersList = observer(({thread}: {thread: Channel}) => {
const {i18n} = useLingui();
useThreadRosterSubscription(thread);
@@ -118,22 +123,48 @@ export const ThreadMembersList = observer(({thread}: {thread: Channel}) => {
/>
);
}
- const members = resolveMembers(thread.guildId, roster);
- const ownerId = thread.guildId ? (Guilds.getGuild(thread.guildId)?.ownerId ?? null) : null;
+ const guild = thread.guildId ? Guilds.getGuild(thread.guildId) : undefined;
+ const ownerId = guild?.ownerId ?? null;
+ const hoistedRoles = getHoistedRoles(guild);
+ const roleGroups = new Map<string, Array<RosterRow>>(hoistedRoles.map((role) => [role.id, []]));
+ const online: Array<RosterRow> = [];
+ const offline: Array<RosterRow> = [];
+ for (const row of resolveMembers(thread.guildId, roster)) {
+ if (isOfflineStatus(row.status)) {
+ offline.push(row);
+ continue;
+ }
+ const role = hoistedRoles.find((candidate) => row.member?.roles.has(candidate.id));
+ (role ? roleGroups.get(role.id)! : online).push(row);
+ }
return (
<>
+ {hoistedRoles.map((role) => (
+ <RosterGroup
+ key={role.id}
+ id={role.id}
+ guildRole={role}
+ label={role.name}
+ members={roleGroups.get(role.id)!}
+ thread={thread}
+ ownerId={ownerId}
+ data-flx="threads.thread-members-panel.thread-members-list.roster-group.role"
+ />
+ ))}
<RosterGroup
id="online"
+ guildRole={null}
label={i18n._(ONLINE_DESCRIPTOR)}
- members={members.filter((member) => !isOfflineStatus(member.status))}
+ members={online}
thread={thread}
ownerId={ownerId}
data-flx="threads.thread-members-panel.thread-members-list.roster-group.online"
/>
<RosterGroup
id="offline"
+ guildRole={null}
label={i18n._(OFFLINE_DESCRIPTOR)}
- members={members.filter((member) => isOfflineStatus(member.status))}
+ members={offline}
thread={thread}
ownerId={ownerId}
data-flx="threads.thread-members-panel.thread-members-list.roster-group.offline"