Some work on ActivityModeration with notice deletion

[quix0rs-gnu-social.git] / plugins / Oembed / OembedPlugin.php

diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php
index c5343c7b4f7f7a5a85ef3cc8ea4ce34bd7984167..b5646ab6fc9c4bece6ce17bfe24d5b0de5630fcc 100644 (file)
--- a/plugins/Oembed/OembedPlugin.php
+++ b/plugins/Oembed/OembedPlugin.php
@@ -8,9 +8,10 @@ class OembedPlugin extends Plugin
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
     public $domain_whitelist = array(       // hostname => service provider
                                     '^i\d*\.ytimg\.com$' => 'YouTube',
+                                    '^i\d*\.vimeocdn\.com$' => 'Vimeo',
                                     );
     public $append_whitelist = array(); // fill this array as domain_whitelist to add more trusted sources
-    public $check_whitelist  = true;    // security/abuse precaution
+    public $check_whitelist  = false;    // security/abuse precaution
 
     protected $imgData = array();
 
@@ -98,8 +99,8 @@ class OembedPlugin extends Plugin
     {
         $fo = File_oembed::getKV('file_id', $file->id);
         if ($fo instanceof File_oembed) {
-            common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file $file_id", __FILE__);
-             return true;
+            common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file {$file->id}", __FILE__);
+            return true;
         }
 
         if (isset($redir_data['oembed']['json'])
@@ -172,16 +173,18 @@ class OembedPlugin extends Plugin
     
     public function onStartShowAttachmentRepresentation(HTMLOutputter $out, File $file)
     {
-        $oembed = File_oembed::getKV('file_id', $file->id);
-        if (empty($oembed->type)) {
+        try {
+            $oembed = File_oembed::getByFile($file);
+        } catch (NoResultException $e) {
             return true;
         }
+
         switch ($oembed->type) {
         case 'rich':
         case 'video':
         case 'link':
             if (!empty($oembed->html)
-                    && (StatusNet::isAjax() || common_config('attachments', 'show_html'))) {
+                    && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
                 require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
                 $config = array(
                     'safe'=>1,
@@ -208,14 +211,14 @@ class OembedPlugin extends Plugin
         }
 
         // All our remote Oembed images lack a local filename property in the File object
-        if ($file->filename !== null) {
+        if (!is_null($file->filename)) {
             return true;
         }
 
         try {
             // If we have proper oEmbed data, there should be an entry in the File_oembed
             // and File_thumbnail tables respectively. If not, we're not going to do anything.
-            $file_oembed = File_oembed::byFile($file);
+            $file_oembed = File_oembed::getByFile($file);
             $thumbnail   = File_thumbnail::byFile($file);
         } catch (Exception $e) {
             // Not Oembed data, or at least nothing we either can or want to use.
@@ -273,8 +276,8 @@ class OembedPlugin extends Plugin
             throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)'));
         }
 
-        // We'll trust sha256 not to have collision issues any time soon :)
-        $filename = hash('sha256', $imgData) . '.' . common_supported_mime_to_ext($info['mime']);
+        // We'll trust sha256 (File::FILEHASH_ALG) not to have collision issues any time soon :)
+        $filename = hash(File::FILEHASH_ALG, $imgData) . '.' . common_supported_mime_to_ext($info['mime']);
         $fullpath = File_thumbnail::path($filename);
         // Write the file to disk. Throw Exception on failure
         if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) {
@@ -288,10 +291,8 @@ class OembedPlugin extends Plugin
         $thumbnail->filename = $filename;
         $thumbnail->width = $info[0];    // array indexes documented on php.net:
         $thumbnail->height = $info[1];   // https://php.net/manual/en/function.getimagesize.php
-        if (!$thumbnail->update($orig)) {
-            unlink($fullpath);  // delete the file if database failed to write
-            throw new ServerException(_('Failed to update remotely downloaded file info in database.'));
-        }
+        // Throws exception on failure.
+        $thumbnail->updateWithKeys($orig, 'file_id');
     }
 
     public function onPluginVersion(array &$versions)