Merge pull request #5561 from MrPetovan/bug/4584-fix-twitter-gif-still-image

Restore source storing for Twitter conversations

diff --combined boot.php
index b8149684c3bd8ae202be56dd7fb3fab416614475,1cdc01ddf0d2c1ad11fdf7486320cb412c28e80e..d5ada81354e5701d8ab583e9dd13ffb206e11aac
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -41,7 -41,7 +41,7 @@@ define('FRIENDICA_PLATFORM',     'Frien
  define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
  define('FRIENDICA_VERSION',      '2018.08-dev');
  define('DFRN_PROTOCOL_VERSION',  '2.23');
 -define('DB_UPDATE_VERSION',      1280);
 +define('DB_UPDATE_VERSION',      1281);
  define('NEW_UPDATE_ROUTINE_VERSION', 1170);
  
  /**
@@@ -179,25 -179,6 +179,6 @@@ define('CP_USERS_AND_GLOBAL',       2)
   * @}
   */
  
- /**
-  * @name Protocols
-  * @deprecated since version 3.6
-  * @see Conversation
-  *
-  * Different protocols that we are storing
-  * @{
-  */
- define('PROTOCOL_UNKNOWN'        , Conversation::PROTOCOL_UNKNOWN);
- define('PROTOCOL_DFRN'           , Conversation::PROTOCOL_DFRN);
- define('PROTOCOL_DIASPORA'       , Conversation::PROTOCOL_DIASPORA);
- define('PROTOCOL_OSTATUS_SALMON' , Conversation::PROTOCOL_OSTATUS_SALMON);
- define('PROTOCOL_OSTATUS_FEED'   , Conversation::PROTOCOL_OSTATUS_FEED);    // Deprecated
- define('PROTOCOL_GS_CONVERSATION', Conversation::PROTOCOL_GS_CONVERSATION); // Deprecated
- define('PROTOCOL_SPLITTED_CONV'  , Conversation::PROTOCOL_SPLITTED_CONV);
- /**
-  * @}
-  */
- 
  /**
   * @name Network constants
   * @deprecated since version 3.6

diff --combined src/Model/Item.php
index 84c51a2bf0d4e8bdce3f9f2e68b892181703617b,226a6f651218783abd57322ac88ffcf3dfa55feb..d082d02c1b1143afec3426480b80aec529948f72
--- 1/src/Model/Item.php
--- 2/src/Model/Item.php
+++ b/src/Model/Item.php
@@@ -17,7 -17,6 +17,7 @@@ use Friendica\Core\Worker
  use Friendica\Database\DBA;
  use Friendica\Model\Contact;
  use Friendica\Model\PermissionSet;
 +use Friendica\Model\ItemURI;
  use Friendica\Object\Image;
  use Friendica\Protocol\Diaspora;
  use Friendica\Protocol\OStatus;
@@@ -1240,7 -1239,7 +1240,7 @@@ class Item extends BaseObjec
                        $item['wall'] = 1;
                        $item['origin'] = 1;
                        $item['network'] = NETWORK_DFRN;
-                       $item['protocol'] = PROTOCOL_DFRN;
+                       $item['protocol'] = Conversation::PARCEL_DFRN;
  
                        if (is_int($notify)) {
                                $priority = $notify;
@@@ -1254,9 -1253,6 +1254,9 @@@
                $item['guid'] = self::guid($item, $notify);
                $item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
  
 +              // Store URI data
 +              $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
 +
                // Store conversation data
                $item = Conversation::insert($item);
  
@@@ -1569,9 -1565,6 +1569,9 @@@
                        }
                }
  
 +              $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
 +              $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
 +
                $condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
                        $item['uri'], $item['network'], NETWORK_DFRN, $item['uid']];
                if (self::exists($condition)) {