From 7119702596814eba098fb1d3902e4debda9883ff Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@nextcloud.com>
Date: Sun, 13 Aug 2017 12:25:29 +0200
Subject: multiple type members

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
---
 lib/Api/v1/Circles.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'lib/Api')

diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php
index 14267505..ff51c575 100644
--- a/lib/Api/v1/Circles.php
+++ b/lib/Api/v1/Circles.php
@@ -231,7 +231,7 @@ class Circles {
 
 
 	/**
-	 * Circles::addMember();
+	 * Circles::addLocalMember();
 	 *
 	 * This function will add a user as member of the circle. Current user need at least to be
 	 * Moderator.
@@ -241,7 +241,7 @@ class Circles {
 	 *
 	 * @return Member[]
 	 */
-	public static function addMember($circleUniqueId, $userId) {
+	public static function addLocalMember($circleUniqueId, $userId) {
 		$c = self::getContainer();
 
 		return $c->query('MembersService')
@@ -257,14 +257,15 @@ class Circles {
 	 *
 	 * @param string $circleUniqueId
 	 * @param string $userId
+	 * @param int $userType
 	 *
 	 * @return Member
 	 */
-	public static function getLocalMember($circleUniqueId, $userId) {
+	public static function getMember($circleUniqueId, $userId, $userType) {
 		$c = self::getContainer();
 
 		return $c->query('MembersService')
-				 ->getMember($circleUniqueId, $userId, Member::TYPE_USER);
+				 ->getMember($circleUniqueId, $userId, $userType);
 	}
 
 
@@ -276,14 +277,15 @@ class Circles {
 	 *
 	 * @param string $circleUniqueId
 	 * @param string $userId
+	 * @param int $userType
 	 *
 	 * @return Member[]
 	 */
-	public static function removeMember($circleUniqueId, $userId) {
+	public static function removeMember($circleUniqueId, $userId, $userType) {
 		$c = self::getContainer();
 
 		return $c->query('MembersService')
-				 ->removeMember($circleUniqueId, $userId);
+				 ->removeMember($circleUniqueId, $userId, $userType);
 	}
 
 
@@ -297,15 +299,16 @@ class Circles {
 	 *
 	 * @param string $circleUniqueId
 	 * @param string $userId
+	 * @param int $userType
 	 * @param int $level
 	 *
 	 * @return Member[]
 	 */
-	public static function levelMember($circleUniqueId, $userId, $level) {
+	public static function levelMember($circleUniqueId, $userId, $userType, $level) {
 		$c = self::getContainer();
 
 		return $c->query('MembersService')
-				 ->levelMember($circleUniqueId, $userId, $level);
+				 ->levelMember($circleUniqueId, $userId, $userType, $level);
 	}
 
 
-- 
cgit v1.2.3