nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10412 from annando/local-photo

Browse source 
Photos should point to the local system
This commit is contained in:
Hypolite Petovan 2021-06-17 13:31:57 -04:00 committed by GitHub
parent 83d3ce0802 b184df1108
commit 47b64c8735
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Object/Api/Mastodon/Account.php
View file

@ -28,6 +28,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy;
/** /**
* Class Account * Class Account
@ -112,10 +113,10 @@ class Account extends BaseDataTransferObject
$this->note = BBCode::convert($publicContact['about'], false); $this->note = BBCode::convert($publicContact['about'], false);
$this->url = $publicContact['url']; $this->url = $publicContact['url'];
$this->avatar = $userContact['avatar'] ?? $publicContact['avatar']; $this->avatar = ($userContact['photo'] ?? $publicContact['photo']) ?: Proxy::proxifyUrl($userContact['avatar'] ?? $publicContact['avatar']);
$this->avatar_static = $userContact['avatar'] ?? $publicContact['avatar']; $this->avatar_static = $this->avatar;
$this->header = ($userContact['header'] ?? $publicContact['header']) ?? ''; $this->header = Proxy::proxifyUrl($userContact['header'] ?? $publicContact['header'] ?? '');
$this->header_static = ($userContact['header'] ?? $publicContact['header']) ?? ''; $this->header_static = $this->header;
$this->followers_count = $apcontact['followers_count'] ?? 0; $this->followers_count = $apcontact['followers_count'] ?? 0;
$this->following_count = $apcontact['following_count'] ?? 0; $this->following_count = $apcontact['following_count'] ?? 0;
$this->statuses_count = $apcontact['statuses_count'] ?? 0; $this->statuses_count = $apcontact['statuses_count'] ?? 0;