Skip to content

Commit

Permalink
feat: allow inviting contact groups
Browse files Browse the repository at this point in the history 
Signed-off-by: Anna Larch <[email protected]>
  • Loading branch information
@miaulalala @GVodyanov
miaulalala authored and GVodyanov committed Dec 5, 2024
1 parent e86c82a commit 7f70db9
Show file tree
Hide file tree
Showing 10 changed files with 749 additions and 248 deletions.
2 changes: 2 additions & 0 deletions appinfo/routes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
['name' => 'contact#searchPhoto', 'url' => '/v1/autocompletion/photo', 'verb' => 'POST'],
// Circles
['name' => 'contact#getCircleMembers', 'url' => '/v1/circles/getmembers', 'verb' => 'GET'],
// Contact Groups
['name' => 'contact#getContactGroupMembers', 'url' => '/v1/autocompletion/groupmembers', 'verb' => 'POST'],
// Settings
['name' => 'settings#setConfig', 'url' => '/v1/config/{key}', 'verb' => 'POST'],
// Tools
Expand Down
197 changes: 86 additions & 111 deletions lib/Controller/ContactController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
namespace OCA\Calendar\Controller;

use Exception;
use OCA\Calendar\Service\ContactsService;
use OCA\Calendar\Service\ServiceException;
use OCA\Circles\Api\v1\Circles;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\QueryException;
use OCP\Contacts\IManager;
Expand All @@ -27,34 +28,22 @@
* @package OCA\Calendar\Controller
*/
class ContactController extends Controller {
/** @var IManager */
private $contactsManager;

/** @var IAppManager */
private $appManager;

/** @var IUserManager */
private $userManager;

/**
* ContactController constructor.
*
* @param string $appName
* @param IRequest $request
* @param IManager $contacts
*/
public function __construct(
string $appName,
IRequest $request,
IManager $contacts,
IAppManager $appManager,
IUserManager $userManager,
private IManager $contactsManager,
private IAppManager $appManager,
private IUserManager $userManager,
private ContactsService $contactsService,
private LoggerInterface $logger,
) {
parent::__construct($appName, $request);
$this->contactsManager = $contacts;
$this->appManager = $appManager;
$this->userManager = $userManager;
}

/**
Expand All @@ -65,7 +54,7 @@ public function __construct(
*
* @NoAdminRequired
*/
public function searchLocation(string $search):JSONResponse {
public function searchLocation(string $search): JSONResponse {
if (!$this->contactsManager->isEnabled()) {
return new JSONResponse();
}
Expand All @@ -75,27 +64,17 @@ public function searchLocation(string $search):JSONResponse {
$contacts = [];
foreach ($result as $r) {
// Information about system users is fetched via DAV nowadays
if (isset($r['isLocalSystemBook']) && $r['isLocalSystemBook']) {
if ($this->contactsService->isSystemBook($r)) {
continue;
}

if (!isset($r['ADR'])) {
continue;
}

$name = $this->getNameFromContact($r);
if (\is_string($r['ADR'])) {
$r['ADR'] = [$r['ADR']];
}

$photo = isset($r['PHOTO'])
? $this->getPhotoUri($r['PHOTO'])
: null;

$addresses = [];
foreach ($r['ADR'] as $address) {
$addresses[] = trim(preg_replace("/\n+/", "\n", str_replace(';', "\n", $address)));
}
$name = $this->contactsService->getNameFromContact($r);
$photo = $this->contactsService->getPhotoUri($r);
$addresses = $this->contactsService->getAddress($r);

$contacts[] = [
'name' => $name,
Expand Down Expand Up @@ -125,51 +104,78 @@ public function searchAttendee(string $search):JSONResponse {

$contacts = [];
foreach ($result as $r) {
// Information about system users is fetched via DAV nowadays
if (isset($r['isLocalSystemBook']) && $r['isLocalSystemBook']) {
if ($this->contactsService->isSystemBook($r) || !$this->contactsService->hasEmail($r)) {
continue;
}

if (!isset($r['EMAIL'])) {
$name = $this->contactsService->getNameFromContact($r);
$email = $this->contactsService->getEmail($r);
$photo = $this->contactsService->getPhotoUri($r);
$timezoneId = $this->contactsService->getTimezoneId($r);
$lang = $this->contactsService->getLanguageId($r);
$contacts[] = [
'name' => $name,
'emails' => $email,
'lang' => $lang,
'tzid' => $timezoneId,
'photo' => $photo,
'type' => 'individual'
];
}

$groups = $this->contactsManager->search($search, ['CATEGORIES']);
$groups = array_filter($groups, function ($group) {
return $this->contactsService->hasEmail($group);
});
$filtered = $this->contactsService->filterGroupsWithCount($groups, $search);
foreach ($filtered as $groupName => $count) {
if ($count === 0) {
continue;
}
$contacts[] = [
'name' => $groupName,
'emails' => ['mailto:' . urlencode($groupName) . '@group'],
'lang' => '',
'tzid' => '',
'photo' => '',
'type' => 'contactsgroup',
'members' => $count,
];
}

$name = $this->getNameFromContact($r);
if (\is_string($r['EMAIL'])) {
$r['EMAIL'] = [$r['EMAIL']];
}
return new JSONResponse($contacts);
}

$photo = isset($r['PHOTO'])
? $this->getPhotoUri($r['PHOTO'])
: null;
#[NoAdminRequired]
public function getContactGroupMembers(string $groupName): JSONResponse {
if (!$this->contactsManager->isEnabled()) {
return new JSONResponse();
}

$lang = null;
if (isset($r['LANG'])) {
if (\is_array($r['LANG'])) {
$lang = $r['LANG'][0];
} else {
$lang = $r['LANG'];
}
$groupmembers = $this->contactsManager->search($groupName, ['CATEGORIES']);
$contacts = [];
foreach ($groupmembers as $r) {
if (!in_array($groupName, explode(',', $r['CATEGORIES']), true)) {
continue;
}

$timezoneId = null;
if (isset($r['TZ'])) {
if (\is_array($r['TZ'])) {
$timezoneId = $r['TZ'][0];
} else {
$timezoneId = $r['TZ'];
}
if (!$this->contactsService->hasEmail($r) || $this->contactsService->isSystemBook($r)) {
continue;
}

$name = $this->contactsService->getNameFromContact($r);
$email = $this->contactsService->getEmail($r);
$photo = $this->contactsService->getPhotoUri($r);
$timezoneId = $this->contactsService->getTimezoneId($r);
$lang = $this->contactsService->getLanguageId($r);
$contacts[] = [
'name' => $name,
'emails' => $r['EMAIL'],
'lang' => $lang,
'tzid' => $timezoneId,
'photo' => $photo,
'commonName' => $name,
'email' => $email[0],
'calendarUserType' => 'INDIVIDUAL',
'language' => $lang,
'timezoneId' => $timezoneId,
'avatar' => $photo,
'isUser' => false,
'member' => 'mailto:' . urlencode($groupName) . '@group',
];
}

return new JSONResponse($contacts);
}

Expand All @@ -179,32 +185,32 @@ public function searchAttendee(string $search):JSONResponse {
* @param string $circleId CircleId to query for members
* @return JSONResponse
* @throws Exception
* @throws \OCP\AppFramework\QueryException
*
* @NoAdminRequired
*/
public function getCircleMembers(string $circleId):JSONResponse {
if (!class_exists('\OCA\Circles\Api\v1\Circles') || !$this->appManager->isEnabledForUser('circles')) {
$this->logger->debug('Circles not enabled');
if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
return new JSONResponse();
}
if (!$this->contactsManager->isEnabled()) {
$this->logger->debug('Contacts not enabled');
return new JSONResponse();
}

try {
$circle = Circles::detailsCircle($circleId, true);
$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleId, true);
} catch (QueryException $ex) {
$this->logger->error('Could not resolve circle details', ['exception' => $ex]);
return new JSONResponse();
} catch (CircleNotFoundException $ex) {
$this->logger->error('Could not find circle', ['exception' => $ex]);
return new JSONResponse();
}

if (!$circle) {
return new JSONResponse();
}

$circleMembers = $circle->getInheritedMembers();

$contacts = [];
foreach ($circleMembers as $circleMember) {
if ($circleMember->isLocal()) {

Expand All @@ -213,8 +219,7 @@ public function getCircleMembers(string $circleId):JSONResponse {
$user = $this->userManager->get($circleMemberUserId);

if ($user === null) {
$this->logger->error('Could not find user with user id' . $circleMemberUserId);
throw new ServiceException('Could not find circle member');
throw new ServiceException('Could not find organizer');
}

$contacts[] = [
Expand Down Expand Up @@ -250,17 +255,14 @@ public function searchPhoto(string $search):JSONResponse {
$result = $this->contactsManager->search($search, ['EMAIL']);

foreach ($result as $r) {
if (!isset($r['EMAIL'])) {
if (!$this->contactsService->hasEmail($r) || $this->contactsService->isSystemBook($r)) {
continue;
}

if (\is_string($r['EMAIL'])) {
$r['EMAIL'] = [$r['EMAIL']];
}
$email = $this->contactsService->getEmail($r);

$match = false;
foreach ($r['EMAIL'] as $email) {
if ($email === $search) {
foreach ($email as $e) {
if ($e === $search) {
$match = true;
}
}
Expand All @@ -269,15 +271,12 @@ public function searchPhoto(string $search):JSONResponse {
continue;
}

if (!isset($r['PHOTO'])) {
$photo = $this->contactsService->getPhotoUri($r);
if ($photo === null) {
continue;
}

$name = $this->getNameFromContact($r);
$photo = $this->getPhotoUri($r['PHOTO']);
if (!$photo) {
continue;
}
$name = $this->contactsService->getNameFromContact($r);

return new JSONResponse([
'name' => $name,
Expand All @@ -288,28 +287,4 @@ public function searchPhoto(string $search):JSONResponse {
return new JSONResponse([], Http::STATUS_NOT_FOUND);
}

/**
* Extract name from an array containing a contact's information
*
* @param array $r
* @return string
*/
private function getNameFromContact(array $r):string {
return $r['FN'] ?? '';
}

/**
* Get photo uri from contact
*
* @param string $raw
* @return string|null
*/
private function getPhotoUri(string $raw):?string {
$uriPrefix = 'VALUE=uri:';
if (substr($raw, 0, strlen($uriPrefix)) === $uriPrefix) {
return substr($raw, strpos($raw, 'http'));
}

return null;
}
}
Loading

0 comments on commit 7f70db9

Please sign in to comment.