Skip to content

feat: show status in relevant places #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gamesguru wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: show status in relevant places #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/web/src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
precenseInfo.state = member.user.presence;
precenseInfo.lastActiveAgo = member.user.lastActiveAgo;
precenseInfo.currentlyActive = member.user.currentlyActive;
precenseInfo.statusMessage = member.user.presenceStatusMsg;

Check warning on line 102 in apps/web/src/components/viewmodels/right_panel/user_info/UserInfoHeaderViewModel.tsx

View workflow job for this annotation

GitHub Actions / Tests

Uncovered Line 

Line 102 is not covered by tests
}

if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/components/views/avatars/MemberAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
roomId: member?.roomId ?? "",
}) ?? fallbackUserId;
}

if (member.user?.presenceStatusMsg) {
title = title ? `${title}\n${member.user.presenceStatusMsg}` : member.user.presenceStatusMsg;

Check warning on line 79 in apps/web/src/components/views/avatars/MemberAvatar.tsx

View workflow job for this annotation

GitHub Actions / Tests

Uncovered Line 

Line 79 is not covered by tests
}
}

return (
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/components/views/right_panel/user_info/UserInfoHeaderView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
</Flex>
</Heading>
{presenceLabel}
{vm.precenseInfo.statusMessage && (

Check warning on line 77 in apps/web/src/components/views/right_panel/user_info/UserInfoHeaderView.tsx

View workflow job for this annotation

GitHub Actions / Tests

Uncovered Line 

Line 77 is not covered by tests
<div className="mx_UserInfo_statusMessage">{vm.precenseInfo.statusMessage}</div>
)}
{vm.timezoneInfo && (
<Tooltip label={vm.timezoneInfo?.timezone ?? ""}>
<Flex align="center" className="mx_UserInfo_timezone">
Expand Down
7 changes: 6 additions & 1 deletion apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,17 @@
export function RoomMemberTileView(props: IProps): JSX.Element {
const vm = useMemberTileViewModel(props);
const member = vm.member;
let title = member.displayUserId;
if (member.user?.presenceStatusMsg) {
title = title ? `${title}\n${member.user.presenceStatusMsg}` : member.user.presenceStatusMsg;

Check warning on line 41 in apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx

View workflow job for this annotation

GitHub Actions / Tests

Uncovered Line 

Line 41 is not covered by tests
}

const av = (
<BaseAvatar
size="32px"
name={member.name}
idName={member.userId}
title={member.displayUserId}
title={title}
url={member.avatarThumbnailUrl}
altText={_t("common|user_avatar")}
/>
Expand Down
Loading