Skip to content

Commit

Permalink
Merge pull request #9525 from nextcloud/backport/9524/stable26
Browse files Browse the repository at this point in the history
[stable26] fix(settings): Fix recording server check for blocked admins
  • Loading branch information
nickvergessen committed May 12, 2023
2 parents 594c9c3 + 1c2bc26 commit 76328b5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/Middleware/CanUseTalkMiddleware.php
Expand Up @@ -24,6 +24,7 @@
namespace OCA\Talk\Middleware;

use OCA\Talk\Config;
use OCA\Talk\Controller\RecordingController;
use OCA\Talk\Controller\SignalingController;
use OCA\Talk\Exceptions\ForbiddenException;
use OCA\Talk\Middleware\Exceptions\CanNotUseTalkException;
Expand Down Expand Up @@ -72,7 +73,8 @@ public function beforeController($controller, $methodName): void {
$user = $this->userSession->getUser();
if ($user instanceof IUser && $this->talkConfig->isDisabledForUser($user)) {
if ($methodName === 'getWelcomeMessage'
&& $controller instanceof SignalingController
&& ($controller instanceof SignalingController
|| $controller instanceof RecordingController)
&& $this->groupManager->isAdmin($user->getUID())) {
return;
}
Expand Down

0 comments on commit 76328b5

Please sign in to comment.