First support for user headers

diff --git a/images/diaspora-banner.jpg b/images/diaspora-banner.jpg
new file mode 100644 (file)
index 0000000..b0df6a2
Binary files /dev/null and b/images/diaspora-banner.jpg differ

diff --git a/images/friendica-banner.jpg b/images/friendica-banner.jpg
new file mode 100644 (file)
index 0000000..8b1d0fb
Binary files /dev/null and b/images/friendica-banner.jpg differ

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index ee905a80d38afc99b75a004d8fea779e6fa4b6b5..f563244120af721f78d8ca8b5d8b4e901048f688 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -687,7 +687,7 @@ class Contact
        {
                $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
                        '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]);
                if (!DBA::isResult($self)) {
                        return false;
@@ -753,6 +753,7 @@ class Contact
                }
 
                $fields['avatar'] = User::getAvatarUrl($user);
+               $fields['header'] = User::getBannerUrl($user);
                $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
                $fields['unsearchable'] = !$profile['net-publish'];
@@ -2105,7 +2106,7 @@ class Contact
                // These fields aren't updated by this routine:
                // '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',
                        'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
                $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
@@ -2137,6 +2138,9 @@ class Contact
                $uriid = $contact['uri-id'];
                unset($contact['uri-id']);
 
+               $gsid = $contact['gsid'];
+               unset($contact['gsid']);
+
                $pubkey = $contact['pubkey'];
                unset($contact['pubkey']);
 
@@ -2224,6 +2228,30 @@ class Contact
                        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]);
 
                if (!$update) {

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 2edca93870806066742d40ddd14c23573f4238f2..d43c2805d2cdf0ba49aadf1ceeb343e705bde277 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -634,6 +634,7 @@ class Photo
                $sql_extra = Security::getPermissionsSQLByUserId($uid);
 
                $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();
                $albums = DI::cache()->get($key);
@@ -643,19 +644,21 @@ class Photo
                                // 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`
                                        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",
                                        $uid,
                                        self::DEFAULT,
+                                       $banner_type,
                                        $avatar_type
                                ));
                        } else {
                                // This query doesn't do the count and is much faster
                                $albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
                                        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,
                                        self::DEFAULT,
+                                       $banner_type,
                                        $avatar_type
                                ));
                        }
@@ -871,6 +874,69 @@ class Photo
                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)
        {
                Logger::info('starting new upload');
@@ -939,37 +1005,12 @@ class Photo
                $Image->orient($src);
                @unlink($src);
 
-               $max_length = DI::config()->get('system', 'max_image_length');
-               if ($max_length > 0) {
-                       $Image->scaleDown($max_length);
-                       $filesize = strlen($Image->asString());
-                       Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]);
-               }
-
-               $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) {
-                               @unlink($src);
-                               Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
-                               return [];
-                       }
+               $Image = self::fitImageSize($Image);
+               if (empty($Image)) {
+                       return [];
                }
 
-               return ['image' => $Image, 'filename' => $filename, 'width' => $width, 'height' => $height];
+               return ['image' => $Image, 'filename' => $filename];
        }
 
        /**
@@ -994,8 +1035,8 @@ class Photo
 
                $Image    = $data['image'];
                $filename = $data['filename'];
-               $width    = $data['width'];
-               $height   = $data['height'];
+               $width    = $Image->getWidth();
+               $height   = $Image->getHeight();
 
                $resource_id = $resource_id ?: self::newResource();
                $album       = $album ?: DI::l10n()->t('Wall Photos');
@@ -1053,22 +1094,36 @@ class Photo
        }
 
        /**
+        * Upload a user avatar
         *
-        * @param int   $uid   User ID
-        * @param array $files uploaded file array
+        * @param int    $uid   User ID
+        * @param array  $files uploaded file array
+        * @param string $url   External image url
         * @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($data)) {
+               if (!empty($files)) {
+                       $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 '';
                }
 
                $Image    = $data['image'];
                $filename = $data['filename'];
-               $width    = $data['width'];
-               $height   = $data['height'];
+               $width    = $Image->getWidth();
+               $height   = $Image->getHeight();
 
                $resource_id = self::newResource();
                $album       = DI::l10n()->t(self::PROFILE_PHOTOS);
@@ -1117,23 +1172,36 @@ class Photo
        }
 
        /**
+        * Upload a user banner
         *
-        * @param int   $uid   User ID
-        * @param array $files uploaded file array
+        * @param int    $uid   User ID
+        * @param array  $files uploaded file array
+        * @param string $url   External image url
         * @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($data)) {
-                       Logger::info('upload failed');
+               if (!empty($files)) {
+                       $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 '';
                }
 
                $Image    = $data['image'];
                $filename = $data['filename'];
-               $width    = $data['width'];
-               $height   = $data['height'];
+               $width    = $Image->getWidth();
+               $height   = $Image->getHeight();
 
                $resource_id = self::newResource();
                $album       = DI::l10n()->t(self::BANNER_PHOTOS);

diff --git a/src/Model/User.php b/src/Model/User.php
index c8e9a61f17339ce59a22248b08de62cbe9028cc8..ccc9261fd22e4168c99acaa01d17cd4bd92f4dae 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -865,6 +865,36 @@ class User
                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
         *

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index a92568015ca72042361bb64425f90ba330feb578..a863a8847536f1b6984d659486ab7a57bfced747 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -323,6 +323,12 @@ class Photo extends BaseModule
                                        $url = DI::baseUrl() . '/images/blank.png';
                                }
                                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 "custom":
                                $scale = 4;

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index ca52dace8b0a29441701a4da9c31fd4354fa009f..39481348e215184486f0db3bccddea538fea2266 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1448);
+       define('DB_UPDATE_VERSION', 1449);
 }
 
 return [

diff --git a/update.php b/update.php
index 7b5f6778be7df92807978de0e88126016fa10e9f..ed5962cf1f1e8230359a8b8df5586df6fe624b71 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1087,3 +1087,16 @@ function update_1446()
 
        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;
+}