Skip to content

Allow apps to get photos of VObjects #27436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Jun 9, 2021
Merged

Allow apps to get photos of VObjects #27436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions apps/dav/lib/CardDAV/PhotoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
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;
Expand Down Expand Up @@ -206,9 +207,28 @@ private function getExtension(ISimpleFolder $folder): string {
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;
}
Expand Down