Merge pull request #18855 from ramonlsouza/add-reactions-userlist

fix: user reactions do not appear in userlist
bigbluebutton · Sep 27, 2023 · 5b196af · 5b196af
2 parents 60cbcda + 47e6943
commit 5b196af
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/bigbluebutton-html5/imports/ui/Types/user.ts b/bigbluebutton-html5/imports/ui/Types/user.ts
@@ -42,6 +42,10 @@ export interface Voice {
   startTime: number;
 }
 
+export interface Reaction {
+  reactionEmoji: string;
+}
+
 export interface User {
   userId: string;
   extId: string;
@@ -66,4 +70,5 @@ export interface User {
   size: number;
   away: boolean;
   raiseHand: boolean;
+  reaction: Reaction;
 }
diff --git a/...r-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx b/...r-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
@@ -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 '';

diff --git a/bigbluebutton-html5/imports/ui/core/graphql/queries/users.ts b/bigbluebutton-html5/imports/ui/core/graphql/queries/users.ts
@@ -53,6 +53,9 @@ export const USER_LIST_SUBSCRIPTION = gql`subscription Users($offset: Int!, $lim
       shortName
       currentlyInRoom
     }
+    reaction {
+      reactionEmoji
+    }
   }
 }`;