Feat/lobby chat #10847

doganbros · 2022-01-25T20:54:37Z

Better moderation capabilities in locked down rooms: challenge/response in lobby #9714
Lobby chat support
Knocking participants list updates
Knocking participants conditonal checks to show message button
Handle lobby chat events
Allow messages in mod_muc_lobby_rooms.lua

jitsi-jenkins · 2022-01-25T21:00:31Z

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

doganbros · 2022-01-25T21:16:04Z

@gpatel-fr we resolved most of the issues you raised in the previous pull request.

We changed all the occurrences of challenge-response to lobby chat. Also the moderator is anonymous when he is chatting with the knocking participant.
Also we refactored the mod_muc_lobby_rooms.lua's filter_stanza to support only private messages and moderator messages.
The code block you deleted the other time is still necessary because we need to make the attendee aware about the moderator's absence in the UI, even though they get the presence unavailable stanza.
We refactored some of the action names as you suggested.

damencho · 2022-01-27T15:50:31Z

Hey @doganbros we deployed it here https://lobby-chat.jitsi.net/ so we can preview the feature ... but there is something wrong, when you click the chat button in the notification or participants pane it does not work ... can you check it out, please.

mkhstar · 2022-01-28T00:27:11Z

@damencho probably the mod_muc_lobby_rooms.lua module was not updated. Because the messages are filtered

damencho · 2022-01-28T02:09:43Z

@damencho probably the mod_muc_lobby_rooms.lua module was not updated. Because the messages are filtered

Good point I will check it tomorrow, I think I restarted prosody... But maybe I missed that, will see.

damencho · 2022-01-31T14:54:23Z

@damencho probably the mod_muc_lobby_rooms.lua module was not updated. Because the messages are filtered

Good point I will check it tomorrow, I think I restarted prosody... But maybe I missed that, will see.

Yep, you were right, now it works.

damencho

lib-jitsi-meet part is merged :) Congrats and thank you!

damencho · 2022-02-04T17:13:22Z

resources/prosody-plugins/mod_muc_lobby_rooms.lua

@@ -158,6 +158,20 @@ function filter_stanza(stanza)
        elseif stanza.name == 'iq' and stanza:get_child('query', DISCO_INFO_NS) then
            -- allow disco info from the lobby component
            return stanza;
+        elseif stanza.name == 'message' then


I think we should be checking here whether the message is from moderator or to moderator ...

Hi @damencho we currently allow private messages and also messages only to a moderator from line 163 to 173. (Or should we implement it differently). I think we are left with checking messages from a moderator

Let me check again, when I was looking at it I had the impression that lobby users can send messages to lobby users privately or via group messages.

So you allow all messages between lobby participants and group messages to moderators. So I was assuming group chats between participants are possible ... but there are not.

Can you easily check and do it: "messages to and from moderators are only allowed"... ?
It shouldn't be possible to find other participants ids, but just in case the check ^ seems better, I think.

That makes sense, we will check on that

damencho · 2022-02-07T20:38:34Z

react/features/lobby/actions.any.js

@@ -241,3 +250,149 @@ export function hideLobbyScreen() {
        visible: false
    };
 }
