fix duplicate on add members

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Service/GlobalScaleService.php

@@ -124,6 +124,7 @@ public function __construct(
 	 * @param GSEvent $event
 	 *
 	 * @return string
+	 * @throws NoUserException
 	 */
 	public function asyncBroadcast(GSEvent $event): string {
 		$wrapper = new GSWrapper();
@@ -148,6 +149,8 @@ public function asyncBroadcast(GSEvent $event): string {
 		try {
 			$this->doRequest($request);
 		} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException $e) {
+			OC::$server->getLogger()
+					   ->logException($e, ['app' => 'circles']);
 		}
 
 		return $wrapper->getToken();

lib/Service/MembersService.php

@@ -168,7 +168,7 @@ public function addMember($circleUniqueId, $ident, $type, string $instance, bool
 			$new = [$this->addSingleMember($circle, $ident, $type, $instance, $force)];
 		}
 
-		return array_merge($curr, $new);
+		return $this->filterDuplicate($curr, $new);
 	}
 
 
@@ -640,5 +640,29 @@ public function onUserRemoved(string $userId) {
 	}
 
 
+	/**
+	 * @param Member[] $curr
+	 * @param Member[] $new
+	 *
+	 * @return array
+	 */
+	private function filterDuplicate(array $curr, array $new): array {
+		$base = [];
+		foreach ($curr as $currMember) {
+			$known = false;
+			foreach ($new as $newMember) {
+				if ($newMember->getMemberId() === $currMember->getMemberId()) {
+					$known = true;
+				}
+			}
+			if (!$known) {
+				$base[] = $currMember;
+			}
+		}
+
+		return array_merge($base, $new);
+	}
+
+
 }