Allow to make guests moderators #1078

nickvergessen · 2018-07-26T08:14:37Z

Introduces a new user type (6) GUEST_MODERATOR
GMs can do everything moderators can do apart from:
- Adding users (endpoint in server is not public)
- Make a room private/public (would kill them too)
GM can be assigned via the UI

ToDo

Show participant list to guest moderators

fancycode · 2018-07-26T08:24:35Z

lib/Room.php

+			->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
+		$query->execute();
+
+		$this->dispatcher->dispatch(self::class . '::postSetParticipantTypeBySession', new GenericEvent($this, [


Could you please add a listener to notifiy the standalone backend server that the participant has been modified? You can use this as base:

spreed/lib/AppInfo/Application.php

Line 186 in c1d4482

$dispatcher->addListener(Room::class . '::postRemoveBySession', function(GenericEvent $event) {

fancycode · 2018-07-26T08:27:06Z

lib/Controller/RoomController.php

@@ -525,14 +525,19 @@ public function removeFromFavorites($token) {
 	public function renameRoom($token, $roomName) {
 		try {


The same try { ... } block is in multiple functions now, can this somehow be refactored in a separate function to avoid code duplication?

Maybe a new decorator similar to @NoAdminRequired, e.g. @TalkModeratorRequired that performs the code and checks for hasModeratorPermissions().

yeah, something for later.
I'm not sure if apps can already register middleware annotations.

But we would then also get the room twice etc, which is kind of dislike about the annotations.

nickvergessen · 2018-07-26T13:10:20Z

@danxuliu any idea how we can only show the participant list for guest moderators (not all guests)? See last commit

lib/Controller/RoomController.php

Peterede · 2018-09-24T00:10:23Z

The participant list for guests is not added by default and requires calling _showParticipantList(); and then _participantsView.setRoom(this.activeRoom); so guests who are not moderators will not see the list.

nickvergessen · 2018-10-01T08:50:06Z

#1215 is in @danxuliu
Please rebase here 😎

danxuliu · 2018-10-02T10:56:56Z

I have rebased the branch and fixed some issues:

Fix removing a participant (@NoAdminRequired changed to @PublicPage)
Fix demoting as a moderator ($this->userId === $participant in demoteModerator() is always true as a guest moderator; the check was moved to demoteUserToModerator() and demoteGuestToModerator())

I have squashed in the first commit the commits that fixed code added in it; I have added some other commits with changes to it, but not squashed them (yet) just in case the changes are not desired so they can be easily removed (the rationale for the changes is in the commit message).

Other issues still remain, though.

The avatars in the chat are not properly shown when viewed as a guest user; it is not related to the changes in this pull request, so it will be fixed in a different one.

@nickvergessen There are no system messages when promoting/demoting a guest. Is this by design or simply missing?

@Peterede I agree that demoteUserToModerator and demoteGuestToModerator should be called demoteUserFromModerator and demoteGuestFromModerator instead, but according to GitHub you marked that as resolved (even if the old names are still used). What am I missing? :-)

Also, @Peterede, could you provide some steps that show why the change in js/views/tabview.js is needed? I have been trying to trigger the error (without that commit, of course :-P ) and I have not been able to; I guess it was just caused by some of the WIP code and it no longer applies, so I have removed the commit (although I have a reference to it just in case it has to be added back).

nickvergessen · 2018-10-02T15:01:24Z

I removed the two commits as discussed.

I fixed the name to demote*FromModerator (copy paste mistake).

And I added new system notifications for promotion/demotion of guest moderators as well as the "You" detection for guest moderators.

nickvergessen · 2018-10-02T15:01:54Z

Should be ready to review now?

Signed-off-by: Joas Schilling <coding@schilljs.com>

danxuliu · 2018-10-03T23:49:05Z

I have removed the fix for the avatars, because it broke the contacts menu and the avatars in messages being composed. As I already said I will fix the issue with the avatars in a different pull request, because it is not related to the changes in this one.

I have also squashed the fixes for the first commit in that commit.

Besides that I found a bug with the participant menu (the toggle is not hidden) when demoting a user (guests work fine because the list is added and removed altogether instead of updated); I have to investigate it further, although I guess that it is caused by not listening to changes in the participant type of the current user.

Should be ready to review now?

Yes; 👍 from me.

nickvergessen · 2018-10-04T13:24:24Z

im fixing the unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen added 3. to review enhancement labels Jul 26, 2018

nickvergessen added this to the Next Major milestone Jul 26, 2018

nickvergessen requested a review from Ivansss July 26, 2018 08:14

nickvergessen mentioned this pull request Jul 26, 2018

Guest moderators #1075

Closed

fancycode reviewed Jul 26, 2018

View reviewed changes

nickvergessen added 2. developing and removed 3. to review labels Jul 31, 2018

nickvergessen assigned danxuliu Jul 31, 2018

nickvergessen modified the milestones: 💚 Next Major, 💛 Following Major Aug 25, 2018

Peterede reviewed Aug 30, 2018

View reviewed changes

lib/Controller/RoomController.php Outdated Show resolved Hide resolved

lib/Controller/RoomController.php Outdated Show resolved Hide resolved

danxuliu force-pushed the feature/noid/guest-moderators-prework branch from 2b09233 to f09dfec Compare August 30, 2018 15:19

nickvergessen force-pushed the feature/noid/guest-moderators-prework branch from 0853d0a to abff5d1 Compare September 28, 2018 09:10

danxuliu force-pushed the feature/noid/guest-moderators-prework branch from abff5d1 to 17ebeb8 Compare October 2, 2018 10:55

nickvergessen force-pushed the feature/noid/guest-moderators-prework branch from 17ebeb8 to f91e79b Compare October 2, 2018 15:00

nickvergessen added 3. to review and removed 2. developing labels Oct 2, 2018

nickvergessen added 5 commits October 4, 2018 01:13

Allow to make guests moderators

6cff909

Signed-off-by: Joas Schilling <coding@schilljs.com>

Make guest moderators a grey M

5a61279

Signed-off-by: Joas Schilling <coding@schilljs.com>

Subscribe with the BackendNotifier

881fdd7

Signed-off-by: Joas Schilling <coding@schilljs.com>

Display the participant panel for guests

016dfd9

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix the system notifications for guest moderators

7e1de89

Signed-off-by: Joas Schilling <coding@schilljs.com>

danxuliu force-pushed the feature/noid/guest-moderators-prework branch from 6a3de52 to 7e1de89 Compare October 3, 2018 23:48

Fix unit tests

f39142c

Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen mentioned this pull request Oct 4, 2018

Fix avatars of users in guest sytem messages #1240

Merged

nickvergessen merged commit 546526a into master Oct 5, 2018

nickvergessen deleted the feature/noid/guest-moderators-prework branch October 5, 2018 08:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to make guests moderators #1078

Allow to make guests moderators #1078

nickvergessen commented Jul 26, 2018 •

edited

Loading

fancycode Jul 26, 2018

nickvergessen Jul 26, 2018

fancycode Jul 26, 2018

nickvergessen Jul 26, 2018

nickvergessen Jul 26, 2018

nickvergessen commented Jul 26, 2018

Peterede commented Sep 24, 2018 •

edited

Loading

nickvergessen commented Oct 1, 2018

danxuliu commented Oct 2, 2018

nickvergessen commented Oct 2, 2018

nickvergessen commented Oct 2, 2018

danxuliu commented Oct 3, 2018

nickvergessen commented Oct 4, 2018

		@@ -525,14 +525,19 @@ public function removeFromFavorites($token) {
		public function renameRoom($token, $roomName) {
		try {

Allow to make guests moderators #1078

Allow to make guests moderators #1078

Conversation

nickvergessen commented Jul 26, 2018 • edited Loading

ToDo

fancycode Jul 26, 2018

Choose a reason for hiding this comment

nickvergessen Jul 26, 2018

Choose a reason for hiding this comment

fancycode Jul 26, 2018

Choose a reason for hiding this comment

nickvergessen Jul 26, 2018

Choose a reason for hiding this comment

nickvergessen Jul 26, 2018

Choose a reason for hiding this comment

nickvergessen commented Jul 26, 2018

Peterede commented Sep 24, 2018 • edited Loading

nickvergessen commented Oct 1, 2018

danxuliu commented Oct 2, 2018

nickvergessen commented Oct 2, 2018

nickvergessen commented Oct 2, 2018

danxuliu commented Oct 3, 2018

nickvergessen commented Oct 4, 2018

nickvergessen commented Jul 26, 2018 •

edited

Loading

Peterede commented Sep 24, 2018 •

edited

Loading