Add ability to invite groups #1268
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mario
force-pushed
the
add-ability-to-invite-groups
branch
from
a08bdb7 to
e7cffa7
Compare
mario
force-pushed
the
add-ability-to-invite-groups
branch
from
e7cffa7 to
25a15a0
Compare
nickvergessen
requested changes
Oct 25, 2018
lib/Controller/RoomController.php
Outdated
| @@ -769,7 +769,10 @@ public function addParticipantToRoom(string $token, string $newParticipant): Dat | |||
|
|
|||
| $newUser = $this->userManager->get($newParticipant); | |||
| if (!$newUser instanceof IUser) { | |||
| return new DataResponse([], Http::STATUS_NOT_FOUND); | |||
| $newUser = $this->groupManager->get($newParticipant); | |||
There was a problem hiding this comment.
this needs to be explicit, if you selected the group, the user with the same name should not be added.
Similar to when a room is created, the share tpye should be handed in and then reacted upon respectivly.
|
@nickvergessen updated! |
Fix a missing , Move to tabs
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
force-pushed
the
add-ability-to-invite-groups
branch
from
4fb59f7 to
ad06759
Compare
| * @return DataResponse | ||
| */ | ||
| public function addParticipantToRoom(string $token, string $newParticipant): DataResponse { | ||
| public function addParticipantToRoom(string $token, string $newParticipant, string $source = 'users'): DataResponse { |
There was a problem hiding this comment.
There was a problem hiding this comment.
Instead of:
$.post(
OC.linkToOCS('apps/spreed/api/v1/room', 2) + token + '/participants/guests',
{
newParticipant: email
}
)you do:
$.post(
OC.linkToOCS('apps/spreed/api/v1/room', 2) + token + '/participants',
{
newParticipant: email,
source: 'emails'
}
)lets do this.
There was a problem hiding this comment.
Added as a new commit, if anyone of you does not agree, we can simply drop it from this PR.
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
approved these changes
Nov 6, 2018
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
I agree, except that I'd change the capability to a different name (other than "invite-group"). Maybe unified-invite seems more appropriate? |
Signed-off-by: Joas Schilling <coding@schilljs.com>
|
Adjusted the capability |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I want to have the ability to invite groups to a conversation, as well as users. Re-using the existing endpoint sounds sane to me so this is my attempt.
Be gentle! :)
Todos: