Rename Item::delete* methods to Item::markForDeletion*

diff --git a/src/Model/Item.php b/src/Model/Item.php
index eac3b7028623dac5bdee844b471eb1721c43b793..de719a3c7adc075246c53c260c8c6365fa7b4404 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1066,11 +1066,11 @@ class Item
         * @param integer $priority  Priority for the notification
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function delete($condition, $priority = PRIORITY_HIGH)
+       public static function markForDeletion($condition, $priority = PRIORITY_HIGH)
        {
                $items = self::select(['id'], $condition);
                while ($item = self::fetch($items)) {
-                       self::deleteById($item['id'], $priority);
+                       self::markForDeletionById($item['id'], $priority);
                }
                DBA::close($items);
        }
@@ -1097,7 +1097,7 @@ class Item
                                // Delete notifications
                                DBA::delete('notify', ['iid' => $item['id'], 'uid' => $uid]);
                        } elseif ($item['uid'] == $uid) {
-                               self::deleteById($item['id'], PRIORITY_HIGH);
+                               self::markForDeletionById($item['id'], PRIORITY_HIGH);
                        } else {
                                Logger::log('Wrong ownership. Not deleting item ' . $item['id']);
                        }
@@ -1106,17 +1106,17 @@ class Item
        }
 
        /**
-        * Delete an item and notify others about it - if it was ours
+        * Mark an item for deletion, delete related data and notify others about it - if it was ours
         *
-        * @param integer $item_id  Item ID that should be delete
+        * @param integer $item_id
         * @param integer $priority Priority for the notification
         *
         * @return boolean success
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function deleteById($item_id, $priority = PRIORITY_HIGH)
+       public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH)
        {
-               Logger::notice('Delete item by id', ['id' => $item_id, 'callstack' => System::callstack()]);
+               Logger::notice('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
                // locate item to be deleted
                $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
                        'deleted', 'file', 'resource-id', 'event-id', 'attach',
@@ -1124,12 +1124,12 @@ class Item
                        'icid', 'iaid', 'psid'];
                $item = self::selectFirst($fields, ['id' => $item_id]);
                if (!DBA::isResult($item)) {
-                       Logger::log('Item with ID ' . $item_id . " hasn't been found.", Logger::DEBUG);
+                       Logger::debug('Item not found.', ['id' => $item_id]);
                        return false;
                }
 
                if ($item['deleted']) {
-                       Logger::log('Item with ID ' . $item_id . ' has already been deleted.', Logger::DEBUG);
+                       Logger::debug('Item has already been marked for deletion.', ['id' => $item_id]);
                        return false;
                }
 
@@ -1199,7 +1199,7 @@ class Item
                self::deleteThread($item['id'], $item['parent-uri']);
 
                if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
-                       self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
+                       self::markForDeletion(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
                }
 
                ItemDeliveryData::delete($item['id']);
@@ -1219,14 +1219,13 @@ class Item
 
                // If it's the parent of a comment thread, kill all the kids
                if ($item['id'] == $item['parent']) {
-                       self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
+                       self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority);
                }
 
                // Is it our comment and/or our thread?
                if ($item['origin'] || $parent['origin']) {
-
                        // When we delete the original post we will delete all existing copies on the server as well
-                       self::delete(['uri' => $item['uri'], 'deleted' => false], $priority);
+                       self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority);
 
                        // send the notification upstream/downstream
                        Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id']));
@@ -1239,7 +1238,7 @@ class Item
                        }
                }
 
-               Logger::log('Item with ID ' . $item_id . " has been deleted.", Logger::DEBUG);
+               Logger::debug('Item has been marked for deletion.', ['id' => $item_id]);
 
                return true;
        }
@@ -3105,7 +3104,7 @@ class Item
                                continue;
                        }
 
-                       self::deleteById($item['id'], PRIORITY_LOW);
+                       self::markForDeletionById($item['id'], PRIORITY_LOW);
 
                        ++$expired;
                }
@@ -3246,7 +3245,7 @@ class Item
 
                // If it exists, mark it as deleted
                if (DBA::isResult($like_item)) {
-                       self::deleteById($like_item['id']);
+                       self::markForDeletionById($like_item['id']);
 
                        if (!$event_verb_flag || $like_item['verb'] == $activity) {
                                return true;

diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index c98248e86c51fae72f7217439475045e3469a103..0ad20f97c983ffc423ed3a9c9f16c90f0736e488 100644 (file)
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -48,7 +48,7 @@ class Delete extends BaseAdmin
                        }
                        // Now that we have the GUID, drop those items, which will also delete the
                        // associated threads.
-                       Item::delete(['guid' => $guid]);
+                       Item::markForDeletion(['guid' => $guid]);
                }
 
                info(DI::l10n()->t('Item marked for deletion.') . EOL);

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 2e3264e09193f8c09745f141c5ebe4db395342bb..5ff8881ddb50a7be9c2b54d433e6752dfdfce91f 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -220,7 +220,7 @@ class Processor
                $owner = Contact::getIdForURL($activity['actor']);
 
                Logger::log('Deleting item ' . $activity['object_id'] . ' from ' . $owner, Logger::DEBUG);
-               Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
+               Item::markForDeletion(['uri' => $activity['object_id'], 'owner-id' => $owner]);
        }
 
        /**
@@ -868,7 +868,7 @@ class Processor
                        return;
                }
 
-               Item::delete(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+               Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
        }
 
        /**

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 4c88db1d944a47c0a70d69e7618566438fb652f9..5c9d19ea99e36ddc46d83f8bab691a6e82b8bac6 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2716,7 +2716,7 @@ class DFRN
 
                Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG);
 
-               Item::delete(['id' => $item['id']]);
+               Item::markForDeletion(['id' => $item['id']]);
        }
 
        /**

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index cda42802182863fed9b923f9f18cc9d0ac24adce..70965a72fd8e78121384bbe33eee592d6ba1b0e8 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2794,7 +2794,7 @@ class Diaspora
                                continue;
                        }
 
-                       Item::delete(['id' => $item['id']]);
+                       Item::markForDeletion(['id' => $item['id']]);
 
                        Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG);
                }

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 96b8447b4ccedc5e38031cc2a373f355c91a09a9..b707c62c556b3f34c6fc1408b3431e8b71a0f69a 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -585,7 +585,7 @@ class OStatus
                        return;
                }
 
-               Item::delete($condition);
+               Item::markForDeletion($condition);
 
                Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
        }

diff --git a/src/Worker/RemoveUser.php b/src/Worker/RemoveUser.php
index c2441adc90c558a54afc1d063e834c676a0aab33..018d17a46e68e0a415666f2e038395587e8a0128 100644 (file)
--- a/src/Worker/RemoveUser.php
+++ b/src/Worker/RemoveUser.php
@@ -41,7 +41,7 @@ class RemoveUser {
                do {
                        $items = Item::select(['id'], $condition, ['limit' => 100]);
                        while ($item = Item::fetch($items)) {
-                               Item::deleteById($item['id'], PRIORITY_NEGLIGIBLE);
+                               Item::markForDeletionById($item['id'], PRIORITY_NEGLIGIBLE);
                        }
                        DBA::close($items);
                } while (Item::exists($condition));