friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Delete could work now, needs testing

This commit is contained in:
Michael 2018-01-17 07:08:49 +00:00
parent 32c1c04a1c
commit 2df5a14ce5
1 changed files with 31 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/Model/Item.php
View File

@ -64,11 +64,10 @@ class Item
return $rows; return $rows;
} }
public static function delete(array $condition, $priority = PRIORITY_HIGH) public static function delete($item_id, $priority = PRIORITY_HIGH)
{ {
/*
// locate item to be deleted // locate item to be deleted
$item = dba::selectFirst('item', [], $condition); $item = dba::selectFirst('item', [], ['id' => $item_id]);
if (!DBM::is_result($item)) { if (!DBM::is_result($item)) {
return false; return false;
} }
@ -77,10 +76,6 @@ class Item
return false; return false;
} }
$owner = $item['uid'];
$contact_id = 0;
logger('delete item: ' . $item['id'], LOGGER_DEBUG); logger('delete item: ' . $item['id'], LOGGER_DEBUG);
// clean up categories and tags so they don't end up as orphans // clean up categories and tags so they don't end up as orphans
@ -102,12 +97,12 @@ class Item
} }
} }
//* /*
// * If item is a link to a photo resource, nuke all the associated photos * If item is a link to a photo resource, nuke all the associated photos
// * (visitors will not have photo resources) * (visitors will not have photo resources)
// * This only applies to photos uploaded from the photos page. Photos inserted into a post do not * This only applies to photos uploaded from the photos page. Photos inserted into a post do not
// * generate a resource-id and therefore aren't intimately linked to the item. * generate a resource-id and therefore aren't intimately linked to the item.
// * */
if (strlen($item['resource-id'])) { if (strlen($item['resource-id'])) {
dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]); dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
} }
@ -123,51 +118,36 @@ class Item
dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]); dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
} }
// Set the item to "deleted" // When it is our item we don't delete it here, since we have to send delete messages
// Don't delete it here, since we have to send delete messages if ($item['origin']) {
dba::update('item', ['deleted' => true, 'title' => '', 'body' => '', // Set the item to "deleted"
'edited' => datetime_convert(), 'changed' => datetime_convert()], dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
['id' => $item['id']]); 'edited' => datetime_convert(), 'changed' => datetime_convert()],
['id' => $item['id']]);
create_tags_from_item($item['id']); create_tags_from_item($item['id']);
Term::createFromItem($item['id']); Term::createFromItem($item['id']);
delete_thread($item['id'], $item['parent-uri']); delete_thread($item['id'], $item['parent-uri']);
// Creating list of parents // If it's the parent of a comment thread, kill all the kids
$r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d", if ($item['id'] == $item['parent']) {
intval($item['id']), $items = dba::select('item', ['id'], ['parent' => $item['parent']]);
intval($item['uid']) while ($row = dba::fetch($items)) {
); self::delete($row['id'], $priority);
}
$parentid = "";
foreach ($r as $row) {
if ($parentid != "") {
$parentid .= ", ";
} }
$parentid .= $row["id"]; // send the notification upstream/downstream
} Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", "drop", intval($item['id']));
// Now delete them
if ($parentid != "") {
q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid));
}
// If it's the parent of a comment thread, kill all the kids
if ($item['uri'] == $item['parent-uri']) {
dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
'edited' => datetime_convert(), 'changed' => datetime_convert()],
['parent-uri' => $item['parent-uri'], 'uid' => $item['uid']]);
create_tags_from_itemuri($item['parent-uri'], $item['uid']);
Term::createFromItemURI($item['parent-uri'], $item['uid']);
delete_thread_uri($item['parent-uri'], $item['uid']);
// ignore the result
} else { } else {
// delete it immediately. All related children will be deleted as well.
dba::delete('item', ['id' => $item['id']]);
}
if ($item['id'] != $item['parent']) {
// ensure that last-child is set in case the comment that had it just got wiped. // ensure that last-child is set in case the comment that had it just got wiped.
dba::update('item', ['last-child' => false, 'changed' => datetime_convert()], dba::update('item', ['last-child' => false, 'changed' => datetime_convert()],
['parent-uri' => $item['parent-uri'], 'uid' => $item['uid']]); ['parent' => $item['parent']]);
// who is the last child now? // who is the last child now?
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
@ -179,11 +159,7 @@ class Item
} }
} }
// send the notification upstream/downstream
Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", "drop", intval($item['id']));
return true; return true;
*/
} }
/** /**