*/
namespace Friendica\Worker;
-use Friendica\App;
-use Friendica\Core\System;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
+use Friendica\Model\Item;
use Friendica\Model\Queue;
use Friendica\Model\User;
-use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use dba;
-require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
require_once 'include/items.php';
-require_once 'include/bbcode.php';
/// @todo This is some ugly code that needs to be split into several methods
logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG);
- $expire = false;
$mail = false;
$fsuggest = false;
$relocate = false;
$top_level = false;
$recipients = [];
- $url_recipients = [];
$followup = false;
$normal_mode = true;
+ $item = null;
+
$recipients[] = $contact_id;
if ($cmd === 'mail') {
$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;
return;
}
- $walltowall = (($top_level && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+ // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
+ $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
$public_message = true;
// 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,':'));
$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;
}
}
- $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
- intval($contact_id)
+ // We don't deliver our items to blocked or pending contacts, and not to ourselves either
+ $contact = dba::selectFirst('contact', [],
+ ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
);
-
- if (DBM::is_result($r)) {
- $contact = $r[0];
- }
- if ($contact['self']) {
+ if (!DBM::is_result($contact)) {
return;
}
+
$deliver_status = 0;
// Transmit via Diaspora if not possible via Friendica
logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
if ($mail) {
- $item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+ $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
$atom = DFRN::mail($item, $owner);
} elseif ($fsuggest) {
$atom = DFRN::fsuggest($item, $owner);
return;
}
- $item_contact = get_item_contact($item,$icontacts);
+ $item_contact = self::getItemContact($item,$icontacts);
if (!$item_contact) {
return;
}
if ($normal_mode) {
- if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
+ // Only add the parent when we don't delete other items.
+ if ($item_id == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != 'drop'))) {
$item["entry:comment-allow"] = true;
$item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
$msgitems[] = $item;
}
$ssl_policy = Config::get('system','ssl_policy');
- fix_contact_ssl_policy($x[0],$ssl_policy);
+ $x[0] = Contact::updateSslPolicy($x[0], $ssl_policy);
// If we are setup as a soapbox we aren't accepting top level posts from this person
if ($deliver_status < 0) {
logger('notifier: delivery failed: queuing message');
- Queue::add($contact['id'], NETWORK_DFRN, $atom);
+ Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);
$reply_to = $r1[0]['reply_to'];
}
- $subject = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
+ $subject = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : L10n::t("\x28no subject\x29")) ;
// only expose our real email address to true friends
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
}
} else {
- $headers = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
+ $headers = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. L10n::t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
}
//if ($reply_to)
return;
}
+
+ private static function getItemContact($item, $contacts)
+ {
+ if (!count($contacts) || !is_array($item)) {
+ return false;
+ }
+ foreach ($contacts as $contact) {
+ if ($contact['id'] == $item['contact-id']) {
+ return $contact;
+ }
+ }
+ return false;
+ }
}