sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly handle the classification of events in the activity stream 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/13439/head
Joas Schilling 2019-01-08 17:46:07 +07:00
parent 38a49cb8af
commit ffb145c2d2
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/dav/lib/CalDAV/Activity/Backend.php
Unescape Escape View File

@ -27,6 +27,7 @@ namespace OCA\DAV\CalDAV\Activity;
use OCA\DAV\CalDAV\Activity\Provider\Calendar;
use OCA\DAV\CalDAV\Activity\Provider\Event;
use OCA\DAV\CalDAV\CalDavBackend;
use OCP\Activity\IEvent;
use OCP\Activity\IManager as IActivityManager;
use OCP\IGroup;
@ -415,6 +416,7 @@ class Backend {
$currentUser = $owner;
}
$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
$object = $this->getObjectNameAndType($objectData);
$action = $action . '_' . $object['type'];
@ -434,6 +436,11 @@ class Backend {
$users[] = $owner;
foreach ($users as $user) {
if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {
// Private events are only shown to the owner
continue;
}
$event->setAffectedUser($user)
->setSubject(
$user === $currentUser ? $action . '_self' : $action,
@ -446,7 +453,8 @@ class Backend {
],
'object' => [
'id' => $object['id'],
'name' => $object['name'],
'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
],
]
);

13
apps/dav/lib/CalDAV/Activity/Provider/Event.php
Unescape Escape View File

@ -23,6 +23,7 @@
namespace OCA\DAV\CalDAV\Activity\Provider;
use OCA\DAV\CalDAV\CalDavBackend;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
@ -131,14 +132,14 @@ class Event extends Base {
return [
'actor' => $this->generateUserParameter($parameters['actor']),
'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
'event' => $this->generateObjectParameter($parameters['object']),
'event' => $this->generateClassifiedObjectParameter($parameters['object']),
];
case self::SUBJECT_OBJECT_ADD . '_event_self':
case self::SUBJECT_OBJECT_DELETE . '_event_self':
case self::SUBJECT_OBJECT_UPDATE . '_event_self':
return [
'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
'event' => $this->generateObjectParameter($parameters['object']),
'event' => $this->generateClassifiedObjectParameter($parameters['object']),
];
}
}
@ -168,4 +169,12 @@ class Event extends Base {
throw new \InvalidArgumentException();
}
private function generateClassifiedObjectParameter(array $eventData) {
$parameter = $this->generateObjectParameter($eventData);
if ($eventData['classified']) {
$parameter['name'] = $this->l->t('Busy');
}
return $parameter;
}
}