Merge pull request #10446 from MrPetovan/bug/10439-addon-settings-forms

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f0d1c62bd93d38a8302e383d3aa1fed6fbf4ba0d..60213cacb51751f232c9b3067ef5b16b5317baa1 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1502,14 +1502,14 @@ class Contact
                if (!empty($contact)) {
                        $contact = self::checkAvatarCacheByArray($contact, $no_update);
                        if (!empty($contact[$field])) {
-                               $avatar = $contact[$field];
+                               return $contact[$field];
+                       } elseif (!empty($contact['id'])) {
+                               return self::getAvatarUrlForId($contact['id'], $size, $contact['updated'] ?? '');
+                       } elseif (!empty($contact['avatar'])) {
+                               $avatar = $contact['avatar'];
                        }
                }
 
-               if ($no_update && empty($avatar) && !empty($contact['avatar'])) {
-                       $avatar = $contact['avatar'];
-               }
-
                if (empty($avatar)) {
                        $avatar = self::getDefaultAvatar([], $size);
                }
@@ -1614,7 +1614,7 @@ class Contact
         *
         * @param array $contact  contact array
         * @param string $size    Size of the avatar picture
-        * @return void
+        * @return string avatar URL
         */
        public static function getDefaultAvatar(array $contact, string $size)
        {
@@ -1662,6 +1662,99 @@ class Contact
                return DI::baseUrl() . $default;
        }
 
+       /**
+        * Get avatar link for given contact id
+        *
+        * @param integer $cid     contact id
+        * @param string  $size    One of the ProxyUtils::SIZE_* constants
+        * @param string  $updated Contact update date
+        * @return string avatar link
+        */
+       public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = ''):string
+       {
+               // We have to fetch the "updated" variable when it wasn't provided
+               // The parameter can be provided to improve performance
+               if (empty($updated)) {
+                       $contact = self::getById($cid, ['updated']);
+                       $updated = $contact['updated'] ?? '';
+               }
+
+               $url = DI::baseUrl() . '/photo/contact/';
+               switch ($size) {
+                       case Proxy::SIZE_MICRO:
+                               $url .= Proxy::PIXEL_MICRO . '/';
+                               break;
+                       case Proxy::SIZE_THUMB:
+                               $url .= Proxy::PIXEL_THUMB . '/';
+                               break;
+                       case Proxy::SIZE_SMALL:
+                               $url .= Proxy::PIXEL_SMALL . '/';
+                               break;
+                       case Proxy::SIZE_MEDIUM:
+                               $url .= Proxy::PIXEL_MEDIUM . '/';
+                               break;
+                       case Proxy::SIZE_LARGE:
+                               $url .= Proxy::PIXEL_LARGE . '/';
+                               break;
+               }
+               return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+       }
+
+       /**
+        * Get avatar link for given contact URL
+        *
+        * @param string  $url  contact url
+        * @param integer $uid  user id
+        * @param string  $size One of the ProxyUtils::SIZE_* constants
+        * @return string avatar link
+        */
+       public static function getAvatarUrlForUrl(string $url, int $uid, string $size = ''):string
+       {
+               $condition = ["`nurl` = ? AND ((`uid` = ? AND `network` IN (?, ?)) OR `uid` = ?)",
+                       Strings::normaliseLink($url), $uid, Protocol::FEED, Protocol::MAIL, 0];
+               $contact = self::selectFirst(['id', 'updated'], $condition);
+               return self::getAvatarUrlForId($contact['id'] ?? 0, $size, $contact['updated']);
+       }
+
+       /**
+        * Get header link for given contact id
+        *
+        * @param integer $cid     contact id
+        * @param string  $size    One of the ProxyUtils::SIZE_* constants
+        * @param string  $updated Contact update date
+        * @return string header link
+        */
+       public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = ''):string
+       {
+               // We have to fetch the "updated" variable when it wasn't provided
+               // The parameter can be provided to improve performance
+               if (empty($updated)) {
+                       $contact = self::getById($cid, ['updated']);
+                       $updated = $contact['updated'] ?? '';
+               }
+
+               $url = DI::baseUrl() . '/photo/header/';
+               switch ($size) {
+                       case Proxy::SIZE_MICRO:
+                               $url .= Proxy::PIXEL_MICRO . '/';
+                               break;
+                       case Proxy::SIZE_THUMB:
+                               $url .= Proxy::PIXEL_THUMB . '/';
+                               break;
+                       case Proxy::SIZE_SMALL:
+                               $url .= Proxy::PIXEL_SMALL . '/';
+                               break;
+                       case Proxy::SIZE_MEDIUM:
+                               $url .= Proxy::PIXEL_MEDIUM . '/';
+                               break;
+                       case Proxy::SIZE_LARGE:
+                               $url .= Proxy::PIXEL_LARGE . '/';
+                               break;
+               }
+
+               return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+       }
+
        /**
         * Updates the avatar links in a contact only if needed
         *