🤙 SIP Bridge

appinfo/info.xml

@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>11.0.0-dev.6</version>
+	<version>11.0.0-dev.7</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>

appinfo/routes.php

@@ -109,7 +109,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -118,7 +118,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -127,7 +127,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],

lib/Activity/Listener.php

@@ -27,6 +27,7 @@
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\RoomEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCP\Activity\IManager;
@@ -129,7 +130,7 @@ public function generateCallActivity(Room $room): bool {
 		}
 
 		$actorId = $userIds[0] ?? 'guests-only';
-		$actorType = $actorId !== 'guests-only' ? 'users' : 'guests';
+		$actorType = $actorId !== 'guests-only' ? Attendee::ACTOR_USERS : Attendee::ACTOR_GUESTS;
 		$this->chatManager->addSystemMessage($room, $actorType, $actorId, json_encode([
 			'message' => 'call_ended',
 			'parameters' => [
@@ -205,7 +206,7 @@ public function generateInvitationActivity(Room $room, array $participants): voi
 		}
 
 		foreach ($participants as $participant) {
-			if ($participant['actorType'] !== 'users') {
+			if ($participant['actorType'] !== Attendee::ACTOR_USERS) {
 				// No user => no activity
 				continue;
 			}

lib/Chat/AutoComplete/SearchPlugin.php

@@ -25,6 +25,7 @@
 
 use OCA\Talk\Files\Util;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
@@ -102,9 +103,9 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 			$participants = $this->participantService->getParticipantsForRoom($this->room);
 			foreach ($participants as $participant) {
 				$attendee = $participant->getAttendee();
-				if ($attendee->getActorType() === 'guests') {
+				if ($attendee->getActorType() === Attendee::ACTOR_GUESTS) {
 					$guestSessionHashes[] = $attendee->getActorId();
-				} elseif ($attendee->getActorType() === 'users') {
+				} elseif ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 					$userIds[] = $attendee->getActorId();
 				}
 			}

lib/Chat/ChatManager.php

@@ -28,6 +28,7 @@
 use OC\Memcache\NullCache;
 use OCA\Talk\Events\ChatEvent;
 use OCA\Talk\Events\ChatParticipantEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -144,7 +145,7 @@ public function addSystemMessage(Room $chat, string $actorType, string $actorId,
 	 * @return IComment
 	 */
 	public function addChangelogMessage(Room $chat, string $message): IComment {
-		$comment = $this->commentsManager->create('guests', 'changelog', 'chat', (string) $chat->getId());
+		$comment = $this->commentsManager->create(Attendee::ACTOR_GUESTS, 'changelog', 'chat', (string) $chat->getId());
 
 		$comment->setMessage($message, self::MAX_CHAT_LENGTH);
 		$comment->setCreationDateTime($this->timeFactory->getDateTime());

lib/Chat/Command/Executor.php

@@ -25,6 +25,7 @@
 
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Events\CommandEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Command;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -90,7 +91,7 @@ public function exec(Room $room, IComment $message, Command $command, string $ar
 		try {
 			$command = $this->commandService->resolveAlias($command);
 		} catch (DoesNotExistException $e) {
-			$user = $message->getActorType() === 'users' ? $message->getActorId() : '';
+			$user = $message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : '';
 			$message->setMessage(json_encode([
 				'user' => $user,
 				'visibility' => $command->getResponse(),
@@ -109,7 +110,7 @@ public function exec(Room $room, IComment $message, Command $command, string $ar
 			$output = $this->execShell($room, $message, $command, $arguments);
 		}
 
-		$user = $message->getActorType() === 'users' ? $message->getActorId() : '';
+		$user = $message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : '';
 		$message->setMessage(json_encode([
 			'user' => $user,
 			'visibility' => $command->getResponse(),
@@ -205,7 +206,7 @@ public function execShell(Room $room, IComment $message, Command $command, strin
 				$command->getScript(),
 				$arguments,
 				$room->getToken(),
-				$message->getActorType() === 'users' ? $message->getActorId() : ''
+				$message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : ''
 			);
 		} catch (\InvalidArgumentException $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);

lib/Chat/MessageParser.php

@@ -27,6 +27,7 @@
 use OCA\Talk\Events\ChatMessageEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -79,10 +80,10 @@ protected function setActor(Message $message): void {
 		$comment = $message->getComment();
 
 		$displayName = '';
-		if ($comment->getActorType() === 'users') {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS) {
 			$user = $this->userManager->get($comment->getActorId());
 			$displayName = $user instanceof IUser ? $user->getDisplayName() : $comment->getActorId();
-		} elseif ($comment->getActorType() === 'guests') {
+		} elseif ($comment->getActorType() === Attendee::ACTOR_GUESTS) {
 			if (isset($guestNames[$comment->getActorId()])) {
 				$displayName = $this->guestNames[$comment->getActorId()];
 			} else {

lib/Chat/Notifier.php

@@ -28,6 +28,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Files\Util;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -135,7 +136,7 @@ public function notifyMentionedUsers(Room $chat, IComment $comment, array $alrea
 	 * @return string[] Users that were mentioned
 	 */
 	public function notifyReplyToAuthor(Room $chat, IComment $comment, IComment $replyTo): array {
-		if ($replyTo->getActorType() !== 'users') {
+		if ($replyTo->getActorType() !== Attendee::ACTOR_USERS) {
 			// No reply notification when the replyTo-author was not a user
 			return [];
 		}
@@ -308,7 +309,7 @@ protected function getDefaultGroupNotification(): int {
 	 * @return bool
 	 */
 	protected function shouldMentionedUserBeNotified(string $userId, IComment $comment): bool {
-		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS && $userId === $comment->getActorId()) {
 			// Do not notify the user if they mentioned themselves
 			return false;
 		}
@@ -341,7 +342,7 @@ protected function shouldMentionedUserBeNotified(string $userId, IComment $comme
 				// the notification can be parsed and links to an existing room,
 				// where they are a participant of.
 				$this->participantService->addUsers($room, [[
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $userId,
 				]]);
 				return true;
@@ -364,12 +365,12 @@ protected function shouldMentionedUserBeNotified(string $userId, IComment $comme
 	 * @return bool
 	 */
 	protected function shouldParticipantBeNotified(Participant $participant, IComment $comment, array $alreadyNotifiedUsers): bool {
-		if ($participant->getAttendee()->getActorType() !== 'users') {
+		if ($participant->getAttendee()->getActorType() !== Attendee::ACTOR_USERS) {
 			return false;
 		}
 
 		$userId = $participant->getAttendee()->getActorId();
-		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS && $userId === $comment->getActorId()) {
 			// Do not notify the author
 			return false;
 		}

lib/Chat/Parser/Changelog.php

@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Chat\Parser;
 
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 
 class Changelog {
@@ -32,7 +33,7 @@ class Changelog {
 	 * @throws \OutOfBoundsException
 	 */
 	public function parseMessage(Message $chatMessage): void {
-		if ($chatMessage->getActorType() !== 'guests' ||
+		if ($chatMessage->getActorType() !== Attendee::ACTOR_GUESTS ||
 			$chatMessage->getActorId() !== 'changelog') {
 			throw new \OutOfBoundsException('Not a changelog');
 		}

lib/Chat/Parser/Command.php

@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Chat\Parser;
 
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 
 class Command {
@@ -44,7 +45,7 @@ public function parseMessage(Message $message): void {
 
 		$participant = $message->getParticipant();
 		if ($data['visibility'] !== \OCA\Talk\Model\Command::RESPONSE_ALL &&
-			($participant->getAttendee()->getActorType() !== 'users'
+			($participant->getAttendee()->getActorType() !== Attendee::ACTOR_USERS
 				|| $data['user'] !== $participant->getAttendee()->getActorId())) {
 			$message->setVisibility(false);
 			return;

lib/Chat/Parser/SystemMessage.php

@@ -25,6 +25,7 @@
 
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Share\RoomShareProvider;
@@ -94,7 +95,7 @@ public function parseMessage(Message $chatMessage): void {
 		if (!$participant->isGuest()) {
 			$currentActorId = $participant->getAttendee()->getActorId();
 			$currentUserIsActor = $parsedParameters['actor']['type'] === 'user' &&
-				$participant->getAttendee()->getActorType() === 'users' &&
+				$participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS &&
 				$currentActorId === $parsedParameters['actor']['id'];
 		} else {
 			$currentActorId = $participant->getAttendee()->getActorId();
@@ -385,7 +386,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
 	}
 
 	protected function getActor(IComment $comment): array {
-		if ($comment->getActorType() === 'guests') {
+		if ($comment->getActorType() === Attendee::ACTOR_GUESTS) {
 			return $this->getGuest($comment->getActorId());
 		}
 

lib/Chat/Parser/UserMention.php

@@ -26,6 +26,7 @@
 
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Room;
 use OCP\Comments\ICommentsManager;
@@ -116,7 +117,7 @@ public function parseMessage(Message $chatMessage): void {
 
 			if ($mention['type'] === 'call') {
 				$userId = '';
-				if ($chatMessage->getParticipant()->getAttendee()->getActorType() === 'users') {
+				if ($chatMessage->getParticipant()->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 					$userId = $chatMessage->getParticipant()->getAttendee()->getActorId();
 				}
 

lib/Chat/SystemMessage/Listener.php

@@ -31,6 +31,7 @@
 use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -80,16 +81,16 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$participantService = \OC::$server->query(ParticipantService::class);
 
 			if ($participantService->hasActiveSessionsInCall($room)) {
-				$listener->sendSystemMessage($room, 'call_joined');
+				$listener->sendSystemMessage($room, 'call_joined', [], $event->getParticipant());
 			} else {
-				$listener->sendSystemMessage($room, 'call_started');
+				$listener->sendSystemMessage($room, 'call_started', [], $event->getParticipant());
 			}
 		});
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_LEAVE_CALL, static function (ModifyParticipantEvent $event) {
 			$room = $event->getRoom();
 
 			$session = $event->getParticipant()->getSession();
-			if (!$session instanceof Session || $session->getInCall() === Participant::FLAG_DISCONNECTED) {
+			if (!$session instanceof Session) {
 				// This happens in case the user was kicked/lobbied
 				return;
 			}
@@ -221,7 +222,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$room = $event->getRoom();
 			$attendee = $event->getParticipant()->getAttendee();
 
-			if ($attendee->getActorType() !== 'users' && $attendee->getActorType() !== 'guests') {
+			if ($attendee->getActorType() !== Attendee::ACTOR_USERS && $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
 				return;
 			}
 
@@ -277,10 +278,10 @@ protected function sendSystemMessage(Room $room, string $message, array $paramet
 				$actorType = 'users';
 				$actorId = $user->getUID();
 			} elseif (\OC::$CLI) {
-				$actorType = 'guests';
+				$actorType = Attendee::ACTOR_GUESTS;
 				$actorId = 'cli';
 			} else {
-				$actorType = 'guests';
+				$actorType = Attendee::ACTOR_GUESTS;
 				$sessionId = $this->talkSession->getSessionForRoom($room->getToken());
 				$actorId = $sessionId ? sha1($sessionId) : 'failed-to-get-session';
 			}

lib/Command/Room/TRoomCommand.php

@@ -29,6 +29,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -249,7 +250,7 @@ protected function addRoomParticipants(Room $room, array $userIds): void {
 			}
 
 			$participants[] = [
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $user->getUID(),
 			];
 		}
@@ -377,7 +378,7 @@ protected function completeParticipantValues(CompletionContext $context): array
 		$users = [];
 		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
-			if ($participant->getAttendee()->getActorType() === 'users'
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS
 				&& stripos($participant->getAttendee()->getActorId(), $context->getCurrentWord()) !== false) {
 				$users[] = $participant->getAttendee()->getActorId();
 			}

lib/Config.php

@@ -43,6 +43,9 @@ class Config {
 	/** @var ISecureRandom */
 	private $secureRandom;
 
+	/** @var array */
+	protected $canEnableSIP = [];
+
 	public function __construct(IConfig $config,
 								ISecureRandom $secureRandom,
 								IGroupManager $groupManager,
@@ -84,6 +87,24 @@ public function getSIPSharedSecret(): string {
 		return $this->config->getAppValue('spreed', 'sip_bridge_shared_secret');
 	}
 
+	public function canUserEnableSIP(IUser $user): bool {
+		if (isset($this->canEnableSIP[$user->getUID()])) {
+			return $this->canEnableSIP[$user->getUID()];
+		}
+
+		$this->canEnableSIP[$user->getUID()] = false;
+
+		$allowedGroups = $this->getSIPGroups();
+		if (empty($allowedGroups)) {
+			$this->canEnableSIP[$user->getUID()] = true;
+		} else {
+			$userGroups = $this->groupManager->getUserGroupIds($user);
+			$this->canEnableSIP[$user->getUID()] = !empty(array_intersect($allowedGroups, $userGroups));
+		}
+
+		return $this->canEnableSIP[$user->getUID()];
+	}
+
 	public function isDisabledForUser(IUser $user): bool {
 		$allowedGroups = $this->getAllowedTalkGroupIds();
 		if (empty($allowedGroups)) {