First support for user headers
This commit is contained in:
parent
2d326c8a27
commit
59358077c7
BIN
images/diaspora-banner.jpg
Normal file
BIN
images/diaspora-banner.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 83 KiB |
BIN
images/friendica-banner.jpg
Normal file
BIN
images/friendica-banner.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 91 KiB |
|
@ -687,7 +687,7 @@ class Contact
|
||||||
{
|
{
|
||||||
$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
|
$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
|
||||||
'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
|
'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
|
||||||
'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
|
'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
|
||||||
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
|
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
|
||||||
if (!DBA::isResult($self)) {
|
if (!DBA::isResult($self)) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -753,6 +753,7 @@ class Contact
|
||||||
}
|
}
|
||||||
|
|
||||||
$fields['avatar'] = User::getAvatarUrl($user);
|
$fields['avatar'] = User::getAvatarUrl($user);
|
||||||
|
$fields['header'] = User::getBannerUrl($user);
|
||||||
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
|
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
|
||||||
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
|
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
|
||||||
$fields['unsearchable'] = !$profile['net-publish'];
|
$fields['unsearchable'] = !$profile['net-publish'];
|
||||||
|
@ -2105,7 +2106,7 @@ class Contact
|
||||||
// These fields aren't updated by this routine:
|
// These fields aren't updated by this routine:
|
||||||
// 'sensitive'
|
// 'sensitive'
|
||||||
|
|
||||||
$fields = ['uid', 'uri-id', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
|
$fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
|
||||||
'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
|
'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
|
||||||
'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
|
'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
|
||||||
$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
|
$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
|
||||||
|
@ -2137,6 +2138,9 @@ class Contact
|
||||||
$uriid = $contact['uri-id'];
|
$uriid = $contact['uri-id'];
|
||||||
unset($contact['uri-id']);
|
unset($contact['uri-id']);
|
||||||
|
|
||||||
|
$gsid = $contact['gsid'];
|
||||||
|
unset($contact['gsid']);
|
||||||
|
|
||||||
$pubkey = $contact['pubkey'];
|
$pubkey = $contact['pubkey'];
|
||||||
unset($contact['pubkey']);
|
unset($contact['pubkey']);
|
||||||
|
|
||||||
|
@ -2224,6 +2228,30 @@ class Contact
|
||||||
self::updateAvatar($id, $ret['photo'], $update);
|
self::updateAvatar($id, $ret['photo'], $update);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (empty($ret['header']) && !empty($gsid)) {
|
||||||
|
$gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $gsid]);
|
||||||
|
switch (strtolower($gserver['platform'] ?? '')) {
|
||||||
|
case 'friendica':
|
||||||
|
case 'friendika':
|
||||||
|
/**
|
||||||
|
* Picture credits
|
||||||
|
* @author Lostinlight <https://gitlab.com/lostinlight>
|
||||||
|
* @link https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
|
||||||
|
*/
|
||||||
|
$ret['header'] = DI::baseUrl() . '/images/friendica-banner.jpg';
|
||||||
|
break;
|
||||||
|
case 'diaspora':
|
||||||
|
/**
|
||||||
|
* Picture credits
|
||||||
|
* @author John Liu <https://www.flickr.com/photos/8047705@N02/>
|
||||||
|
* @license CC BY 2.0 https://creativecommons.org/licenses/by/2.0/
|
||||||
|
* @link https://www.flickr.com/photos/8047705@N02/5572197407
|
||||||
|
*/
|
||||||
|
$ret['header'] = DI::baseUrl() . '/images/diaspora-banner.jpg';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
|
$uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
|
||||||
|
|
||||||
if (!$update) {
|
if (!$update) {
|
||||||
|
|
|
@ -634,6 +634,7 @@ class Photo
|
||||||
$sql_extra = Security::getPermissionsSQLByUserId($uid);
|
$sql_extra = Security::getPermissionsSQLByUserId($uid);
|
||||||
|
|
||||||
$avatar_type = (local_user() && (local_user() == $uid)) ? self::USER_AVATAR : self::DEFAULT;
|
$avatar_type = (local_user() && (local_user() == $uid)) ? self::USER_AVATAR : self::DEFAULT;
|
||||||
|
$banner_type = (local_user() && (local_user() == $uid)) ? self::USER_BANNER : self::DEFAULT;
|
||||||
|
|
||||||
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
|
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
|
||||||
$albums = DI::cache()->get($key);
|
$albums = DI::cache()->get($key);
|
||||||
|
@ -643,19 +644,21 @@ class Photo
|
||||||
// At this time we just store the data in the cache
|
// At this time we just store the data in the cache
|
||||||
$albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
|
$albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
|
||||||
FROM `photo`
|
FROM `photo`
|
||||||
WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra
|
WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra
|
||||||
GROUP BY `album` ORDER BY `created` DESC",
|
GROUP BY `album` ORDER BY `created` DESC",
|
||||||
$uid,
|
$uid,
|
||||||
self::DEFAULT,
|
self::DEFAULT,
|
||||||
|
$banner_type,
|
||||||
$avatar_type
|
$avatar_type
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
// This query doesn't do the count and is much faster
|
// This query doesn't do the count and is much faster
|
||||||
$albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
|
$albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
|
||||||
FROM `photo` USE INDEX (`uid_album_scale_created`)
|
FROM `photo` USE INDEX (`uid_album_scale_created`)
|
||||||
WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra",
|
WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra",
|
||||||
$uid,
|
$uid,
|
||||||
self::DEFAULT,
|
self::DEFAULT,
|
||||||
|
$banner_type,
|
||||||
$avatar_type
|
$avatar_type
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
@ -871,6 +874,69 @@ class Photo
|
||||||
return DBA::exists('photo', ['resource-id' => $guid]);
|
return DBA::exists('photo', ['resource-id' => $guid]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static function fitImageSize($Image)
|
||||||
|
{
|
||||||
|
$max_length = DI::config()->get('system', 'max_image_length');
|
||||||
|
if ($max_length > 0) {
|
||||||
|
$Image->scaleDown($max_length);
|
||||||
|
Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filesize = strlen($Image->asString());
|
||||||
|
$width = $Image->getWidth();
|
||||||
|
$height = $Image->getHeight();
|
||||||
|
|
||||||
|
$maximagesize = DI::config()->get('system', 'maximagesize');
|
||||||
|
|
||||||
|
if (!empty($maximagesize) && ($filesize > $maximagesize)) {
|
||||||
|
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
|
||||||
|
foreach ([5120, 2560, 1280, 640] as $pixels) {
|
||||||
|
if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {
|
||||||
|
Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
|
||||||
|
$Image->scaleDown($pixels);
|
||||||
|
$filesize = strlen($Image->asString());
|
||||||
|
$width = $Image->getWidth();
|
||||||
|
$height = $Image->getHeight();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($filesize > $maximagesize) {
|
||||||
|
Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $Image;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function loadImageFromURL(string $image_url)
|
||||||
|
{
|
||||||
|
$filename = basename($image_url);
|
||||||
|
if (!empty($image_url)) {
|
||||||
|
$ret = DI::httpClient()->get($image_url);
|
||||||
|
$img_str = $ret->getBody();
|
||||||
|
$type = $ret->getContentType();
|
||||||
|
} else {
|
||||||
|
$img_str = '';
|
||||||
|
$type = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($img_str)) {
|
||||||
|
Logger::notice('Empty content');
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$type = Images::getMimeTypeByData($img_str, $image_url, $type);
|
||||||
|
|
||||||
|
$Image = new Image($img_str, $type);
|
||||||
|
|
||||||
|
$Image = self::fitImageSize($Image);
|
||||||
|
if (empty($Image)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['image' => $Image, 'filename' => $filename];
|
||||||
|
}
|
||||||
|
|
||||||
private static function uploadImage(array $files)
|
private static function uploadImage(array $files)
|
||||||
{
|
{
|
||||||
Logger::info('starting new upload');
|
Logger::info('starting new upload');
|
||||||
|
@ -939,37 +1005,12 @@ class Photo
|
||||||
$Image->orient($src);
|
$Image->orient($src);
|
||||||
@unlink($src);
|
@unlink($src);
|
||||||
|
|
||||||
$max_length = DI::config()->get('system', 'max_image_length');
|
$Image = self::fitImageSize($Image);
|
||||||
if ($max_length > 0) {
|
if (empty($Image)) {
|
||||||
$Image->scaleDown($max_length);
|
return [];
|
||||||
$filesize = strlen($Image->asString());
|
|
||||||
Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$width = $Image->getWidth();
|
return ['image' => $Image, 'filename' => $filename];
|
||||||
$height = $Image->getHeight();
|
|
||||||
|
|
||||||
$maximagesize = DI::config()->get('system', 'maximagesize');
|
|
||||||
|
|
||||||
if (!empty($maximagesize) && ($filesize > $maximagesize)) {
|
|
||||||
// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
|
|
||||||
foreach ([5120, 2560, 1280, 640] as $pixels) {
|
|
||||||
if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {
|
|
||||||
Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]);
|
|
||||||
$Image->scaleDown($pixels);
|
|
||||||
$filesize = strlen($Image->asString());
|
|
||||||
$width = $Image->getWidth();
|
|
||||||
$height = $Image->getHeight();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($filesize > $maximagesize) {
|
|
||||||
@unlink($src);
|
|
||||||
Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ['image' => $Image, 'filename' => $filename, 'width' => $width, 'height' => $height];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -994,8 +1035,8 @@ class Photo
|
||||||
|
|
||||||
$Image = $data['image'];
|
$Image = $data['image'];
|
||||||
$filename = $data['filename'];
|
$filename = $data['filename'];
|
||||||
$width = $data['width'];
|
$width = $Image->getWidth();
|
||||||
$height = $data['height'];
|
$height = $Image->getHeight();
|
||||||
|
|
||||||
$resource_id = $resource_id ?: self::newResource();
|
$resource_id = $resource_id ?: self::newResource();
|
||||||
$album = $album ?: DI::l10n()->t('Wall Photos');
|
$album = $album ?: DI::l10n()->t('Wall Photos');
|
||||||
|
@ -1053,22 +1094,36 @@ class Photo
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Upload a user avatar
|
||||||
*
|
*
|
||||||
* @param int $uid User ID
|
* @param int $uid User ID
|
||||||
* @param array $files uploaded file array
|
* @param array $files uploaded file array
|
||||||
|
* @param string $url External image url
|
||||||
* @return string avatar resource
|
* @return string avatar resource
|
||||||
*/
|
*/
|
||||||
public static function uploadAvatar(int $uid, array $files): string
|
public static function uploadAvatar(int $uid, array $files, string $url = ''): string
|
||||||
{
|
{
|
||||||
$data = self::uploadImage($files);
|
if (!empty($files)) {
|
||||||
if (empty($data)) {
|
$data = self::uploadImage($files);
|
||||||
|
if (empty($data)) {
|
||||||
|
Logger::info('upload failed');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
} elseif (!empty($url)) {
|
||||||
|
$data = self::loadImageFromURL($url);
|
||||||
|
if (empty($data)) {
|
||||||
|
Logger::info('loading from external url failed');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Logger::info('Neither files nor url provided');
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$Image = $data['image'];
|
$Image = $data['image'];
|
||||||
$filename = $data['filename'];
|
$filename = $data['filename'];
|
||||||
$width = $data['width'];
|
$width = $Image->getWidth();
|
||||||
$height = $data['height'];
|
$height = $Image->getHeight();
|
||||||
|
|
||||||
$resource_id = self::newResource();
|
$resource_id = self::newResource();
|
||||||
$album = DI::l10n()->t(self::PROFILE_PHOTOS);
|
$album = DI::l10n()->t(self::PROFILE_PHOTOS);
|
||||||
|
@ -1117,23 +1172,36 @@ class Photo
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Upload a user banner
|
||||||
*
|
*
|
||||||
* @param int $uid User ID
|
* @param int $uid User ID
|
||||||
* @param array $files uploaded file array
|
* @param array $files uploaded file array
|
||||||
|
* @param string $url External image url
|
||||||
* @return string avatar resource
|
* @return string avatar resource
|
||||||
*/
|
*/
|
||||||
public static function uploadBanner(int $uid, array $files): string
|
public static function uploadBanner(int $uid, array $files = [], string $url = ''): string
|
||||||
{
|
{
|
||||||
$data = self::uploadImage($files);
|
if (!empty($files)) {
|
||||||
if (empty($data)) {
|
$data = self::uploadImage($files);
|
||||||
Logger::info('upload failed');
|
if (empty($data)) {
|
||||||
|
Logger::info('upload failed');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
} elseif (!empty($url)) {
|
||||||
|
$data = self::loadImageFromURL($url);
|
||||||
|
if (empty($data)) {
|
||||||
|
Logger::info('loading from external url failed');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Logger::info('Neither files nor url provided');
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$Image = $data['image'];
|
$Image = $data['image'];
|
||||||
$filename = $data['filename'];
|
$filename = $data['filename'];
|
||||||
$width = $data['width'];
|
$width = $Image->getWidth();
|
||||||
$height = $data['height'];
|
$height = $Image->getHeight();
|
||||||
|
|
||||||
$resource_id = self::newResource();
|
$resource_id = self::newResource();
|
||||||
$album = DI::l10n()->t(self::BANNER_PHOTOS);
|
$album = DI::l10n()->t(self::BANNER_PHOTOS);
|
||||||
|
|
|
@ -865,6 +865,36 @@ class User
|
||||||
return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
|
return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get banner link for given user
|
||||||
|
*
|
||||||
|
* @param array $user
|
||||||
|
* @return string banner link
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public static function getBannerUrl(array $user):string
|
||||||
|
{
|
||||||
|
if (empty($user['nickname'])) {
|
||||||
|
DI::logger()->warning('Missing user nickname key', ['trace' => System::callstack(20)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$url = DI::baseUrl() . '/photo/banner/';
|
||||||
|
|
||||||
|
$updated = '';
|
||||||
|
$imagetype = IMAGETYPE_JPEG;
|
||||||
|
|
||||||
|
$photo = Photo::selectFirst(['type', 'created', 'edited', 'updated'], ["scale" => 3, 'uid' => $user['uid'], 'photo-type' => Photo::USER_BANNER]);
|
||||||
|
if (!empty($photo)) {
|
||||||
|
$updated = max($photo['created'], $photo['edited'], $photo['updated']);
|
||||||
|
|
||||||
|
if (in_array($photo['type'], ['image/png', 'image/gif'])) {
|
||||||
|
$imagetype = IMAGETYPE_PNG;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $url . $user['nickname'] . image_type_to_extension($imagetype) . ($updated ? '?ts=' . strtotime($updated) : '');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Catch-all user creation function
|
* Catch-all user creation function
|
||||||
*
|
*
|
||||||
|
|
|
@ -323,6 +323,12 @@ class Photo extends BaseModule
|
||||||
$url = DI::baseUrl() . '/images/blank.png';
|
$url = DI::baseUrl() . '/images/blank.png';
|
||||||
}
|
}
|
||||||
return MPhoto::createPhotoForExternalResource($url);
|
return MPhoto::createPhotoForExternalResource($url);
|
||||||
|
case "banner":
|
||||||
|
$photo = MPhoto::selectFirst([], ["scale" => 3, 'uid' => $id, 'photo-type' => MPhoto::USER_BANNER]);
|
||||||
|
if (!empty($photo)) {
|
||||||
|
return $photo;
|
||||||
|
}
|
||||||
|
return MPhoto::createPhotoForExternalResource(DI::baseUrl() . '/images/friendica-banner.jpg');
|
||||||
case "profile":
|
case "profile":
|
||||||
case "custom":
|
case "custom":
|
||||||
$scale = 4;
|
$scale = 4;
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
|
||||||
if (!defined('DB_UPDATE_VERSION')) {
|
if (!defined('DB_UPDATE_VERSION')) {
|
||||||
define('DB_UPDATE_VERSION', 1448);
|
define('DB_UPDATE_VERSION', 1449);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
13
update.php
13
update.php
|
@ -1087,3 +1087,16 @@ function update_1446()
|
||||||
|
|
||||||
return Update::SUCCESS;
|
return Update::SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function update_1449()
|
||||||
|
{
|
||||||
|
$users = DBA::select('user', ['uid']);
|
||||||
|
while ($user = DBA::fetch($users)) {
|
||||||
|
if (Contact::updateSelfFromUserID($user['uid'])) {
|
||||||
|
Profile::publishUpdate($user['uid']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DBA::close($users);
|
||||||
|
|
||||||
|
return Update::SUCCESS;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue