mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #27298 from nextcloud/fix/caldav-deleted-objects-expose-timestamp 

Expose deletion timestamp for deleted CalDAV objects
This commit is contained in:
Christoph Wurst 2021-05-31 18:24:30 +02:00 committed by GitHub
parent 7e8ddcd38f fe31373a93
commit b908db7ac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
View File

@ -93,4 +93,8 @@ class DeletedCalendarObject implements ICalendarObject, IRestorable {
public function restore(): void {
$this->calDavBackend->restoreCalendarObject($this->objectData);
}
public function getDeletedAt(): ?int {
return $this->objectData['deleted_at'] ? (int) $this->objectData['deleted_at'] : null;
}
}

18
apps/dav/lib/CalDAV/Trashbin/Plugin.php
View File

@ -25,9 +25,12 @@ declare(strict_types=1);
namespace OCA\DAV\CalDAV\Trashbin;
use Closure;
use OCA\DAV\CalDAV\Calendar;
use OCP\IRequest;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\INode;
use Sabre\DAV\PropFind;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
@ -35,10 +38,8 @@ use Sabre\HTTP\ResponseInterface;
use function array_slice;
use function implode;
/**
* Conditional logic to bypass the calendar trashbin
*/
class Plugin extends ServerPlugin {
public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
/** @var bool */
private $disableTrashbin;
@ -53,6 +54,7 @@ class Plugin extends ServerPlugin {
public function initialize(Server $server): void {
$this->server = $server;
$server->on('beforeMethod:*', [$this, 'beforeMethod']);
$server->on('propFind', Closure::fromCallable([$this, 'propFind']));
}
public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
@ -86,6 +88,16 @@ class Plugin extends ServerPlugin {
}
}
private function propFind(
PropFind $propFind,
INode $node): void {
if ($node instanceof DeletedCalendarObject) {
$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
return $node->getDeletedAt();
});
}
}
public function getFeatures(): array {
return ['nc-calendar-trashbin'];
}