Merge remote-tracking branch 'origin/stable19' into stable19

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Oct 25, 2021 · e79abd9 · e79abd9
2 parents 3473185 + 32ac00b
commit e79abd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/GlobalScale/MemberAdd.php b/lib/GlobalScale/MemberAdd.php
@@ -214,7 +214,13 @@ public function result(array $events): void {
 				$recipients = [$member->getUserId()];
 			}
 
+			$done = [];
 			foreach ($recipients as $recipient) {
+				if (in_array($recipient, $done)) {
+					continue;
+				}
+
+				$done[] = $recipient;
 				$this->memberIsMailbox($circle, $recipient, $links, $password);
 			}
 		}

diff --git a/lib/Search/GlobalScaleUsers.php b/lib/Search/GlobalScaleUsers.php
@@ -102,7 +102,12 @@ public function search($search) {
 
 		$result = [];
 		foreach ($users as $user) {
-			list(, $instance) = explode('@', $this->get('federationId', $user), 2);
+			$cloudId = $this->get('federationId', $user);
+			$pos = strrpos($cloudId, '@');
+			if ($pos === false) {
+				continue;
+			}
+			$instance = substr($cloudId, $pos + 1);
 			if ($this->configService->isLocalInstance($instance)) {
 				continue;
 			}