Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 12:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace uri fields conditions by gravity condition in Model\Item::insert

Browse source
This commit is contained in:
Hypolite Petovan 2020-11-11 10:07:39 -05:00
parent ffc364f2a4
commit 355cd401ae
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Item.php
View file

@ -1576,7 +1576,7 @@ class Item
$uid = intval($item['uid']); $uid = intval($item['uid']);
$item['guid'] = self::guid($item, $notify); $item['guid'] = self::guid($item, $notify);
$item['uri'] = substr(Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))), 0, 255); $item['uri'] = substr(trim($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']), 0, 255);
// Store URI data // Store URI data
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
@ -1685,7 +1685,7 @@ class Item
return 0; return 0;
} }
if ($item['thr-parent'] != $item['uri']) { if ($item['gravity'] !== GRAVITY_PARENT) {
$toplevel_parent = self::getTopLevelParent($item); $toplevel_parent = self::getTopLevelParent($item);
if (empty($toplevel_parent)) { if (empty($toplevel_parent)) {
return 0; return 0;
@ -1917,7 +1917,7 @@ class Item
Logger::notice('created item', ['id' => $current_post, 'uid' => $item['uid'], 'network' => $item['network'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); Logger::notice('created item', ['id' => $current_post, 'uid' => $item['uid'], 'network' => $item['network'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
if (!$parent_id || ($item['parent-uri'] === $item['uri'])) { if (!$parent_id || ($item['gravity'] === GRAVITY_PARENT)) {
$parent_id = $current_post; $parent_id = $current_post;
} }
@ -1942,7 +1942,7 @@ class Item
DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} }
if ($item['parent-uri'] === $item['uri']) { if ($item['gravity'] === GRAVITY_PARENT) {
self::addThread($current_post); self::addThread($current_post);
} else { } else {
self::updateThread($parent_id); self::updateThread($parent_id);
@ -1970,7 +1970,7 @@ class Item
} }
} }
if ($item['parent-uri'] === $item['uri']) { if ($item['gravity'] === GRAVITY_PARENT) {
self::addShadow($current_post); self::addShadow($current_post);
} else { } else {
self::addShadowPost($current_post); self::addShadowPost($current_post);