More item abstraction / making remote deletion work again

diff --git a/include/api.php b/include/api.php
index 32fe6c651d945daf42f01ae7bc0030ae5473ba67..19d4a944d59cb0e20fd2bccf86bd1371b279ce79 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1272,7 +1272,7 @@ function api_status_show($type)
        // get last public wall message
        $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
                'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
-       $lastwall = dba::selectFirst('item', [], $condition, ['order' => ['id' => true]]);
+       $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
 
        if (DBM::is_result($lastwall)) {
                $in_reply_to = api_in_reply_to($lastwall);
@@ -1357,7 +1357,7 @@ function api_users_show($type)
 
        $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
                'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false];
-       $lastwall = dba::selectFirst('item', [], $condition, ['order' => ['id' => true]]);
+       $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
 
        if (DBM::is_result($lastwall)) {
                $in_reply_to = api_in_reply_to($lastwall);
@@ -1817,12 +1817,12 @@ function api_statuses_show($type)
        $conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
 
        // try to fetch the item for the local user - or the public item, if there is no local one
-       $uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
+       $uri_item = Item::selectFirst(['uri'], ['id' => $id]);
        if (!DBM::is_result($uri_item)) {
                throw new BadRequestException("There is no status with this id.");
        }
 
-       $item = dba::selectFirst('item', ['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+       $item = Item::selectFirst(['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
        if (!DBM::is_result($item)) {
                throw new BadRequestException("There is no status with this id.");
        }
@@ -1897,12 +1897,12 @@ function api_conversation_show($type)
        logger('API: api_conversation_show: '.$id);
 
        // try to fetch the item for the local user - or the public item, if there is no local one
-       $item = dba::selectFirst('item', ['parent-uri'], ['id' => $id]);
+       $item = Item::selectFirst(['parent-uri'], ['id' => $id]);
        if (!DBM::is_result($item)) {
                throw new BadRequestException("There is no status with this id.");
        }
 
-       $parent = dba::selectFirst('item', ['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+       $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
        if (!DBM::is_result($parent)) {
                throw new BadRequestException("There is no status with this id.");
        }

diff --git a/mod/acl.php b/mod/acl.php
index c16b3bab6efc879cf8e7cb8e217b2060e774697c..dd5dd90281d0140782d45195dead24039635b8ae 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -241,7 +241,7 @@ function acl_content(App $a)
 
        if ($conv_id) {
                // In multi threaded posts the conv_id is not the parent of the whole thread
-               $parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
+               $parent_item = Item::selectFirst(['parent'], ['id' => $conv_id]);
                if (DBM::is_result($parent_item)) {
                        $conv_id = $parent_item['parent'];
                }

diff --git a/mod/display.php b/mod/display.php
index 919b12fbc3e2e0454f5c5b510844dc6feafb02aa..920cb454f9fa959533107f0a35cfa665c4cfa46d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -202,7 +202,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $item = dba::selectFirst('item', ['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
+               $item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
                if ($item['uid'] != 0) {
                        $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
                } else {

diff --git a/mod/item.php b/mod/item.php
index be9fa09c478985c2496525ede78ca73fa2c03ce7..61de1e096cd8c68d1eb4b5634154b699ad5e188c 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -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]);

diff --git a/src/Object/Post.php b/src/Object/Post.php
index b131246fd4e1a3f7a909d566506c291d0d0d1a62..216008974ab9525f4e7115ccd2d78421bab85ad8 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use dba;
@@ -178,7 +179,7 @@ class Post extends BaseObject
                if (!$origin) {
                        /// @todo This shouldn't be done as query here, but better during the data creation.
                        // it is now done here, since during the RC phase we shouldn't make to intense changes.
-                       $parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
+                       $parent = Item::selectFirst(['origin'], ['id' => $item['parent']]);
                        if (DBM::is_result($parent)) {
                                $origin = $parent['origin'];
                        }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index f979d6b00369aea49346e1d082e8945fdf64cd1f..72ab89d925992ac04f2e37b2f4ed466dc6fc243e 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2414,8 +2414,7 @@ class DFRN
 
                $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
 
-               $current = dba::selectFirst('item',
-                       ['id', 'uid', 'edited', 'body'],
+               $current = Item::selectFirst(['id', 'uid', 'edited', 'body'],
                        ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]
                );
                // Is there an existing item?
@@ -2747,13 +2746,18 @@ class DFRN
                        return false;
                }
 
-               $condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["importer_uid"]];
-               $item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition);
+               $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
+               $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file'], $condition);
                if (!DBM::is_result($item)) {
                        logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG);
                        return;
                }
 
+               if (strstr($item['file'], '[')) {
+                       logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+                       return;
+               }
+
                // When it is a starting post it has to belong to the person that wants to delete it
                if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
                        logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 87f798427c29f5abd46cff04f3153115a1c76c92..d567be144d64599012ab8b6c7067d2b45d4ae31d 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2705,7 +2705,7 @@ class Diaspora
                }
 
                // Fetch items that are about to be deleted
-               $fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link'];
+               $fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link', 'file'];
 
                // When we receive a public retraction, we delete every item that we find.
                if ($importer['uid'] == 0) {
@@ -2721,6 +2721,11 @@ class Diaspora
                }
 
                while ($item = Item::fetch($r)) {
+                       if (strstr($item['file'], '[')) {
+                               logger("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+                               continue;
+                       }
+
                        // Fetch the parent item
                        $parent = Item::selectFirst(['author-link'], ['id' => $item["parent"]]);
 

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c04e40b5e520d8871631e826c3310cc211b15ffe..29ab21d1f1ec10c5559fb7ccb8014b99c137b7c0 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -250,7 +250,7 @@ class Feed {
                        if (!$simulate) {
                                $condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
                                        $importer["uid"], $item["uri"], NETWORK_FEED, NETWORK_DFRN];
-                               $previous = dba::selectFirst('item', ['id'], $condition);
+                               $previous = Item::selectFirst(['id'], $condition);
                                if (DBM::is_result($previous)) {
                                        logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], LOGGER_DEBUG);
                                        continue;

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e505f4bd705f2da1d84c1f701303f8ae7b6ac289..0c8ff27faf894d576303bba0a30decf2d61e8ce3 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -53,7 +53,7 @@ class Delivery extends BaseObject
                } elseif ($cmd == self::RELOCATION) {
                        $uid = $item_id;
                } else {
-                       $item = dba::selectFirst('item', ['parent'], ['id' => $item_id]);
+                       $item = Item::selectFirst(['parent'], ['id' => $item_id]);
                        if (!DBM::is_result($item) || empty($item['parent'])) {
                                return;
                        }
@@ -436,12 +436,12 @@ class Delivery extends BaseObject
 
                        if (empty($target_item['title'])) {
                                $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
-                               $title = dba::selectFirst('item', ['title'], $condition);
+                               $title = Item::selectFirst(['title'], $condition);
                                if (DBM::is_result($title) && ($title['title'] != '')) {
                                        $subject = $title['title'];
                                } else {
                                        $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
-                                       $title = dba::selectFirst('item', ['title'], $condition);
+                                       $title = Item::selectFirst(['title'], $condition);
                                        if (DBM::is_result($title) && ($title['title'] != '')) {
                                                $subject = $title['title'];
                                        }

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index fcf36bd55ab41a589a6b49fdddfb0b30e88c92e3..96549233e58a56fe1d1f25ecd7c332c04cf18047 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -167,7 +167,7 @@ class Notifier {
 
                        $fields = ['network', 'author-id', 'owner-id'];
                        $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
-                       $thr_parent = dba::selectFirst('item', $fields, $condition);
+                       $thr_parent = Item::selectFirst($fields, $condition);
 
                        logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent['network'], LOGGER_DEBUG);