Merge pull request #8117 from annando/inbox

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 10cf4bf34169846991e31b85bb8a7c50947e327a..e6c00b1e3c6e1fa518d6cb86a154d55153f8edef 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1896,6 +1896,14 @@ class Contact
                        $data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
                }
 
+               foreach ($data as $image_uri) {
+                       $image_rid = Photo::ridFromURI($image_uri);
+                       if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+                               Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+                               $force = true;
+                       }
+               }
+
                if (($contact["avatar"] != $avatar) || $force) {
                        $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
@@ -2682,26 +2690,23 @@ class Contact
         * Remove the unavailable contact ids from the provided list
         *
         * @param array $contact_ids Contact id list
+        * @return array
         * @throws \Exception
         */
-       public static function pruneUnavailable(array &$contact_ids)
+       public static function pruneUnavailable(array $contact_ids)
        {
                if (empty($contact_ids)) {
-                       return;
-               }
-
-               $str = DBA::escape(implode(',', $contact_ids));
-
-               $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
-
-               $return = [];
-               while($contact = DBA::fetch($stmt)) {
-                       $return[] = $contact['id'];
+                       return [];
                }
 
-               DBA::close($stmt);
+               $contacts = Contact::selectToArray(['id'], [
+                       'id'      => $contact_ids,
+                       'blocked' => false,
+                       'pending' => false,
+                       'archive' => false,
+               ]);
 
-               $contact_ids = $return;
+               return array_column($contacts, 'id');
        }
 
        /**