Merge pull request #744 from nextcloud/backport/743/stable22

[stable22] better display of mail addresses

Author: ArtificialOwl

lib/Command/MembersList.php

@@ -357,7 +357,7 @@ private function getMembers(
 							$member->getSingleId(),
 							true
 						);
-						$circle = $this->circleService->getCircle($member->getSingleId(), 0);
+						$circle = $this->circleService->getCircle($member->getSingleId());
 					}
 					$node = new NC22TreeNode(
 						$tree, new SimpleDataStore(
@@ -435,8 +435,12 @@ public function displayLeaf(SimpleDataStore $data, int $lineNumber): string {
 							$member,
 							$this->input->getOption('display-name')
 						);
-					$source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : '';
-					$line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source];
+					if ($member->hasBasedOn()) {
+						$line .= ' <info>Source</info>: '
+								 . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()];
+					} else {
+						$line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()];
+					}
 				}
 
 				if ($lineNumber === 2) {

lib/Service/ConfigService.php

@@ -588,6 +588,10 @@ public function isLocalInstance(string $instance): bool {
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 
+		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
+			return $name . ' (' . $this->displayInstance($federatedUser->getInstance(), false) . ')';
+		}
+
 		return $name . $this->displayInstance($federatedUser->getInstance(), true);
 	}