bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Hypolite Petovan 2020-03-03 01:47:28 -05:00
parent dd613cda45
commit 6ae5f705b6
7 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Model/Item.php
View file

@ -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;

2
src/Module/Admin/Item/Delete.php
View file

@ -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);

4
src/Protocol/ActivityPub/Processor.php
View file

@ -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]);
}
/**

2
src/Protocol/DFRN.php
View file

@ -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']]);
}
/**

2
src/Protocol/Diaspora.php
View file

@ -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);
}

2
src/Protocol/OStatus.php
View file

@ -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']);
}

2
src/Worker/RemoveUser.php
View file

@ -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));