More item abstraction / making remote deletion work again

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index f164fb0ae2c6f4347225dd08ab112cdcd66ee1b4..61de1e096cd8c68d1eb4b5634154b699ad5e188c 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -93,9 +93,9 @@ function item_post(App $a) {
 
        if ($thr_parent || $thr_parent_uri) {
                if ($thr_parent) {
-                       $parent_item = dba::selectFirst('item', [], ['id' => $thr_parent]);
+                       $parent_item = Item::selectFirst([], ['id' => $thr_parent]);
                } elseif ($thr_parent_uri) {
-                       $parent_item = dba::selectFirst('item', [], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
+                       $parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
                }
 
                // if this isn't the real parent of the conversation, find it
@@ -106,7 +106,7 @@ function item_post(App $a) {
                        $thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
 
                        if ($parent_item['id'] != $parent_item['parent']) {
-                               $parent_item = dba::selectFirst('item', [], ['id' => $parent_item['parent']]);
+                               $parent_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
                        }
                }
 
@@ -170,7 +170,7 @@ function item_post(App $a) {
        $orig_post = null;
 
        if ($post_id) {
-               $orig_post = dba::selectFirst('item', [], ['id' => $post_id]);
+               $orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
        }
 
        $user = dba::selectFirst('user', [], ['uid' => $profile_uid]);
@@ -567,7 +567,7 @@ function item_post(App $a) {
                $network = NETWORK_DFRN;
        }
 
-       $gravity = ($parent ? 6 : 0);
+       $gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
 
        // even if the post arrived via API we are considering that it
        // originated on this site by default for determining relayability.
@@ -647,13 +647,13 @@ function item_post(App $a) {
        // This field is for storing the raw conversation data
        $datarray['protocol'] = PROTOCOL_DFRN;
 
-       $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
-       if (DBM::is_result($r)) {
+       $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
+       if (DBM::is_result($conversation)) {
                if ($r['conversation-uri'] != '') {
-                       $datarray['conversation-uri'] = $r['conversation-uri'];
+                       $datarray['conversation-uri'] = $conversation['conversation-uri'];
                }
                if ($r['conversation-href'] != '') {
-                       $datarray['conversation-href'] = $r['conversation-href'];
+                       $datarray['conversation-href'] = $conversation['conversation-href'];
                }
        }
 
@@ -737,7 +737,7 @@ function item_post(App $a) {
                goaway($return_path);
        }
 
-       $datarray = dba::selectFirst('item', [], ['id' => $post_id]);
+       $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 
        if (!DBM::is_result($datarray)) {
                logger("Item with id ".$post_id." couldn't be fetched.");