rewrite on getDisplayName() and Personal Circle

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

2 files changed, 41 insertions, 6 deletions

diff --git a/lib/Api/Sharees.php b/lib/Api/Sharees.php
index 26933ca0..c1437dfc 100644
--- a/lib/Api/Sharees.php
+++ b/lib/Api/Sharees.php
@@ -29,6 +29,7 @@ namespace OCA\Circles\Api;
 use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
+use OCA\Circles\Service\MiscService;
 use OCP\Share;
 
 
@@ -83,12 +84,10 @@ class Sharees {
 				'shareType'   => Share::SHARE_TYPE_CIRCLE,
 				'shareWith'   => $entry->getUniqueId(),
 				'circleInfo'  => $entry->getInfo(),
-				'circleOwner' => \OC::$server->getUserManager()
-											 ->get(
-												 $entry->getOwner()
-													   ->getUserId()
-											 )
-											 ->getDisplayName()
+				'circleOwner' => MiscService::staticGetUserManager(
+					$entry->getOwner()
+						  ->getUserId()
+				)
 			],
 		];
 
diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php
index 427e02fd..7185611d 100644
--- a/lib/Api/v1/Circles.php
+++ b/lib/Api/v1/Circles.php
@@ -33,6 +33,7 @@ use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\FederatedLink;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\SharingFrame;
+use OCA\Circles\Service\MiscService;
 
 class Circles {
 
@@ -387,4 +388,39 @@ class Circles {
 			   . '-' . $link->getToken();
 	}
 
+
+	/**
+	 * @param SharingFrame $frame
+	 *
+	 * @return array
+	 */
+	public static function generateUserParameter(SharingFrame $frame) {
+
+		if ($frame->getCloudId() !== null) {
+			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
+		} else {
+			$name = MiscService::staticGetDisplayName($frame->getAuthor());
+		}
+
+		return [
+			'type' => 'user',
+			'id'   => $frame->getAuthor(),
+			'name' => $name
+		];
+	}
+
+
+	/**
+	 * @param SharingFrame $frame
+	 *
+	 * @return array
+	 */
+	public static function generateCircleParameter(SharingFrame $frame) {
+		return [
+			'type' => 'circle',
+			'id'   => $frame->getCircleId(),
+			'name' => $frame->getCircleName(),
+			'link' => self::generateLink($frame->getCircleId())
+		];
+	}
 }
\ No newline at end of file