Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Controller/SignalingController.php')
-rw-r--r--lib/Controller/SignalingController.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 09e9e536b..6b447c184 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -138,15 +138,15 @@ class SignalingController extends OCSController {
}
$signaling = '';
- $servers = $this->talkConfig->getSignalingServers();
- if (!empty($servers)) {
+ $signalingMode = $this->talkConfig->getSignalingMode();
+ if ($signalingMode !== Config::SIGNALING_INTERNAL) {
+ $servers = $this->talkConfig->getSignalingServers();
try {
$serverId = random_int(0, count($servers) - 1);
} catch (\Exception $e) {
$serverId = 0;
}
- $signalingClusterMode = $this->serverConfig->getAppValue('spreed', 'hpb_cluster_mode', '');
- if ($signalingClusterMode === 'conversation') {
+ if ($signalingMode === Config::SIGNALING_CLUSTER_CONVERSATION) {
try {
$serverId = $this->getSignalingServerForConversation($this->userId, $serverId, $token);
} catch (RoomNotFoundException $e) {
@@ -242,8 +242,7 @@ class SignalingController extends OCSController {
* @return DataResponse
*/
public function signaling(string $token, string $messages): DataResponse {
- $signaling = $this->talkConfig->getSignalingServers();
- if (!empty($signaling)) {
+ if ($this->talkConfig->getSignalingMode() !== Config::SIGNALING_INTERNAL) {
return new DataResponse('Internal signaling disabled.', Http::STATUS_BAD_REQUEST);
}
@@ -288,8 +287,7 @@ class SignalingController extends OCSController {
* @return DataResponse
*/
public function pullMessages(string $token): DataResponse {
- $signaling = $this->talkConfig->getSignalingServers();
- if (!empty($signaling)) {
+ if ($this->talkConfig->getSignalingMode() !== Config::SIGNALING_INTERNAL) {
return new DataResponse('Internal signaling disabled.', Http::STATUS_BAD_REQUEST);
}