Skip to content

Commit ef1b510

Browse files
tcitworldtcitworld
committed
Provide links to calendar in event creation/update activities
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
1 parent 8f650fe commit ef1b510

9 files changed

Lines changed: 298 additions & 108 deletions

File tree

‎apps/dav/lib/CalDAV/Activity/Backend.php‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use OCA\DAV\CalDAV\CalDavBackend;
3131
use OCP\Activity\IEvent;
3232
use OCP\Activity\IManager as IActivityManager;
33+
use OCP\App\IAppManager;
3334
use OCP\IGroup;
3435
use OCP\IGroupManager;
3536
use OCP\IUser;
@@ -52,15 +53,14 @@ class Backend {
5253
/** @var IUserSession */
5354
protected $userSession;
5455

55-
/**
56-
* @param IActivityManager $activityManager
57-
* @param IGroupManager $groupManager
58-
* @param IUserSession $userSession
59-
*/
60-
public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession) {
56+
/** @var IAppManager */
57+
protected $appManager;
58+
59+
public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession, IAppManager $appManager) {
6160
$this->activityManager = $activityManager;
6261
$this->groupManager = $groupManager;
6362
$this->userSession = $userSession;
63+
$this->appManager = $appManager;
6464
}
6565

6666
/**
@@ -435,29 +435,41 @@ public function onTouchCalendarObject($action, array $calendarData, array $share
435435
$users = $this->getUsersForShares($shares);
436436
$users[] = $owner;
437437

438-
foreach ($users as $user) {
438+
// Users for share can return the owner itself if the calendar is published
439+
foreach (array_unique($users) as $user) {
439440
if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {
440441
// Private events are only shown to the owner
441442
continue;
442443
}
443444

445+
$params = [
446+
'actor' => $event->getAuthor(),
447+
'calendar' => [
448+
'id' => (int) $calendarData['id'],
449+
'uri' => $calendarData['uri'],
450+
'name' => $calendarData['{DAV:}displayname'],
451+
],
452+
'object' => [
453+
'id' => $object['id'],
454+
'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
455+
'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
456+
],
457+
];
458+
459+
if ($object['type'] === 'event' && strpos($action, Event::SUBJECT_OBJECT_DELETE) === false && $this->appManager->isEnabledForUser('calendar')) {
460+
$params['object']['link']['firstoccurence'] = $objectData['firstoccurence'];
461+
$params['object']['link']['object_uri'] = $objectData['uri'];
462+
$params['object']['link']['calendar_uri'] = $calendarData['uri'];
463+
$params['object']['link']['owner'] = $owner;
464+
}
465+
466+
444467
$event->setAffectedUser($user)
445468
->setSubject(
446469
$user === $currentUser ? $action . '_self' : $action,
447-
[
448-
'actor' => $event->getAuthor(),
449-
'calendar' => [
450-
'id' => (int) $calendarData['id'],
451-
'uri' => $calendarData['uri'],
452-
'name' => $calendarData['{DAV:}displayname'],
453-
],
454-
'object' => [
455-
'id' => $object['id'],
456-
'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
457-
'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
458-
],
459-
]
470+
$params
460471
);
472+
461473
$this->activityManager->publish($event);
462474
}
463475
}
@@ -496,11 +508,11 @@ protected function getObjectNameAndType(array $objectData) {
496508
protected function getUsersForShares(array $shares) {
497509
$users = $groups = [];
498510
foreach ($shares as $share) {
499-
$prinical = explode('/', $share['{http://owncloud.org/ns}principal']);
500-
if ($prinical[1] === 'users') {
501-
$users[] = $prinical[2];
502-
} elseif ($prinical[1] === 'groups') {
503-
$groups[] = $prinical[2];
511+
$principal = explode('/', $share['{http://owncloud.org/ns}principal']);
512+
if ($principal[1] === 'users') {
513+
$users[] = $principal[2];
514+
} elseif ($principal[1] === 'groups') {
515+
$groups[] = $principal[2];
504516
}
505517
}
506518

‎apps/dav/lib/CalDAV/Activity/Provider/Base.php‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
44
*
55
* @author Joas Schilling <coding@schilljs.com>
6+
* @author Thomas Citharel <nextcloud@tcit.fr>
67
*
78
* @license GNU AGPL version 3 or any later version
89
*
@@ -29,6 +30,7 @@
2930
use OCP\IGroup;
3031
use OCP\IGroupManager;
3132
use OCP\IL10N;
33+
use OCP\IURLGenerator;
3234
use OCP\IUser;
3335
use OCP\IUserManager;
3436

@@ -46,13 +48,18 @@ abstract class Base implements IProvider {
4648
/** @var string[] */
4749
protected $groupDisplayNames = [];
4850

