Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 17:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 11034: Use the profile photo for local users

Browse source
This commit is contained in:
Michael 2022-02-01 19:12:33 +00:00
parent 52f5e94bdb
commit c7b3c071c7
6 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Module/Photo.php
View file

@ -265,10 +265,29 @@ class Photo extends BaseModule
return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
case "contact":
$contact = Contact::getById($id, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
$contact = Contact::getById($id, ['uid', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr']);
if (empty($contact)) {
return false;
}
// For local users directly use the photo record that is marked as the profile
if (Network::isLocalLink($contact['url'])) {
$contact = Contact::selectFirst(['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr'], ['nurl' => $contact['nurl'], 'self' => true]);
if (!empty($contact)) {
if ($customsize <= Proxy::PIXEL_MICRO) {
$scale = 6;
} elseif ($customsize <= Proxy::PIXEL_THUMB) {
$scale = 5;
} else {
$scale = 4;
}
$photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $contact['uid'], "profile" => 1]);
if (!empty($photo)) {
return $photo;
}
}
}
If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
$contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
}