]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Merge pull request #11275 from MrPetovan/bug/11274-message-misdirected
[friendica.git] / src / Model / Contact.php
index f563244120af721f78d8ca8b5d8b4e901048f688..d80827c93f9e60c61467d284267c1d57ea4630b2 100644 (file)
@@ -685,7 +685,7 @@ class Contact
         */
        public static function updateSelfFromUserID($uid, $update_avatar = false)
        {
-               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
+               $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
                        'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
                        'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
@@ -757,6 +757,7 @@ class Contact
                $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
                $fields['unsearchable'] = !$profile['net-publish'];
+               $fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
 
                $update = false;
 
@@ -1457,34 +1458,11 @@ class Contact
         *
         * The function can be called with either the user or the contact array
         *
-        * @param array $contact contact or user array
+        * @param int $type type of contact or account
         * @return string
         */
-       public static function getAccountType(array $contact)
-       {
-               // There are several fields that indicate that the contact or user is a forum
-               // "page-flags" is a field in the user table,
-               // "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP.
-               if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY))
-                       || (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP))
-                       || (isset($contact['forum']) && intval($contact['forum']))
-                       || (isset($contact['prv']) && intval($contact['prv']))
-                       || (isset($contact['community']) && intval($contact['community']))
-               ) {
-                       $type = self::TYPE_COMMUNITY;
-               } else {
-                       $type = self::TYPE_PERSON;
-               }
-
-               // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
-               if (isset($contact["contact-type"])) {
-                       $type = $contact["contact-type"];
-               }
-
-               if (isset($contact["account-type"])) {
-                       $type = $contact["account-type"];
-               }
-
+       public static function getAccountType(int $type)
+       {
                switch ($type) {
                        case self::TYPE_ORGANISATION:
                                $account_type = DI::l10n()->t("Organisation");
@@ -1660,6 +1638,59 @@ class Contact
                return $contact;
        }
 
+       /**
+        * Fetch the default header for the given contact
+        *
+        * @param array $contact  contact array
+        * @return string avatar URL
+        */
+       public static function getDefaultHeader(array $contact): string
+       {
+               if (!empty($contact['header'])) {
+                       return $contact['header'];
+               }
+
+               if (!empty($contact['gsid'])) {
+                       // Use default banners for certain platforms
+                       $gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $contact['gsid']]);
+                       $platform = strtolower($gserver['platform'] ?? '');
+               } else {
+                       $platform = '';
+               }
+
+               switch ($platform) {
+                       case 'friendica':
+                       case 'friendika':
+                               /**
+                                * Picture credits
+                                * @author  Lostinlight <https://mastodon.xyz/@lightone>
+                                * @license CC0 https://creativecommons.org/share-your-work/public-domain/cc0/
+                                * @link    https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg
+                                */
+                               $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
+                                */
+                               $header = DI::baseUrl() . '/images/diaspora-banner.jpg';
+                               break;
+                       default:
+                               /**
+                                * Use a random picture. 
+                                * The service provides random pictures from Unsplash.
+                                * @license https://unsplash.com/license
+                                */
+                               $header = 'https://picsum.photos/seed/' . hash('ripemd128', $contact['url']) . '/960/300';
+                               break;
+               }
+
+               return $header;
+       }
+
        /**
         * Fetch the default avatar for the given contact and size
         *
@@ -1860,7 +1891,14 @@ class Contact
                        $avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
                }
 
-               if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+               $cache_avatar = DI::config()->get('system', 'cache_contact_avatar');
+
+               // Local contact avatars don't need to be cached
+               if ($cache_avatar && Network::isLocalLink($contact['url'])) {
+                       $cache_avatar = !DBA::exists('contact', ['nurl' => $contact['nurl'], 'self' => true]);
+               }
+
+               if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
                        if ($default_avatar && Proxy::isLocalImage($avatar)) {
                                $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
                                        'photo' => $avatar,
@@ -2106,7 +2144,7 @@ class Contact
                // These fields aren't updated by this routine:
                // 'sensitive'
 
-               $fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+               $fields = ['uid', 'uri-id', '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]);
@@ -2138,9 +2176,6 @@ class Contact
                $uriid = $contact['uri-id'];
                unset($contact['uri-id']);
 
-               $gsid = $contact['gsid'];
-               unset($contact['gsid']);
-
                $pubkey = $contact['pubkey'];
                unset($contact['pubkey']);
 
@@ -2228,30 +2263,6 @@ 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) {
@@ -2914,7 +2925,7 @@ class Contact
         */
        public static function isForum($contactid)
        {
-               $fields = ['forum', 'prv'];
+               $fields = ['contact-type'];
                $condition = ['id' => $contactid];
                $contact = DBA::selectFirst('contact', $fields, $condition);
                if (!DBA::isResult($contact)) {
@@ -2922,7 +2933,7 @@ class Contact
                }
 
                // Is it a forum?
-               return ($contact['forum'] || $contact['prv']);
+               return ($contact['contact-type'] == self::TYPE_COMMUNITY);
        }
 
        /**