51+
/** @var IURLGenerator */
52+
protected $url;
53+
4954
/**
5055
* @param IUserManager $userManager
5156
* @param IGroupManager $groupManager
57+
* @param IURLGenerator $urlGenerator
5258
*/
53-
public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
59+
public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
5460
$this->userManager = $userManager;
5561
$this->groupManager = $groupManager;
62+
$this->url = $urlGenerator;
5663
}
5764

5865
/**
@@ -71,22 +78,6 @@ protected function setSubjects(IEvent $event, $subject, array $parameters) {
7178
->setRichSubject($subject, $parameters);
7279
}
7380

74-
/**
75-
* @param array $eventData
76-
* @return array
77-
*/
78-
protected function generateObjectParameter($eventData) {
79-
if (!is_array($eventData) || !isset($eventData['id']) || !isset($eventData['name'])) {
80-
throw new \InvalidArgumentException();
81-
}
82-
83-
return [
84-
'type' => 'calendar-event',
85-
'id' => $eventData['id'],
86-
'name' => $eventData['name'],
87-
];
88-
}
89-
9081
/**
9182
* @param array $data
9283
* @param IL10N $l

‎apps/dav/lib/CalDAV/Activity/Provider/Calendar.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ class Calendar extends Base {
5252
/** @var IL10N */
5353
protected $l;
5454

55-
/** @var IURLGenerator */
56-
protected $url;
57-
5855
/** @var IManager */
5956
protected $activityManager;
6057

@@ -70,9 +67,8 @@ class Calendar extends Base {
7067
* @param IEventMerger $eventMerger
7168
*/
7269
public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
73-
parent::__construct($userManager, $groupManager);
70+
parent::__construct($userManager, $groupManager, $url);
7471
$this->languageFactory = $languageFactory;
75-
$this->url = $url;
7672
$this->activityManager = $activityManager;
7773
$this->eventMerger = $eventMerger;
7874
}

‎apps/dav/lib/CalDAV/Activity/Provider/Event.php‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*
55
* @author Joas Schilling <coding@schilljs.com>
66
* @author Julius Härtl <jus@bitgrid.net>
7+
* @author Thomas Citharel <nextcloud@tcit.fr>
78
*
89
* @license GNU AGPL version 3 or any later version
910
*
@@ -24,9 +25,11 @@
2425

2526
namespace OCA\DAV\CalDAV\Activity\Provider;
2627

28+
use OC_App;
2729
use OCP\Activity\IEvent;
2830
use OCP\Activity\IEventMerger;
2931
use OCP\Activity\IManager;
32+
use OCP\App\IAppManager;
3033
use OCP\IGroupManager;
3134
use OCP\IL10N;
3235
use OCP\IURLGenerator;
@@ -44,29 +47,67 @@ class Event extends Base {
4447
/** @var IL10N */
4548
protected $l;
4649

47-
/** @var IURLGenerator */
48-
protected $url;
49-
5050
/** @var IManager */
5151
protected $activityManager;
5252

5353
/** @var IEventMerger */
5454
protected $eventMerger;
5555

56+
/** @var IAppManager */
57+
protected $appManager;
58+
5659
/**
5760
* @param IFactory $languageFactory
5861
* @param IURLGenerator $url
5962
* @param IManager $activityManager
6063
* @param IUserManager $userManager
6164
* @param IGroupManager $groupManager
6265
* @param IEventMerger $eventMerger
66+
* @param IAppManager $appManager
6367
*/
64-
public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
65-
parent::__construct($userManager, $groupManager);
68+
public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger, IAppManager $appManager) {
69+
parent::__construct($userManager, $groupManager, $url);
6670
$this->languageFactory = $languageFactory;
67-
$this->url = $url;
6871
$this->activityManager = $activityManager;
6972
$this->eventMerger = $eventMerger;
73+
$this->appManager = $appManager;
74+
}
75+
76+
/**
77+
* @param array $eventData
78+
* @return array
79+
*/
80+
protected function generateObjectParameter(array $eventData) {
81+
if (!isset($eventData['id']) || !isset($eventData['name'])) {
82+
throw new \InvalidArgumentException();
83+
}
84+
85+
$params = [
86+
'type' => 'calendar-event',
87+
'id' => $eventData['id'],
88+
'name' => $eventData['name'],
89+
90+
];
91+
if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
92+
try {
93+
// The calendar app needs to be manually loaded for the routes to be loaded
94+
OC_App::loadApp('calendar');
95+
$linkData = $eventData['link'];
96+
$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
97+
$timeRange = (new \DateTime())->setTimestamp($linkData['firstoccurence']);
98+
$link = [
99+
'view' => 'dayGridMonth',
100+
'timeRange' => $timeRange->format('Y-m-d'),
101+
'mode' => 'sidebar',
102+
'objectId' => $objectId,
103+
'recurrenceId' => $linkData['firstoccurence']
104+
];
105+
$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
106+
} catch (\Exception $error) {
107+
// Do nothing
108+
}
109+
}
110+
return $params;
70111
}
71112

