utf8mb4 conversion on database with index adjusts

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 00a5216505a8171df20642e0c3c6b0b86fcb956f..d78dc66385d96236e9a14711a8dadecb16153c44 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -17,11 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-require_once INSTALLDIR.'/classes/File.php';
-require_once INSTALLDIR.'/classes/File_oembed.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Table Definition for file_redirection
@@ -33,7 +29,7 @@ class File_redirection extends Managed_DataObject
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'file_redirection';                // table name
-    public $url;                             // varchar(255)  primary_key not_null
+    public $url;                             // varchar(191)  primary_key not_null   not 255 because utf8mb4 takes more space
     public $file_id;                         // int(4)
     public $redirections;                    // int(4)
     public $httpcode;                        // int(4)
@@ -46,7 +42,7 @@ class File_redirection extends Managed_DataObject
     {
         return array(
             'fields' => array(
-                'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
+                'url' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
                 'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
                 'redirections' => array('type' => 'int', 'description' => 'redirect count'),
                 'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
@@ -251,7 +247,9 @@ class File_redirection extends Managed_DataObject
             $short_url = (string)$short_url;
             // store it
             $file = File::getKV('url', $long_url);
-            if (empty($file)) {
+            if ($file instanceof File) {
+                $file_id = $file->id;
+            } else {
                 // Check if the target URL is itself a redirect...
                 $redir_data = File_redirection::where($long_url);
                 if (is_array($redir_data)) {
@@ -259,9 +257,6 @@ class File_redirection extends Managed_DataObject
                     // Save file and embedding data about it!
                     $file = File::saveNew($redir_data, $long_url);
                     $file_id = $file->id;
-                    if (!empty($redir_data['oembed']['json'])) {
-                        File_oembed::saveNew($redir_data['oembed']['json'], $file_id);
-                    }
                 } else if (is_string($redir_data)) {
                     // The file is a known redirect target.
                     $file = File::getKV('url', $redir_data);
@@ -275,11 +270,9 @@ class File_redirection extends Managed_DataObject
                     }
                     $file_id = $file->id;
                 }
-            } else {
-                $file_id = $file->id;
             }
             $file_redir = File_redirection::getKV('url', $short_url);
-            if (empty($file_redir)) {
+            if (!$file_redir instanceof File_redirection) {
                 $file_redir = new File_redirection;
                 $file_redir->url = $short_url;
                 $file_redir->file_id = $file_id;