Allow to add circles to existing conversations

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

1 files changed, 34 insertions, 0 deletions

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 302b6470a..b676c9432 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -725,6 +725,40 @@ class RoomController extends AEnvironmentAwareController {
 			}
 
 			\call_user_func_array([$this->room, 'addUsers'], $participantsToAdd);
+		} else if ($source === 'circles') {
+			if (!$this->appManager->isEnabledForUser('circles')) {
+				return new DataResponse([], Http::STATUS_BAD_REQUEST);
+			}
+
+			/** @var Circles $circlesApi */
+			try {
+				$circle = Circles::detailsCircle($newParticipant);
+			} catch (\Exception $e) {
+				return new DataResponse([], Http::STATUS_NOT_FOUND);
+			}
+
+			$participants = [];
+			foreach ($circle->getMembers() as $member) {
+				/** @var Member $member */
+				if ($member->getUserId() === '') {
+					// Not a user?
+					continue;
+				}
+
+				if (\in_array($member->getUserId(), $participants, true)) {
+					continue;
+				}
+
+				$participantsToAdd[] = [
+					'userId' => $member->getUserId(),
+				];
+			}
+
+			if (empty($participantsToAdd)) {
+				return new DataResponse([]);
+			}
+
+			\call_user_func_array([$this->room, 'addUsers'], $participantsToAdd);
 		} else if ($source === 'emails') {
 			$data = [];
 			if ($this->room->setType(Room::PUBLIC_CALL)) {