Merge pull request #1667 from nextcloud/ignore-empty-media-type

ignore empty media type
pull/1670/head
Maxence Lange 2023-03-16 16:51:21 -01:00 zatwierdzone przez GitHub
commit 60e0725ae5
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 9 dodań i 5 usunięć

Wyświetl plik

@ -371,22 +371,26 @@ class Document extends ACore implements JsonSerializable {
*/
public function convertToMediaAttachment(?IURLGenerator $urlGenerator = null): MediaAttachment {
$media = new MediaAttachment();
$media->setId((string)$this->getNid());
[$type, $mime] = explode('/', $this->getMediaType(), 2);
$media->setId((string)$this->getNid())
->setType($type);
$mime = '';
if (strpos($this->getMediaType(), '/')) {
[$type, $mime] = explode('/', $this->getMediaType(), 2);
$media->setType($type);
$mime = (strlen($mime) < 7) ? '.' . $mime : ''; // mime is ignored if too long.
}
if (!is_null($urlGenerator)) {
$media->setUrl(
$urlGenerator->linkToRouteAbsolute(
'social.Api.mediaOpen',
['uuid' => $this->getLocalCopy() . '.' . $mime]
['uuid' => $this->getLocalCopy() . $mime]
)
);
$media->setPreviewUrl(
$urlGenerator->linkToRouteAbsolute(
'social.Api.mediaOpen',
['uuid' => $this->getResizedCopy() . '.' . $mime]
['uuid' => $this->getResizedCopy() . $mime]
)
);
$media->setRemoteUrl($this->getUrl());