clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13931 from MrPetovan/bug/13930-photo-preview-sizes 

Increase API photo preview size for Mastodon API to 640
This commit is contained in:
Michael Vogel 2024-02-24 09:39:31 +01:00 committed by GitHub
parent e16b6ee6e1 0a73050de1
commit 0ff37c0075
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Factory/Api/Mastodon/Attachment.php
View File

@ -95,12 +95,12 @@ class Attachment extends BaseFactory
$remote = $attachment['url']; $remote = $attachment['url'];
if ($type == 'image') { if ($type == 'image') {
$url = Post\Media::getPreviewUrlForId($attachment['id']); $url = Post\Media::getPreviewUrlForId($attachment['id']);
$preview = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_SMALL); $preview = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
} else { } else {
$url = $attachment['url']; $url = $attachment['url'];
if (!empty($attachment['preview'])) { if (!empty($attachment['preview'])) {
$preview = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_SMALL); $preview = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
} else { } else {
$preview = ''; $preview = '';
} }

7
src/Module/Photo.php
View File

@ -100,7 +100,6 @@ class Photo extends BaseApi
$id = $account['id']; $id = $account['id'];
} }
// Contact Id Fallback, to remove after version 2021.12
if (isset($this->parameters['contact_id'])) { if (isset($this->parameters['contact_id'])) {
$id = intval($this->parameters['contact_id']); $id = intval($this->parameters['contact_id']);
} }
@ -115,12 +114,6 @@ class Photo extends BaseApi
$id = $user['uid']; $id = $user['uid'];
} }
// User Id Fallback, to remove after version 2021.12
if (!empty($this->parameters['uid_ext'])) {
$id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
}
// Please refactor this for the love of everything that's good
if (isset($this->parameters['id'])) { if (isset($this->parameters['id'])) {
$id = $this->parameters['id']; $id = $this->parameters['id'];
} }

9
static/routes.config.php
View File

@ -575,22 +575,13 @@ return [
'/{name}' => [Module\Photo::class, [R::GET]], '/{name}' => [Module\Photo::class, [R::GET]],
'/{type}/{id:\d+}' => [Module\Photo::class, [R::GET]], '/{type}/{id:\d+}' => [Module\Photo::class, [R::GET]],
'/{type:contact|header}/{guid}' => [Module\Photo::class, [R::GET]], '/{type:contact|header}/{guid}' => [Module\Photo::class, [R::GET]],
// User Id Fallback, to remove after version 2021.12
'/{type}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{nickname_ext}' => [Module\Photo::class, [R::GET]], '/{type}/{nickname_ext}' => [Module\Photo::class, [R::GET]],
// Contact Id Fallback, to remove after version 2021.12
'/{type:contact|header}/{customsize:\d+}/{contact_id:\d+}' => [Module\Photo::class, [R::GET]], '/{type:contact|header}/{customsize:\d+}/{contact_id:\d+}' => [Module\Photo::class, [R::GET]],
'/{type:contact|header}/{customsize:\d+}/{guid}' => [Module\Photo::class, [R::GET]], '/{type:contact|header}/{customsize:\d+}/{guid}' => [Module\Photo::class, [R::GET]],
'/{type}/{customsize:\d+}/{id:\d+}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize:\d+}/{id:\d+}' => [Module\Photo::class, [R::GET]],
// User Id Fallback, to remove after version 2021.12
'/{type}/{customsize:\d+}/{uid_ext:\d+\..*}' => [Module\Photo::class, [R::GET]],
'/{type}/{customsize:\d+}/{nickname_ext}' => [Module\Photo::class, [R::GET]], '/{type}/{customsize:\d+}/{nickname_ext}' => [Module\Photo::class, [R::GET]],
], ],
// Kept for backwards-compatibility
// @TODO remove by version 2023.12
'/photos/{nickname}' => [Module\Profile\Photos::class, [R::GET]],
'/ping' => [Module\Notifications\Ping::class, [R::GET]], '/ping' => [Module\Notifications\Ping::class, [R::GET]],
'/post' => [ '/post' => [