Update post_type_jitsi.tsx

NCPSNetworks · Aug 16, 2024 · 63d2494 · 63d2494
1 parent 0e4ead0
commit 63d2494
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/webapp/src/components/post_type_jitsi/post_type_jitsi.tsx b/webapp/src/components/post_type_jitsi/post_type_jitsi.tsx
@@ -48,16 +48,26 @@ export class PostTypeJitsi extends React.PureComponent<Props, State> {
 
     openJitsiMeeting = (e: React.MouseEvent) => {
         e.preventDefault();
+        const {meetingEmbedded, post} = this.props;
         const {meetingJwt} = this.state;
-        if (this.props.post) {
-            this.props.actions.setUserStatus(this.props.currentUser.id, Constants.DND);
-            this.props.actions.openJitsiMeeting(this.props.post, meetingJwt || this.props.post.props.meeting_jwt || null);
+
+        if (post) {
+            if (meetingEmbedded) {
+                // Set user status to DND when the meeting is embedded in Mattermost
+                // this.props.actions.setUserStatus(this.props.currentUser.id, Constants.DND);
+                this.props.actions.openJitsiMeeting(post, meetingJwt || post.props.meeting_jwt || null);
+            } else if (meetingJwt) {
+                // Open the meeting in a new window
+                const props = post.props;
+                let meetingLink = `${props.meeting_link}?jwt=${meetingJwt}`;
+                meetingLink += `#config.callDisplayName=${encodeURIComponent(`"${props.meeting_topic || props.default_meeting_topic}"`)}`;
+                window.open(meetingLink, '_blank');
+            }
         }
     };
 
     renderUntilDate = (post: Post, style: any): React.ReactNode => {
         const props = post.props;
-
         if (props.jwt_meeting) {
             const date = new Date(props.jwt_meeting_valid_until * 1000);
             let dateStr = props.jwt_meeting_valid_until;
@@ -89,7 +99,7 @@ export class PostTypeJitsi extends React.PureComponent<Props, State> {
 
         let meetingLink = props.meeting_link;
         if (meetingJwt) {
-            meetingLink += '?jwt=' + encodeURIComponent(meetingJwt);
+            meetingLink += `?jwt=${encodeURIComponent(meetingJwt)}`;
         }
 
         meetingLink += `#config.callDisplayName=${encodeURIComponent(`"${props.meeting_topic || props.default_meeting_topic}"`)}`;