You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: lib/Controller/RoomController.php
+44-36Lines changed: 44 additions & 36 deletions
Original file line number
Diff line number
Diff line change
@@ -53,6 +53,9 @@
53
53
useOCA\Talk\Model\Session;
54
54
useOCA\Talk\Model\Thread;
55
55
useOCA\Talk\Participant;
56
+
useOCA\Talk\RoomPresets\Parameter;
57
+
useOCA\Talk\RoomPresets\Preset;
58
+
useOCA\Talk\Service\RoomPresetService;
56
59
useOCA\Talk\ResponseDefinitions;
57
60
useOCA\Talk\Room;
58
61
useOCA\Talk\Service\BanService;
@@ -153,6 +156,7 @@ public function __construct(
153
156
protectedIURLGenerator$url,
154
157
protectedIL10N$l,
155
158
protectedThreadService$threadService,
159
+
protectedRoomPresetService$presetService,
156
160
) {
157
161
parent::__construct($appName, $request);
158
162
}
@@ -590,32 +594,32 @@ protected function formatRoom(
590
594
* In case the `$roomType` is {@see Room::TYPE_ONE_TO_ONE} only the `$invite`
591
595
* or `$participants` parameter is supported.
592
596
*
593
-
* @param int $roomType Type of the room
597
+
* @param ?int $roomType Type of the room
594
598
* @psalm-param Room::TYPE_* $roomType
595
599
* @param string $invite User, group, … ID to invite @deprecated Use the `$participants` array instead
596
600
* @param string $roomName Name of the room, unless the legacy mode providing `$invite` and `$source` is used, the name must no longer be empty with the `conversation-creation-all` capability (Ignored if `$roomType` is {@see Room::TYPE_ONE_TO_ONE})
597
601
* @param 'groups'|'circles'|'' $source Source of the invite ID ('circles' to create a room with a circle, etc.) @deprecated Use the `$participants` array instead
598
602
* @param string $objectType Type of the object (Ignored if `$roomType` is {@see Room::TYPE_ONE_TO_ONE})
599
603
* @param string $objectId ID of the object (Ignored if `$roomType` is {@see Room::TYPE_ONE_TO_ONE})
600
604
* @param string $password The room password (only available with `conversation-creation-password` capability) (Ignored if `$roomType` is not {@see Room::TYPE_PUBLIC})
601
-
* @param 0|1 $readOnly Read only state of the conversation (Default writable) (only available with `conversation-creation-all` capability)
602
-
* @psalm-param Room::READ_* $readOnly
603
-
* @param 0|1|2 $listable Scope where the conversation is listable (Default not listable for anyone) (only available with `conversation-creation-all` capability)
604
-
* @psalm-param Room::LISTABLE_* $listable
605
-
* @param int $messageExpiration Seconds after which messages will disappear, 0 disables expiration (Default 0) (only available with `conversation-creation-all` capability)
* @param 0|1 $lobbyState Lobby state of the conversation (Default lobby is disabled) (only available with `conversation-creation-all` capability)
608
-
* @psalm-param Webinary::LOBBY_* $lobbyState
605
+
* @param 0|1|null $readOnly Read only state of the conversation (Default writable) (only available with `conversation-creation-all` capability)
606
+
* @psalm-param ?Room::READ_* $readOnly
607
+
* @param 0|1|2|null $listable Scope where the conversation is listable (Default not listable for anyone) (only available with `conversation-creation-all` capability)
608
+
* @psalm-param ?Room::LISTABLE_* $listable
609
+
* @param ?int $messageExpiration Seconds after which messages will disappear, 0 disables expiration (Default 0) (only available with `conversation-creation-all` capability)
* @param 0|1|null $lobbyState Lobby state of the conversation (Default lobby is disabled) (only available with `conversation-creation-all` capability)
612
+
* @psalm-param ?Webinary::LOBBY_* $lobbyState
609
613
* @param int|null $lobbyTimer Timer when the lobby will be removed (Default null, will not be disabled automatically) (only available with `conversation-creation-all` capability)
610
-
* @psalm-param non-negative-int|null $lobbyTimer
611
-
* @param 0|1|2 $sipEnabled Whether SIP dial-in shall be enabled (only available with `conversation-creation-all` capability)
612
-
* @psalm-param Webinary::SIP_* $sipEnabled
613
-
* @param int<0, 255> $permissions Default permissions for participants (only available with `conversation-creation-all` capability)
* @param 0|1 $recordingConsent Whether participants need to agree to a recording before joining a call (only available with `conversation-creation-all` capability)
* @param 0|1|null $recordingConsent Whether participants need to agree to a recording before joining a call (only available with `conversation-creation-all` capability)
* @param string $description Description for the conversation (limited to 2.000 characters) (only available with `conversation-creation-all` capability)
620
624
* @param ?non-empty-string $emoji Emoji for the avatar of the conversation (only available with `conversation-creation-all` capability)
621
625
* @param ?non-empty-string $avatarColor Background color of the avatar (Only considered when an emoji was provided) (only available with `conversation-creation-all` capability)
@@ -635,26 +639,27 @@ protected function formatRoom(
0 commit comments