"parent = id" is replaced with gravity check

diff --git a/include/api.php b/include/api.php
index f1a8e5ee94acf7ef8e2f07f489bd816bb6011dd4..90d0a511b7d772149e43fff732482d10670bc72e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1647,7 +1647,8 @@ function api_statuses_home_timeline($type)
                $condition[] = $max_id;
        }
        if ($exclude_replies) {
-               $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
+               $condition[0] .= ' AND `item`.`gravity` = ?';
+               $condition[] = GRAVITY_PARENT;
        }
        if ($conversation_id > 0) {
                $condition[0] .= " AND `item`.`parent` = ?";
@@ -2255,7 +2256,8 @@ function api_statuses_user_timeline($type)
        }
 
        if ($exclude_replies) {
-               $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
+               $condition[0] .= ' AND `item`.`gravity` = ?';
+               $condition[] = GRAVITY_PARENT;
        }
 
        if ($conversation_id > 0) {
@@ -3305,7 +3307,8 @@ function api_lists_statuses($type)
                $condition[] = $max_id;
        }
        if ($exclude_replies > 0) {
-               $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
+               $condition[0] .= ' AND `item`.`gravity` = ?';
+               $condition[] = GRAVITY_PARENT;
        }
        if ($conversation_id > 0) {
                $condition[0] .= " AND `item`.`parent` = ?";
@@ -5199,7 +5202,7 @@ function api_in_reply_to($item)
        $in_reply_to['user_id_str'] = null;
        $in_reply_to['screen_name'] = null;
 
-       if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
+       if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] != GRAVITY_PARENT)) {
                $parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
                if (DBA::isResult($parent)) {
                        $in_reply_to['status_id'] = intval($parent['id']);

diff --git a/include/conversation.php b/include/conversation.php
index 1f597756f457a401f151c88f5a31aab754100ec6..6fdfd30b466502e2070968a7f1c3acfce22be7cf 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -823,7 +823,7 @@ function item_photo_menu($item) {
        $block_link = '';
        $ignore_link = '';
 
-       if (local_user() && local_user() == $item['uid'] && $item['parent'] == $item['id'] && !$item['self']) {
+       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
                $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
        }
 

diff --git a/mod/photos.php b/mod/photos.php
index 7b74a39dd8d3fb75b878f32cf38ac52861a8c3fc..7240c0052b57c2d33fb38bfc4e9482549b5b5267 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1287,7 +1287,7 @@ function photos_content(App $a)
                }
 
                if (!empty($link_item['parent']) && !empty($link_item['uid'])) {
-                       $condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
+                       $condition = ["`parent` = ? AND `gravity` != ?",  $link_item['parent'], GRAVITY_PARENT];
                        $total = DBA::count('item', $condition);
 
                        $pager = new Pager(DI::l10n(), DI::args()->getQueryString());

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 54e44f5b9959dddf00029e89fb69ebb35a852266..10541c0e3e47ed710470681b807c8f24cecdccf3 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -960,7 +960,7 @@ class DFRN
                $dfrnowner = self::addEntryAuthor($doc, "dfrn:owner", $item["owner-link"], $item);
                $entry->appendChild($dfrnowner);
 
-               if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+               if ($item['gravity'] != GRAVITY_PARENT) {
                        $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
                        $parent = Item::selectFirst(['guid', 'plink'], ['uri' => $parent_item, 'uid' => $item['uid']]);
                        $attributes = ["ref" => $parent_item, "type" => "text/html",

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 24decc000eda2ad2b41029c2ca4f29070bac3d56..411bdd63cbe591295513e27b6105dc58d47c8e78 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -2020,7 +2020,7 @@ class OStatus
        {
                $mentioned = [];
 
-               if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+               if ($item['gravity'] != GRAVITY_PARENT) {
                        $parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
                        $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 94b29d86035d73d835ccd0d2a07bc4203dc30363..0202fda0efb2ed6fd56c9632e1927c1dd32989b4 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -346,7 +346,7 @@ function frio_display_item(App $a, &$arr)
        if (
                local_user()
                && local_user() == $arr['item']['uid']
-               && $arr['item']['parent'] == $arr['item']['id']
+               && $arr['item']['gravity'] == GRAVITY_PARENT
                && !$arr['item']['self'])
        {
                $subthread = [