*/
namespace Friendica\Worker;
+use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
require_once 'include/items.php';
-class Delivery {
- public static function execute($cmd, $item_id, $contact_id) {
- global $a;
-
+class Delivery extends BaseObject
+{
+ const MAIL = 'mail';
+ const SUGGESTION = 'suggest';
+ const RELOCATION = 'relocate';
+ const DELETION = 'drop';
+ const POST = 'wall-new';
+ const COMMENT = 'comment-new';
+ const REMOVAL = 'removeme';
+
+ public static function execute($cmd, $item_id, $contact_id)
+ {
logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG);
$top_level = false;
$followup = false;
$public_message = false;
- if ($cmd == DELIVER_MAIL) {
+ if ($cmd == self::MAIL) {
$target_item = dba::selectFirst('mail', [], ['id' => $item_id]);
- if (!DBM::is_result($message)) {
+ if (!DBM::is_result($target_item)) {
return;
}
$uid = $target_item['uid'];
- } elseif ($cmd == DELIVER_SUGGESTION) {
+ } elseif ($cmd == self::SUGGESTION) {
$target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
- if (!DBM::is_result($message)) {
+ if (!DBM::is_result($target_item)) {
return;
}
$uid = $target_item['uid'];
- } elseif ($cmd == DELIVER_RELOCATION) {
+ } elseif ($cmd == self::RELOCATION) {
$uid = $item_id;
} else {
$item = dba::selectFirst('item', ['parent'], ['id' => $item_id]);
}
$parent_id = intval($item['parent']);
- $itemdata = dba::p("SELECT `item`.*, `contact`.`uid` AS `cuid`,
- `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item`
- INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
- WHERE `item`.`id` IN (?, ?) AND `visible` AND NOT `moderated`
- ORDER BY `item`.`id`",
- $item_id, $parent_id);
+ $condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false];
+ $params = ['order' => ['id']];
+ $itemdata = Item::select([], $condition, $params);
+
$items = [];
while ($item = dba::fetch($itemdata)) {
if ($item['id'] == $parent_id) {
}
dba::close($itemdata);
- $uid = $target_item['cuid'];
+ $uid = $target_item['contact-uid'];
// avoid race condition with deleting entries
if ($items[0]['deleted']) {
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- $localhost = $a->get_hostname();
+ $localhost = self::getApp()->get_hostname();
if (strpos($localhost, ':')) {
$localhost = substr($localhost, 0, strpos($localhost, ':'));
}
return;
}
+ /**
+ * @brief Deliver content via DFRN
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $items Item record of the content and the parent
+ * @param array $target_item Item record of the content
+ * @param boolean $public_message Is the content public?
+ * @param boolean $top_level Is it a thread starter?
+ * @param boolean $followup Is it an answer to a remote post?
+ */
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
- logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']);
+ logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
- if ($cmd == DELIVER_MAIL) {
+ if ($cmd == self::MAIL) {
$item = $target_item;
$item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
$atom = DFRN::mail($item, $owner);
- } elseif ($cmd == DELIVER_SUGGESTION) {
+ } elseif ($cmd == self::SUGGESTION) {
$item = $target_item;
$atom = DFRN::fsuggest($item, $owner);
dba::delete('fsuggest', ['id' => $item['id']]);
- } elseif ($cmd == DELIVER_RELOCATION) {
+ } elseif ($cmd == self::RELOCATION) {
$atom = DFRN::relocate($owner, $owner['uid']);
} elseif ($followup) {
$msgitems = [$target_item];
$msgitems = [];
foreach ($items as $item) {
// Only add the parent when we don't delete other items.
- if (($target_item['id'] == $item['id']) || ($cmd != DELIVER_DELETION)) {
+ if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
$item["entry:comment-allow"] = true;
$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item;
}
}
- $atom = DFRN::entries($msgitems,$owner);
+ $atom = DFRN::entries($msgitems, $owner);
}
logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA);
- $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
+ $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3));
// perform local delivery if we are on the same site
return;
}
- if ($items[0]['uid'] == 0) {
- $deliver_status = DFRN::transmit($owner, $contact, $atom);
- if ($deliver_status < 200) {
+ // We don't have a relationship with contacts on a public post.
+ // Se we transmit with the new method and via Diaspora as a fallback
+ if (($items[0]['uid'] == 0) || ($contact['uid'] == 0)) {
+ // Transmit in public if it's a relay post
+ $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);
+
+ $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
+
+ // We never spool failed relay deliveries
+ if ($public_dfrn) {
+ logger('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
+ return;
+ }
+
+ if (($deliver_status < 200) || ($deliver_status > 299)) {
// Transmit via Diaspora if not possible via Friendica
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
}
+ /**
+ * @brief Deliver content via Diaspora
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $items Item record of the content and the parent
+ * @param array $target_item Item record of the content
+ * @param boolean $public_message Is the content public?
+ * @param boolean $top_level Is it a thread starter?
+ * @param boolean $followup Is it an answer to a remote post?
+ */
private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
return;
}
- if ($cmd == DELIVER_MAIL) {
+ if ($cmd == self::MAIL) {
Diaspora::sendMail($target_item, $owner, $contact);
return;
}
- if ($cmd == DELIVER_SUGGESTION) {
+ if ($cmd == self::SUGGESTION) {
return;
}
if (!$contact['pubkey'] && !$public_message) {
logger('diaspora retract: ' . $loc);
Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
return;
- } elseif ($cmd == DELIVER_RELOCATION) {
+ } elseif ($cmd == self::RELOCATION) {
Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
return;
} elseif ($followup) {
logger('Unknown mode ' . $cmd . ' for ' . $loc);
}
+ /**
+ * @brief Deliver content via mail
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $target_item Item record of the content
+ */
private static function deliverMail($cmd, $contact, $owner, $target_item)
{
- global $a;
-
if (Config::get('system','dfrn_only')) {
return;
}
return;
}
- if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) {
+ if (!in_array($cmd, [self::POST, self::COMMENT])) {
return;
}
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n";
}
} else {
- $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . $a->get_hostname() . '>' . "\n";
+ $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->get_hostname() . '>' . "\n";
}
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
}
}
}
- if (strncasecmp($subject, 'RE:', 3)) {
+ if (strncasecmp($subject, 'RE:', 3)) {
$subject = 'Re: ' . $subject;
}
}
projects / friendica.git / blobdiff