+
+/** ......................................


Can you drop the dots :)

damencho · 2022-02-07T20:40:15Z

react/features/lobby/components/web/LobbyScreen.js

                { this._renderStandardButtons() }
            </div>
        );
    }

+
+    /** ....................


Drop and these, thank you.

damencho · 2022-02-07T20:54:22Z

An update: I'm still waiting for a confirmation from Product and Design on few things. Design is finalizing the mobile part.
There are few changes probably. Here is what I know.

In the notification move Chat button between Admit and Reject.
Make lobby chat use a different color than private messages (to be confirmed with the color).
Create overflow menu for Chat and Reject in participants pane.
Create the chat for the guests to look like a normal group chat.

I think that's all. And when the design comes back to me, I will post here the link to the designs.
While waiting for the final thing. I think 1. and 3. can be done and now. For 3, the reasoning is too many buttons and those are not used so often and are visually hiding the display name. And there is already a button like that in the participants pane for other operations.
If 4 is not trivial ... we may leave it for the second phase or we can do it after merging this PR.

Thank you again.

umitdogan1 · 2022-02-07T21:39:28Z

An update: I'm still waiting for a confirmation from Product and Design on few things. Design is finalizing the mobile part. There are few changes probably. Here is what I know.

In the notification move Chat button between Admit and Reject.

Make lobby chat use a different color than private messages (to be confirmed with the color).

Create overflow menu for Chat and Reject in participants pane.

Create the chat for the guests to look like a normal group chat.

I think that's all. And when the design comes back to me, I will post here the link to the designs. While waiting for the final thing. I think 1. and 3. can be done and now. For 3, the reasoning is too many buttons and those are not used so often and are visually hiding the display name. And there is already a button like that in the participants pane for other operations. If 4 is not trivial ... we may leave it for the second phase or we can do it after merging this PR.

Thank you again.

@damencho I see... Will start to work on 1 and 3. Thank you too.

gpatel-fr · 2022-02-08T17:14:57Z

Hello

I have not experienced any crash or unconsistent behaviour on my test instance.
I only tested on web, not mobile.

A minor nit is that when there is one moderator and several candidates, the moderator workflow is not optimal.
If the mod sends a message to several persons, (without waiting for a reply of each), ideally it could be possible
to just wait for the answers and grant the entry without having to click again to chat with each person.
Well, the world is not perfect either but one day hopefully it will be :-)

On the code I have noticed this small strangeness in chat/actions.any.js:

@param {boolean} removeLobbyChatMessages - The participant to remove

boolean for a participant ID ?? There is something not quite right here.
I think that the comment should be changed to something like

-> should remove messages from chat (works only for accepted users)

circa line 145 chat/action.any.js: onLobbyChatInitialized(lobbyChatInititializedInfo...
spelling problem.
-> lobbyChatInitializedInfo
in lobby/actions.any.js the function name 'updateLobbyParticipantOnModeratorLeave' seems to say that participantId should be a moderator's ID. But that's not the case, as shown in the code:

if (knocking && lobbyMessageRecipient && lobbyMessageRecipient.id === participantId)

this part shows clearly that this function can be called with a non moderator ID.
So IMO the function could be called updateLobbyParticipantOnLeave instead.

(remark)
Note that I have wondered why this is working only for accepted participants, the rejected ones can still see the chat dialog after being left in the wild. That's because the participant is booted out of the lobby before it can be called.
I don't think that's a problem, while it's good that the chat is cleaned for accepted participants (and this works).
What could be considered is that maybe the chat could be cleaned also for the moderator when a user is accepted/rejected.

On the prosody code, there is also a small nit: your code is duplicating a similar part in the
presence handling, however in this part the result is tested:

local lobby_room = lobby_muc_service.get_room_from_jid(lobby_room_jid);
if not lobby_room then
module:log('warn', 'No lobby room found %s', lobby_room_jid);
return stanza;
end

if it makes sense to test the get_room_from_jid function in the presence handling, maybe it would make sense to test it also at this point.

Last - I would like to apologize for my first review, on one minor vocabulary point I was overly harsh and my tone was not appropriate. I can only say I was tired at the time.

Anyway, cheers for the very impressive work !

damencho · 2022-02-08T17:28:06Z

@gpatel-fr Thank you for your review and for looking deep into the PR. That is a great help!

umitdogan1 · 2022-02-09T08:00:09Z

Hello

I have not experienced any crash or unconsistent behaviour on my test instance. I only tested on web, not mobile.

A minor nit is that when there is one moderator and several candidates, the moderator workflow is not optimal. If the mod sends a message to several persons, (without waiting for a reply of each), ideally it could be possible to just wait for the answers and grant the entry without having to click again to chat with each person. Well, the world is not perfect either but one day hopefully it will be :-)

On the code I have noticed this small strangeness in chat/actions.any.js:

@param {boolean} removeLobbyChatMessages - The participant to remove

boolean for a participant ID ?? There is something not quite right here. I think that the comment should be changed to something like

-> should remove messages from chat (works only for accepted users)

circa line 145 chat/action.any.js: onLobbyChatInitialized(lobbyChatInititializedInfo...
spelling problem.
-> lobbyChatInitializedInfo

in lobby/actions.any.js the function name 'updateLobbyParticipantOnModeratorLeave' seems to say that participantId should be a moderator's ID. But that's not the case, as shown in the code:

if (knocking && lobbyMessageRecipient && lobbyMessageRecipient.id === participantId)

this part shows clearly that this function can be called with a non moderator ID. So IMO the function could be called updateLobbyParticipantOnLeave instead.

(remark) Note that I have wondered why this is working only for accepted participants, the rejected ones can still see the chat dialog after being left in the wild. That's because the participant is booted out of the lobby before it can be called. I don't think that's a problem, while it's good that the chat is cleaned for accepted participants (and this works). What could be considered is that maybe the chat could be cleaned also for the moderator when a user is accepted/rejected.

On the prosody code, there is also a small nit: your code is duplicating a similar part in the presence handling, however in this part the result is tested:

local lobby_room = lobby_muc_service.get_room_from_jid(lobby_room_jid); if not lobby_room then module:log('warn', 'No lobby room found %s', lobby_room_jid); return stanza; end

if it makes sense to test the get_room_from_jid function in the presence handling, maybe it would make sense to test it also at this point.

Last - I would like to apologize for my first review, on one minor vocabulary point I was overly harsh and my tone was not appropriate. I can only say I was tired at the time.

Anyway, cheers for the very impressive work !

Thank you on be half of the team. Will check your comments...

umitdogan1 · 2022-02-14T08:34:48Z

@damencho few quick notes about the updates:
We tried to implement the buttons and overflow to match with the current UI implementation. Tried to be consistent with the current UI as much as possible. We can do this small styling/arrangements later when UI design is finalized on your side.

We did not change the color of "Reject" and left as it is (which is blue).
Overflow menu icon with three dots is blue on the current jitsi-meet but it was gray on your screenshot. We left as it is.

Also, changing the order of Reject and Admit in the current jitsi-meet UI would be better. But again we did not change it.

umitdogan1 · 2022-02-21T20:23:14Z

@damencho any update regarding to new UI design?

damencho · 2022-02-21T22:47:58Z

Hum, I was waiting for some replay ... Will check it tomorrow and will let you know.

damencho · 2022-02-22T14:50:12Z

I think all I mentioned before is the latest state.

So I have these designs:
desktop: https://www.figma.com/file/xE4oxRXxQGJ9u1A56b4Oid/%E2%9C%8A-Challenge%2Fresponse-in-lobby?node-id=0%3A1
mobile: https://www.figma.com/file/xE4oxRXxQGJ9u1A56b4Oid/%E2%9C%8A-Challenge%2Fresponse-in-lobby?node-id=2%3A6400

Yeah do not do anything outside of the feature you are doing to keep it simple.

umitdogan1 · 2022-02-23T11:24:23Z

I think all I mentioned before is the latest state.

So I have these designs: desktop: https://www.figma.com/file/xE4oxRXxQGJ9u1A56b4Oid/%E2%9C%8A-Challenge%2Fresponse-in-lobby?node-id=0%3A1 mobile: https://www.figma.com/file/xE4oxRXxQGJ9u1A56b4Oid/%E2%9C%8A-Challenge%2Fresponse-in-lobby?node-id=2%3A6400

Yeah do not do anything outside of the feature you are doing to keep it simple.

Sure. Will check the designs.

umitdogan1 · 2022-02-23T19:28:57Z

@damencho I guess the mobile designs here are for the mobile screens of the web app (not mobile app), right? So, where are the mobile app designs?

damencho · 2022-02-23T19:32:03Z

I pass your question, to design ... that link I was given for mobile designs.

mihaitiberiu · 2022-02-24T06:47:34Z

@damencho I guess the mobile designs here are for the mobile screens of the web app (not mobile app), right? So, where are the mobile app designs?

-these designs should apply for both mobile web and native apps
-please ignore the "call quality" banner at the top since it's not available on Jitsi

mkhstar · 2022-02-26T11:48:41Z

Hi everyone,
Currently, the mobile design is completely different from what we are been ask for.
We were also given the pre screen design which I think is not in the scope of our lobby chat implementation. I will be posting
a comparison between the current mobile pre screen and the design pre screen below.

mkhstar · 2022-02-26T11:53:00Z

Also the chat screen of the design is quite different from the designs given.
For example the text inputs, the chat bubble etc.
Screen shots:

damencho · 2022-02-26T14:07:40Z

Of course don't implement anything that is not for this feature. I think I had summarized earlier what are the needed changes. About the chat area in lobby is that there is no point of the marking of the messages with different colors, both for mobile and web. In lobby the chat should look like a normal chat in the room.

@mihaitiberiu can you also chime in.

umitdogan1 · 2022-03-03T07:27:07Z

@damencho Is it possible to give some priority to our PR? It will be perfect if we can ship the feature this week.

damencho · 2022-03-03T14:11:29Z

Jenkins test this please

lobby chat support knocking participants list updates knocking participants conditonal checks to show message button handle lobby chat message events lobby messages from or to moderators only Co-authored-by: Fecri Kaan Ulubey <f.kaan93@gmail.com>

mkhstar · 2022-03-03T14:26:34Z

Linting problems are fixed now

damencho · 2022-03-03T14:37:18Z

Jenkins test this please

damencho · 2022-03-03T14:37:34Z

I will try to look at it today and tomorrow.

damencho · 2022-03-03T16:43:06Z

Jenkins test this please

damencho · 2022-03-03T17:30:00Z

Congrats! Thank you for your contribution.

umitdogan1 · 2022-03-03T18:06:21Z

Thank you too.

* feat(lobby): lobby chat lobby chat support knocking participants list updates knocking participants conditonal checks to show message button handle lobby chat message events lobby messages from or to moderators only Co-authored-by: Fecri Kaan Ulubey <f.kaan93@gmail.com> * squash: Drop typos. Co-authored-by: Kusi Musah Hussein <kusimusah@gmail.com> Co-authored-by: Fecri Kaan Ulubey <f.kaan93@gmail.com> Co-authored-by: Дамян Минков <damencho@jitsi.org>

doganbros mentioned this pull request Jan 25, 2022

Feat/lobby challenge response #10522

Closed

umitdogan1 mentioned this pull request Jan 26, 2022

Better moderation capabilities in locked down rooms: challenge/response in lobby #9714

Closed

damencho requested changes Feb 7, 2022

View reviewed changes

mkhstar force-pushed the feat/lobby-chat branch from 1ace000 to d6227db Compare February 13, 2022 22:02

mkhstar force-pushed the feat/lobby-chat branch 2 times, most recently from 1b7a82b to 5e6b7cf Compare March 2, 2022 17:48

feat(lobby): lobby chat

d500cfa

lobby chat support knocking participants list updates knocking participants conditonal checks to show message button handle lobby chat message events lobby messages from or to moderators only Co-authored-by: Fecri Kaan Ulubey <f.kaan93@gmail.com>

mkhstar force-pushed the feat/lobby-chat branch from 5e6b7cf to d500cfa Compare March 3, 2022 14:26

squash: Drop typos.

f7d2553

damencho approved these changes Mar 3, 2022

View reviewed changes

damencho merged commit 7522de0 into jitsi:master Mar 3, 2022

This was referenced Apr 5, 2022

update ljm 1649173091 #11319

Closed

update ljm 1649316923 #11331

Closed

update ljm 1649325751 #11336

Merged

Feat/lobby chat #10847

Feat/lobby chat #10847

Conversation

doganbros commented Jan 25, 2022

jitsi-jenkins commented Jan 25, 2022

doganbros commented Jan 25, 2022 • edited Loading

damencho commented Jan 27, 2022

mkhstar commented Jan 28, 2022

damencho commented Jan 28, 2022

damencho commented Jan 31, 2022

damencho left a comment

Choose a reason for hiding this comment

damencho Feb 4, 2022

Choose a reason for hiding this comment

mkhstar Feb 7, 2022

Choose a reason for hiding this comment

damencho Feb 7, 2022

Choose a reason for hiding this comment

damencho Feb 7, 2022 • edited Loading

Choose a reason for hiding this comment

mkhstar Feb 8, 2022

Choose a reason for hiding this comment

damencho Feb 7, 2022

Choose a reason for hiding this comment

damencho Feb 7, 2022

Choose a reason for hiding this comment

damencho commented Feb 7, 2022

umitdogan1 commented Feb 7, 2022

gpatel-fr commented Feb 8, 2022

damencho commented Feb 8, 2022

umitdogan1 commented Feb 9, 2022

umitdogan1 commented Feb 14, 2022 • edited Loading

umitdogan1 commented Feb 21, 2022

damencho commented Feb 21, 2022

damencho commented Feb 22, 2022

umitdogan1 commented Feb 23, 2022

umitdogan1 commented Feb 23, 2022

damencho commented Feb 23, 2022

mihaitiberiu commented Feb 24, 2022

mkhstar commented Feb 26, 2022

mkhstar commented Feb 26, 2022

damencho commented Feb 26, 2022

umitdogan1 commented Mar 3, 2022

damencho commented Mar 3, 2022

mkhstar commented Mar 3, 2022

damencho commented Mar 3, 2022

damencho commented Mar 3, 2022

damencho commented Mar 3, 2022

damencho commented Mar 3, 2022

umitdogan1 commented Mar 3, 2022

doganbros commented Jan 25, 2022 •

edited

Loading

damencho Feb 7, 2022 •

edited

Loading

umitdogan1 commented Feb 14, 2022 •

edited

Loading