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

The delete function is now changed to the new function

Browse source
This commit is contained in:
Michael 2018-01-17 23:22:01 +00:00
commit 2d66242b4f
8 changed files with 42 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Model/Item.php
View file

@ -64,10 +64,18 @@ class Item
return $rows;
}
/**
* @brief Delete an item and notify others about it - if it was ours
*
* @param integer $item_id Item ID that should be delete
*
* @return $boolean success
*/
public static function delete($item_id, $priority = PRIORITY_HIGH)
{
// locate item to be deleted
$item = dba::selectFirst('item', [], ['id' => $item_id]);
$fields = ['id', 'uid', 'parent', 'parent-uri', 'origin', 'deleted', 'file', 'resource-id', 'event-id', 'attach'];
$item = dba::selectFirst('item', $fields, ['id' => $item_id]);
if (!DBM::is_result($item)) {
return false;
}
@ -76,6 +84,11 @@ class Item
return false;
}
$parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
if (!DBM::is_result($parent)) {
$parent = ['origin' => false];
}
logger('delete item: ' . $item['id'], LOGGER_DEBUG);
// clean up categories and tags so they don't end up as orphans
@ -119,7 +132,7 @@ class Item
}
// When it is our item we don't delete it here, since we have to send delete messages
if ($item['origin'] || $item['wall']) {
if ($item['origin'] || $parent['origin']) {
// Set the item to "deleted"
dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
'edited' => datetime_convert(), 'changed' => datetime_convert()],
@ -144,21 +157,6 @@ class Item
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.
dba::update('item', ['last-child' => false, 'changed' => datetime_convert()],
['parent' => $item['parent']]);
// 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",
dbesc($item['parent-uri']),
intval($item['uid'])
);
if (DBM::is_result($r)) {
dba::update('item', ['last-child' => true], ['id' => $r[0]['id']]);
}
}
return true;
}

25
src/Worker/Delivery.php
View file

@ -29,7 +29,6 @@ class Delivery {
logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG);
$expire = false;
$mail = false;
$fsuggest = false;
$relocate = false;
@ -54,18 +53,6 @@ class Delivery {
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
} elseif ($cmd === 'expire') {
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
intval($item_id)
);
$uid = $item_id;
$item_id = 0;
if (!count($items)) {
return;
}
} elseif ($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
@ -160,16 +147,6 @@ class Delivery {
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
// expire sends an entire group of expire messages and cannot be forwarded.
// However the conversation owner will be a part of the conversation and will
// be notified during this run.
// Other DFRN conversation members will be alerted during polled updates.
// Diaspora members currently are not notified of expirations, and other networks have
// either limited or no ability to process deletions. We should at least fix Diaspora
// by stringing togther an array of retractions and sending them onward.
$localhost = $a->get_hostname();
if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
@ -184,7 +161,7 @@ class Delivery {
$relay_to_owner = false;
if (!$top_level && ($parent['wall'] == 0) && !$expire && stristr($target_item['uri'],$localhost)) {
if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
$relay_to_owner = true;
}

29
src/Worker/Notifier.php
View file

@ -41,7 +41,6 @@ require_once 'include/bbcode.php';
* drop (in diaspora.php, items.php, photos.php)
* edit_post (in item.php)
* event (in events.php)
* expire (in items.php)
* like (in like.php, poke.php)
* mail (in message.php)
* suggest (in fsuggest.php)
@ -60,7 +59,6 @@ class Notifier {
logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
$expire = false;
$mail = false;
$fsuggest = false;
$relocate = false;
@ -82,19 +80,6 @@ class Notifier {
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
} elseif ($cmd === 'expire') {
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE",
intval($item_id)
);
$uid = $item_id;
$item_id = 0;
if (!count($items)) {
return;
}
} elseif ($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
@ -213,18 +198,6 @@ class Notifier {
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
// expire sends an entire group of expire messages and cannot be forwarded.
// However the conversation owner will be a part of the conversation and will
// be notified during this run.
// Other DFRN conversation members will be alerted during polled updates.
// Diaspora members currently are not notified of expirations, and other networks have
// either limited or no ability to process deletions. We should at least fix Diaspora
// by stringing togther an array of retractions and sending them onward.
$localhost = str_replace('www.','',$a->get_hostname());
if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
@ -239,7 +212,7 @@ class Notifier {
$relay_to_owner = false;
if (!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
if (!$top_level && ($parent['wall'] == 0) && (stristr($target_item['uri'],$localhost))) {
$relay_to_owner = true;
}