From b1031f3985355798c8bebcb46e362b15c462ac24 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 9 Jun 2021 10:51:09 +0200 Subject: Allow apps to get photos of VObjects Signed-off-by: Joas Schilling --- apps/dav/lib/CardDAV/PhotoCache.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'apps/dav') diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php index 0761a69d60f..d3e4b2450d3 100644 --- a/apps/dav/lib/CardDAV/PhotoCache.php +++ b/apps/dav/lib/CardDAV/PhotoCache.php @@ -36,6 +36,7 @@ use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ILogger; use Sabre\CardDAV\Card; +use Sabre\VObject\Document; use Sabre\VObject\Parameter; use Sabre\VObject\Property\Binary; use Sabre\VObject\Reader; @@ -206,9 +207,28 @@ class PhotoCache { throw new NotFoundException('Avatar not found'); } + /** + * @param Card $node + * @return bool|array{body: string, Content-Type: string} + */ private function getPhoto(Card $node) { try { $vObject = $this->readCard($node->get()); + return $this->getPhotoFromVObject($vObject); + } catch (\Exception $e) { + $this->logger->logException($e, [ + 'message' => 'Exception during vcard photo parsing' + ]); + } + return false; + } + + /** + * @param Document $vObject + * @return bool|array{body: string, Content-Type: string} + */ + public function getPhotoFromVObject(Document $vObject) { + try { if (!$vObject->PHOTO) { return false; } -- cgit v1.2.3