Skip to content
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

Jump to bottom

fix: user reactions do not appear in userlist #18855

Merged
merged 2 commits into from
Sep 27, 2023
Merged

fix: user reactions do not appear in userlist #18855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d72a0f
display user reactions in userlist
ramonlsouza Sep 26, 2023
47e6943
fix eslint
ramonlsouza Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions bigbluebutton-html5/imports/ui/Types/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ export interface Voice {
startTime: number;
}

export interface Reaction {
reactionEmoji: string;
}

export interface User {
userId: string;
extId: string;
Expand All @@ -66,4 +70,5 @@ export interface User {
size: number;
away: boolean;
raiseHand: boolean;
reaction: Reaction;
}
2 changes: 2 additions & 0 deletions ...r-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ const UserListItem: React.FC<UserListItemProps> = ({ user, lockSettings }) => {
: <Icon iconName={normalizeEmojiName('away')} />;
} if (user.emoji !== 'none' && user.emoji !== 'notAway') {
return <Icon iconName={normalizeEmojiName(user.emoji)} />;
} if (user.reaction && user.reaction.reactionEmoji !== 'none') {
return user.reaction.reactionEmoji;
} if (user.name && userAvatarFiltered.length === 0) {
return user.name.toLowerCase().slice(0, 2);
} return '';
Expand Down
3 changes: 3 additions & 0 deletions bigbluebutton-html5/imports/ui/core/graphql/queries/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ export const USER_LIST_SUBSCRIPTION = gql`subscription Users($offset: Int!, $lim
shortName
currentlyInRoom
}
reaction {
reactionEmoji
}
}
}`;

Expand Down