72113
/**

‎apps/dav/lib/CalDAV/CalDavBackend.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ public function getCalendarObjects($id, $calendarType=self::CALENDAR_TYPE_CALEND
953953
*/
954954
public function getCalendarObject($id, $objectUri, $calendarType=self::CALENDAR_TYPE_CALENDAR) {
955955
$query = $this->db->getQueryBuilder();
956-
$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
956+
$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'firstoccurence', 'classification'])
957957
->from('calendarobjects')
958958
->where($query->expr()->eq('calendarid', $query->createNamedParameter($id)))
959959
->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
@@ -974,6 +974,7 @@ public function getCalendarObject($id, $objectUri, $calendarType=self::CALENDAR_
974974
'size' => (int)$row['size'],
975975
'calendardata' => $this->readBlob($row['calendardata']),
976976
'component' => strtolower($row['componenttype']),
977+
'firstoccurence'=> (int)$row['firstoccurence'],
977978
'classification'=> (int)$row['classification']
978979
];
979980
}

‎apps/dav/tests/unit/CalDAV/Activity/BackendTest.php‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,55 @@
2929
use OCA\DAV\CalDAV\Activity\Provider\Calendar;
3030
use OCP\Activity\IEvent;
3131
use OCP\Activity\IManager;
32+
use OCP\App\IAppManager;
3233
use OCP\IGroup;
3334
use OCP\IGroupManager;
3435
use OCP\IUser;
3536
use OCP\IUserSession;
37+
use PHPUnit\Framework\MockObject\MockObject;
3638
use Test\TestCase;
3739

3840
class BackendTest extends TestCase {
3941

40-
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
42+
/** @var IManager|MockObject */
4143
protected $activityManager;
4244

43-
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
45+
/** @var IGroupManager|MockObject */
4446
protected $groupManager;
4547

46-
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
48+
/** @var IUserSession|MockObject */
4749
protected $userSession;
4850

51+
/** @var IAppManager|MockObject */
52+
protected $appManager;
53+
4954
protected function setUp(): void {
5055
parent::setUp();
5156
$this->activityManager = $this->createMock(IManager::class);
5257
$this->groupManager = $this->createMock(IGroupManager::class);
5358
$this->userSession = $this->createMock(IUserSession::class);
59+
$this->appManager = $this->createMock(IAppManager::class);
5460
}
5561

5662
/**
5763
* @param array $methods
58-
* @return Backend|\PHPUnit_Framework_MockObject_MockObject
64+
* @return Backend|MockObject
5965
*/
6066
protected function getBackend(array $methods = []) {
6167
if (empty($methods)) {
6268
return new Backend(
6369
$this->activityManager,
6470
$this->groupManager,
65-
$this->userSession
71+
$this->userSession,
72+
$this->appManager
6673
);
6774
} else {
6875
return $this->getMockBuilder(Backend::class)
6976
->setConstructorArgs([
7077
$this->activityManager,
7178
$this->groupManager,
7279
$this->userSession,
80+
$this->appManager,
7381
])
7482
->setMethods($methods)
7583
->getMock();
@@ -339,7 +347,7 @@ public function testGetUsersForShares(array $shares, array $groups, array $expec
339347

340348
/**
341349
* @param string[] $users
342-
* @return IUser[]|\PHPUnit_Framework_MockObject_MockObject[]
350+
* @return IUser[]|MockObject[]
343351
*/
344352
protected function getUsers(array $users) {
345353
$list = [];
@@ -351,7 +359,7 @@ protected function getUsers(array $users) {
351359

352360
/**
353361
* @param string $uid
354-
* @return IUser|\PHPUnit_Framework_MockObject_MockObject
362+
* @return IUser|MockObject
355363
*/
356364
protected function getUserMock($uid) {
357365
$user = $this->createMock(IUser::class);

0 commit comments

Comments
 (0)