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

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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 226a6f651218783abd57322ac88ffcf3dfa55feb..d082d02c1b1143afec3426480b80aec529948f72 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -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;
@@ -1253,6 +1254,9 @@ class Item extends BaseObject
                $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);
 
@@ -1565,6 +1569,9 @@ class Item extends BaseObject
                        }
                }
 
+               $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)) {