mirror of
https://github.com/friendica/friendica
synced 2025-04-22 07:10:24 +00:00
Refactor User::getAvatarUrlForId into getAvatarUrl
- Use user/owner array as parameter instead of uid - Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick - Replace Module\Photo::stripExtension with native pathinfo() calls
This commit is contained in:
Hypolite Petovan
parent
810699b454
commit
7cdd2d1336
14 changed files with 78 additions and 107 deletions
|
|
@ -122,7 +122,7 @@ class Delegation extends BaseModule
|
|||
|
||||
//getting additinal information for each identity
|
||||
foreach ($identities as $key => $identity) {
|
||||
$identities[$key]['thumb'] = User::getAvatarUrlForId($identity['uid'], Proxy::SIZE_THUMB);
|
||||
$identities[$key]['thumb'] = User::getAvatarUrl($identity, Proxy::SIZE_THUMB);
|
||||
|
||||
$identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getLoggedInUserNickname());
|
||||
|
||||
|
|
|
|||
|
|
@ -49,20 +49,20 @@ class NoScrape extends BaseModule
|
|||
System::jsonError(403, 'Authentication required');
|
||||
}
|
||||
|
||||
$profile = User::getOwnerDataByNick($which);
|
||||
$owner = User::getOwnerDataByNick($which);
|
||||
|
||||
if (empty($profile['uid'])) {
|
||||
if (empty($owner['uid'])) {
|
||||
System::jsonError(404, 'Profile not found');
|
||||
}
|
||||
|
||||
$json_info = [
|
||||
'addr' => $profile['addr'],
|
||||
'addr' => $owner['addr'],
|
||||
'nick' => $which,
|
||||
'guid' => $profile['guid'],
|
||||
'key' => $profile['upubkey'],
|
||||
'homepage' => DI::baseUrl() . "/profile/{$which}",
|
||||
'comm' => ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
|
||||
'account-type' => $profile['account-type'],
|
||||
'guid' => $owner['guid'],
|
||||
'key' => $owner['upubkey'],
|
||||
'homepage' => DI::baseUrl() . '/profile/' . $which,
|
||||
'comm' => ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY),
|
||||
'account-type' => $owner['account-type'],
|
||||
];
|
||||
|
||||
$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
|
||||
|
|
@ -70,28 +70,28 @@ class NoScrape extends BaseModule
|
|||
$json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
|
||||
}
|
||||
|
||||
if (!$profile['net-publish']) {
|
||||
if (!$owner['net-publish']) {
|
||||
$json_info['hide'] = true;
|
||||
System::jsonExit($json_info);
|
||||
}
|
||||
|
||||
$keywords = $profile['pub_keywords'] ?? '';
|
||||
$keywords = $owner['pub_keywords'] ?? '';
|
||||
$keywords = str_replace(['#', ',', ' ', ',,'], ['', ' ', ',', ','], $keywords);
|
||||
$keywords = explode(',', $keywords);
|
||||
|
||||
$json_info['fn'] = $profile['name'];
|
||||
$json_info['photo'] = User::getAvatarUrlForId($profile['uid']);
|
||||
$json_info['fn'] = $owner['name'];
|
||||
$json_info['photo'] = User::getAvatarUrl($owner);
|
||||
$json_info['tags'] = $keywords;
|
||||
$json_info['language'] = $profile['language'];
|
||||
$json_info['language'] = $owner['language'];
|
||||
|
||||
if (!empty($profile['last-item'])) {
|
||||
$json_info['updated'] = date("c", strtotime($profile['last-item']));
|
||||
if (!empty($owner['last-item'])) {
|
||||
$json_info['updated'] = date("c", strtotime($owner['last-item']));
|
||||
}
|
||||
|
||||
if (!($profile['hide-friends'] ?? false)) {
|
||||
if (!($owner['hide-friends'] ?? false)) {
|
||||
$json_info['contacts'] = DBA::count('contact',
|
||||
[
|
||||
'uid' => $profile['uid'],
|
||||
'uid' => $owner['uid'],
|
||||
'self' => 0,
|
||||
'blocked' => 0,
|
||||
'pending' => 0,
|
||||
|
|
@ -103,13 +103,13 @@ class NoScrape extends BaseModule
|
|||
|
||||
// We display the last activity (post or login), reduced to year and week number
|
||||
$last_active = 0;
|
||||
$condition = ['uid' => $profile['uid'], 'self' => true];
|
||||
$condition = ['uid' => $owner['uid'], 'self' => true];
|
||||
$contact = DBA::selectFirst('contact', ['last-item'], $condition);
|
||||
if (DBA::isResult($contact)) {
|
||||
$last_active = strtotime($contact['last-item']);
|
||||
}
|
||||
|
||||
$condition = ['uid' => $profile['uid']];
|
||||
$condition = ['uid' => $owner['uid']];
|
||||
$user = DBA::selectFirst('user', ['login_date'], $condition);
|
||||
if (DBA::isResult($user)) {
|
||||
if ($last_active < strtotime($user['login_date'])) {
|
||||
|
|
@ -121,8 +121,8 @@ class NoScrape extends BaseModule
|
|||
//These are optional fields.
|
||||
$profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name', 'xmpp', 'matrix'];
|
||||
foreach ($profile_fields as $field) {
|
||||
if (!empty($profile[$field])) {
|
||||
$json_info["$field"] = $profile[$field];
|
||||
if (!empty($owner[$field])) {
|
||||
$json_info["$field"] = $owner[$field];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,15 +30,13 @@ use Friendica\Model\Photo as MPhoto;
|
|||
use Friendica\Model\Post;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Model\Storage\ExternalResource;
|
||||
use Friendica\Model\Storage\ReferenceStorageException;
|
||||
use Friendica\Model\Storage\StorageException;
|
||||
use Friendica\Model\Storage\SystemResource;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Network\HTTPException\NotFoundException;
|
||||
use Friendica\Util\Proxy;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Network\HTTPException;
|
||||
use Friendica\Object\Image;
|
||||
use Friendica\Util\Images;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\Proxy;
|
||||
|
||||
/**
|
||||
* Photo Module
|
||||
|
|
@ -75,19 +73,18 @@ class Photo extends BaseModule
|
|||
|
||||
$customsize = 0;
|
||||
$square_resize = true;
|
||||
$photo = false;
|
||||
$scale = null;
|
||||
$stamp = microtime(true);
|
||||
if (!empty($parameters['customsize'])) {
|
||||
$customsize = intval($parameters['customsize']);
|
||||
$uid = MPhoto::stripExtension($parameters['name']);
|
||||
$uid = pathinfo($parameters['name'], PATHINFO_FILENAME);
|
||||
$photo = self::getAvatar($uid, $parameters['type'], $customsize);
|
||||
$square_resize = !in_array($parameters['type'], ['media', 'preview']);
|
||||
} elseif (!empty($parameters['type'])) {
|
||||
$uid = MPhoto::stripExtension($parameters['name']);
|
||||
$uid = pathinfo($parameters['name'], PATHINFO_FILENAME);
|
||||
$photo = self::getAvatar($uid, $parameters['type'], Proxy::PIXEL_SMALL);
|
||||
} elseif (!empty($parameters['name'])) {
|
||||
$photoid = MPhoto::stripExtension($parameters['name']);
|
||||
$photoid = pathinfo($parameters['name'], PATHINFO_FILENAME);
|
||||
$scale = 0;
|
||||
if (substr($photoid, -2, 1) == "-") {
|
||||
$scale = intval(substr($photoid, -1, 1));
|
||||
|
|
@ -95,15 +92,14 @@ class Photo extends BaseModule
|
|||
}
|
||||
$photo = MPhoto::getPhoto($photoid, $scale);
|
||||
if ($photo === false) {
|
||||
throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
|
||||
throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
|
||||
}
|
||||
} else {
|
||||
throw new \Friendica\Network\HTTPException\BadRequestException();
|
||||
}
|
||||
|
||||
$fetch = microtime(true) - $stamp;
|
||||
|
||||
if ($photo === false) {
|
||||
throw new \Friendica\Network\HTTPException\NotFoundException();
|
||||
throw new HTTPException\NotFoundException();
|
||||
}
|
||||
|
||||
$cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
|
||||
|
|
@ -112,7 +108,7 @@ class Photo extends BaseModule
|
|||
|
||||
$imgdata = MPhoto::getImageDataForPhoto($photo);
|
||||
if (empty($imgdata)) {
|
||||
throw new NotFoundException();
|
||||
throw new HTTPException\NotFoundException();
|
||||
}
|
||||
|
||||
// The mimetype for an external or system resource can only be known reliably after it had been fetched
|
||||
|
|
@ -133,7 +129,7 @@ class Photo extends BaseModule
|
|||
} else {
|
||||
$error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
|
||||
}
|
||||
throw new \Friendica\Network\HTTPException\InternalServerErrorException($error);
|
||||
throw new HTTPException\InternalServerErrorException($error);
|
||||
}
|
||||
|
||||
// if customsize is set and image is not a gif, resize it
|
||||
|
|
@ -186,7 +182,7 @@ class Photo extends BaseModule
|
|||
exit();
|
||||
}
|
||||
|
||||
private static function getAvatar($uid, $type="avatar", $customsize)
|
||||
private static function getAvatar(int $uid, $type, $customsize)
|
||||
{
|
||||
switch($type) {
|
||||
case "preview":
|
||||
|
|
|
|||
|
|
@ -374,7 +374,7 @@ class Register extends BaseModule
|
|||
'source_mail' => $user['email'],
|
||||
'source_nick' => $user['nickname'],
|
||||
'source_link' => $base_url . '/admin/users/',
|
||||
'source_photo' => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_THUMB),
|
||||
'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
|
||||
'show_in_notification_page' => false
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ class Xrd extends BaseModule
|
|||
[
|
||||
'rel' => 'http://webfinger.net/rel/avatar',
|
||||
'type' => $avatar['type'],
|
||||
'href' => User::getAvatarUrlForId($owner['uid']),
|
||||
'href' => User::getAvatarUrl($owner),
|
||||
],
|
||||
[
|
||||
'rel' => 'http://joindiaspora.com/seed_location',
|
||||
|
|
@ -252,7 +252,7 @@ class Xrd extends BaseModule
|
|||
'$hcard_url' => $baseURL . '/hcard/' . $owner['nickname'],
|
||||
'$atom' => $owner['poll'],
|
||||
'$poco_url' => $owner['poco'],
|
||||
'$photo' => User::getAvatarUrlForId($owner['uid']),
|
||||
'$photo' => User::getAvatarUrl($owner),
|
||||
'$type' => $avatar['type'],
|
||||
'$salmon' => $baseURL . '/salmon/' . $owner['nickname'],
|
||||
'$salmen' => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue