X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_oembed.php;h=b7bf3a5dae51d5db18ba259fd6f0a812c60e6faa;hb=6d5b6d98b5f68d784fee736518eaaae7a26a51f6;hp=a5540ecfee5de54f87b2c323feaba82f624c9e9b;hpb=65eeb7cba530e45b8d8a25644505619e8af63971;p=quix0rs-gnu-social.git

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index a5540ecfee..b7bf3a5dae 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -59,25 +59,15 @@ class File_oembed extends Memcached_DataObject
     }
 
     function _getOembed($url) {
-        require_once INSTALLDIR.'/extlib/Services/oEmbed.php';
         $parameters = array(
             'maxwidth' => common_config('attachments', 'thumb_width'),
             'maxheight' => common_config('attachments', 'thumb_height'),
         );
-        try{
-            $oEmbed = new Services_oEmbed($url);
-            $object = $oEmbed->getObject($parameters);
-            return $object;
-        }catch(Exception $e){
-            try{
-                $oEmbed = new Services_oEmbed($url, array(
-                    Services_oEmbed::OPTION_API => common_config('oohembed', 'endpoint')
-                ));
-                $object = $oEmbed->getObject($parameters);
-                return $object;
-            }catch(Exception $ex){
-                return false;
-            }
+        try {
+            return oEmbedHelper::getObject($url, $parameters);
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Error during oembed lookup for $url - " . $e->getMessage());
+            return false;
         }
     }
 
@@ -120,7 +110,7 @@ class File_oembed extends Memcached_DataObject
             }
         }
         $file_oembed->insert();
-        if (!empty($data->thumbnail_url)) {
+        if (!empty($data->thumbnail_url) || ($data->type == 'photo')) {
             $ft = File_thumbnail::staticGet('file_id', $file_id);
             if (!empty($ft)) {
                 common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id",