1 files changed, 26 insertions, 54 deletions

diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php
index 974254e9a3f..fb6b9f2e0e8 100644
--- a/lib/private/Collaboration/Collaborators/LookupPlugin.php
+++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php
@@ -1,30 +1,9 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace OC\Collaboration\Collaborators;
 
 use OCP\Collaboration\Collaborators\ISearchPlugin;
@@ -33,47 +12,38 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
-use OCP\ILogger;
 use OCP\IUserSession;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 
 class LookupPlugin implements ISearchPlugin {
-
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
 	/** @var string remote part of the current user's cloud id */
-	private $currentUserRemote;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var ILogger */
-	private $logger;
+	private string $currentUserRemote;
 
-	public function __construct(IConfig $config,
-								IClientService $clientService,
-								IUserSession $userSession,
-								ICloudIdManager $cloudIdManager,
-								ILogger $logger) {
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
+	public function __construct(
+		private IConfig $config,
+		private IClientService $clientService,
+		IUserSession $userSession,
+		private ICloudIdManager $cloudIdManager,
+		private LoggerInterface $logger,
+	) {
 		$currentUserCloudId = $userSession->getUser()->getCloudId();
 		$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
-		$this->logger = $logger;
 	}
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
-		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
-		$hasInternetConnection = (bool)$this->config->getSystemValue('has_internet_connection', true);
+	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+		$isGlobalScaleEnabled = $this->config->getSystemValueBool('gs.enabled', false);
+		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
+		$hasInternetConnection = $this->config->getSystemValueBool('has_internet_connection', true);
 
-		// if case of Global Scale we always search the lookup server
-		if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection)) {
+		// If case of Global Scale we always search the lookup server
+		// TODO: Reconsider using the lookup server for non-global scale
+		// if (!$isGlobalScaleEnabled && (!$isLookupServerEnabled || !$hasInternetConnection || $disableLookupServer)) {
+		if (!$isGlobalScaleEnabled) {
 			return false;
 		}
 
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+		$lookupServerUrl = $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com');
 		if (empty($lookupServerUrl)) {
 			return false;
 		}
@@ -96,19 +66,21 @@ class LookupPlugin implements ISearchPlugin {
 				try {
 					$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
 				} catch (\Exception $e) {
-					$this->logger->error('Can not parse federated cloud ID "' .  $lookup['federationId'] . '"');
-					$this->logger->error($e->getMessage());
+					$this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"', [
+						'exception' => $e,
+					]);
 					continue;
 				}
 				if ($this->currentUserRemote === $remote) {
 					continue;
 				}
-				$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
+				$name = $lookup['name']['value'] ?? '';
 				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
 				$result[] = [
 					'label' => $label,
 					'value' => [
 						'shareType' => IShare::TYPE_REMOTE,
+						'globalScale' => $isGlobalScaleEnabled,
 						'shareWith' => $lookup['federationId'],
 					],
 					'extra' => $lookup,