keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unneeded stuff removed, only fetch needed records

Browse source
This commit is contained in:
Michael 2018-04-26 06:23:01 +00:00
parent 71d4c6e4a0
commit b70b020490
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Worker/Delivery.php
View file

@ -61,15 +61,19 @@ class Delivery {
$parent_id = intval($target_item['parent']); $parent_id = intval($target_item['parent']);
$uid = $target_item['cuid']; $uid = $target_item['cuid'];
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` if ($parent_id != $item_id) {
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` $parent = dba::fetch_first("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", FROM `item`
intval($parent_id) LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
); WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $parent_id);
if (!DBM::is_result($parent)) {
if (!DBM::is_result($items)) {
return; return;
} }
$items = [$parent, $target_item];
} else {
$parent = $target_item;
$items = [$target_item];
}
// avoid race condition with deleting entries // avoid race condition with deleting entries
if ($items[0]['deleted']) { if ($items[0]['deleted']) {
@ -81,13 +85,11 @@ class Delivery {
// When commenting too fast after delivery, a post wasn't recognized as top level post. // When commenting too fast after delivery, a post wasn't recognized as top level post.
// The count then showed more than one entry. The additional check should help. // The count then showed more than one entry. The additional check should help.
// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it. // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
if ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) { if ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
logger('Top level post'); logger('Top level post');
$top_level = true; $top_level = true;
} }
$parent = $items[0];
// This is IMPORTANT!!!! // This is IMPORTANT!!!!
// We will only send a "notify owner to relay" or followup message if the referenced post // We will only send a "notify owner to relay" or followup message if the referenced post
@ -193,23 +195,13 @@ class Delivery {
} elseif ($cmd == DELIVER_RELOCATION) { } elseif ($cmd == DELIVER_RELOCATION) {
$atom = DFRN::relocate($owner, $owner['uid']); $atom = DFRN::relocate($owner, $owner['uid']);
} elseif ($followup) { } elseif ($followup) {
$msgitems = []; $msgitems = [$target_item];
$msgitems[] = $target_item;
$atom = DFRN::entries($msgitems, $owner); $atom = DFRN::entries($msgitems, $owner);
} else { } else {
$msgitems = []; $msgitems = [];
foreach ($items as $item) { foreach ($items as $item) {
if (!$item['parent']) {
return;
}
// private emails may be in included in public conversations. Filter them.
if ($public_message && $item['private']) {
return;
}
// Only add the parent when we don't delete other items. // Only add the parent when we don't delete other items.
if ($target_item['id'] == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != DELIVER_DELETION))) { if (($target_item['id'] == $item['id']) || ($cmd != DELIVER_DELETION)) {
$item["entry:comment-allow"] = true; $item["entry:comment-allow"] = true;
$item["entry:cid"] = ($top_level ? $contact['id'] : 0); $item["entry:cid"] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item; $msgitems[] = $item;
@ -266,6 +258,7 @@ class Delivery {
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return; return;
} }
} else {
$deliver_status = DFRN::deliver($owner, $contact, $atom); $deliver_status = DFRN::deliver($owner, $contact, $atom);
} }