clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace item_id by target_id in multimode delivery workers

This commit is contained in:
Hypolite Petovan 2018-12-07 00:37:17 -05:00
parent 4d26c9de03
commit 8a0e4e12e1
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Worker/APDelivery.php
View File

@ -16,27 +16,27 @@ class APDelivery extends BaseObject
/** /**
* @brief Delivers ActivityPub messages * @brief Delivers ActivityPub messages
* *
* @param string $cmd * @param string $cmd
* @param integer $item_id * @param integer $target_id
* @param string $inbox * @param string $inbox
* @param integer $uid * @param integer $uid
*/ */
public static function execute($cmd, $item_id, $inbox, $uid) public static function execute($cmd, $target_id, $inbox, $uid)
{ {
Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, Logger::DEBUG); Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $inbox, Logger::DEBUG);
$success = true; $success = true;
if ($cmd == Delivery::MAIL) { if ($cmd == Delivery::MAIL) {
} elseif ($cmd == Delivery::SUGGESTION) { } elseif ($cmd == Delivery::SUGGESTION) {
$success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id); $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $target_id);
} elseif ($cmd == Delivery::RELOCATION) { } elseif ($cmd == Delivery::RELOCATION) {
} elseif ($cmd == Delivery::REMOVAL) { } elseif ($cmd == Delivery::REMOVAL) {
$success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox); $success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
} elseif ($cmd == Delivery::PROFILEUPDATE) { } elseif ($cmd == Delivery::PROFILEUPDATE) {
$success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox); $success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
} else { } else {
$data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id); $data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
if (!empty($data)) { if (!empty($data)) {
$success = HTTPSignature::transmit($data, $inbox, $uid); $success = HTTPSignature::transmit($data, $inbox, $uid);
} }

24
src/Worker/Delivery.php
View File

@ -32,9 +32,9 @@ class Delivery extends BaseObject
const REMOVAL = 'removeme'; const REMOVAL = 'removeme';
const PROFILEUPDATE = 'profileupdate'; const PROFILEUPDATE = 'profileupdate';
public static function execute($cmd, $item_id, $contact_id) public static function execute($cmd, $target_id, $contact_id)
{ {
Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, Logger::DEBUG); Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG);
$top_level = false; $top_level = false;
$followup = false; $followup = false;
@ -42,28 +42,28 @@ class Delivery extends BaseObject
$items = []; $items = [];
if ($cmd == self::MAIL) { if ($cmd == self::MAIL) {
$target_item = DBA::selectFirst('mail', [], ['id' => $item_id]); $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
if (!DBA::isResult($target_item)) { if (!DBA::isResult($target_item)) {
return; return;
} }
$uid = $target_item['uid']; $uid = $target_item['uid'];
} elseif ($cmd == self::SUGGESTION) { } elseif ($cmd == self::SUGGESTION) {
$target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]); $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
if (!DBA::isResult($target_item)) { if (!DBA::isResult($target_item)) {
return; return;
} }
$uid = $target_item['uid']; $uid = $target_item['uid'];
} elseif ($cmd == self::RELOCATION) { } elseif ($cmd == self::RELOCATION) {
$uid = $item_id; $uid = $target_id;
$target_item = []; $target_item = [];
} else { } else {
$item = Item::selectFirst(['parent'], ['id' => $item_id]); $item = Item::selectFirst(['parent'], ['id' => $target_id]);
if (!DBA::isResult($item) || empty($item['parent'])) { if (!DBA::isResult($item) || empty($item['parent'])) {
return; return;
} }
$parent_id = intval($item['parent']); $parent_id = intval($item['parent']);
$condition = ['id' => [$item_id, $parent_id], 'moderated' => false]; $condition = ['id' => [$target_id, $parent_id], 'moderated' => false];
$params = ['order' => ['id']]; $params = ['order' => ['id']];
$itemdata = Item::select([], $condition, $params); $itemdata = Item::select([], $condition, $params);
@ -71,7 +71,7 @@ class Delivery extends BaseObject
if ($item['id'] == $parent_id) { if ($item['id'] == $parent_id) {
$parent = $item; $parent = $item;
} }
if ($item['id'] == $item_id) { if ($item['id'] == $target_id) {
$target_item = $item; $target_item = $item;
} }
$items[] = $item; $items[] = $item;
@ -79,12 +79,12 @@ class Delivery extends BaseObject
DBA::close($itemdata); DBA::close($itemdata);
if (empty($target_item)) { if (empty($target_item)) {
Logger::log('Item ' . $item_id . "wasn't found. Quitting here."); Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
return; return;
} }
if (empty($parent)) { if (empty($parent)) {
Logger::log('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here."); Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
return; return;
} }
@ -107,7 +107,7 @@ class Delivery extends BaseObject
// 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 ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) { if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
Logger::log('Top level post'); Logger::log('Top level post');
$top_level = true; $top_level = true;
} }
@ -148,7 +148,7 @@ class Delivery extends BaseObject
} }
if (empty($items)) { if (empty($items)) {
Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id); Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
} }
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);