Use the existing VAPID key generation

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

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 30e666898777c5b4a9c245d5a31b611b9373b932..26369a3540f0f4c5153188c1430f32547a92ed80 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -841,13 +841,28 @@ class Photo
         * @throws \Exception
         */
        public static function isLocal($name)
+       {
+               return (bool)self::getIdForName($name);
+       }
+
+       /**
+        * Return the id of a local photo
+        *
+        * @param string $name Picture link
+        * @return int
+        */
+       public static function getIdForName($name)
        {
                $data = self::getResourceData($name);
                if (empty($data)) {
-                       return false;
+                       return 0;
                }
 
-               return DBA::exists('photo', ['resource-id' => $data['guid'], 'scale' => $data['scale']]);
+               $photo = DBA::selectFirst('photo', ['id'], ['resource-id' => $data['guid'], 'scale' => $data['scale']]);
+               if (!empty($photo['id'])) {
+                       return $photo['id'];
+               }
+               return 0;
        }
 
        /**