use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
+use Friendica\Worker\Delivery;
use SimpleXMLElement;
/**
*/
private static function getRelayContact($server_url)
{
- $fields = ['batch', 'id', 'name', 'network', 'archive', 'blocked'];
+ $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'];
// Fetch the relay contact
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
*/
public static function participantsForThread($thread, array $contacts)
{
- $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+ $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`, `contact`.`protocol`,
`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
}
unset($contact['fnetwork']);
+ if (empty($contact['protocol'])) {
+ $contact['protocol'] = $contact['network'];
+ }
+
if (empty($contact['batch']) && !empty($contact['fbatch'])) {
$contact['batch'] = $contact['fbatch'];
}
if ($comment['id'] == $comment['parent']) {
continue;
}
- if ($comment['verb'] == ACTIVITY_POST) {
- $cmd = $comment['self'] ? 'comment-new' : 'comment-import';
- } else {
- $cmd = $comment['self'] ? 'like' : 'comment-import';
- }
- Logger::log("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, Logger::DEBUG);
- Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
+
+ Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $contact_id]);
+ Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $contact_id);
}
DBA::close($comments);
* @param string $envelope The message that is to be transmitted
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
- * @param bool $no_defer Don't defer a failing delivery
*
* @return int Result of the transmission
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "", $no_defer = false)
+ private static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "")
{
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
- if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
- if (!$no_defer && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::TYPE_RELAY)) {
- Logger::info('defer message', ['log' => $logid, 'guid' => $guid, 'destination' => $dest_url]);
- // defer message for redelivery
- Worker::defer();
- }
-
- // The message could not be delivered. We mark the contact as "dead"
- Contact::markForArchival($contact);
- } elseif (($return_code >= 200) && ($return_code <= 299)) {
- // We successfully delivered a message, the contact is alive
- Contact::unmarkForArchival($contact);
- }
-
return $return_code ? $return_code : -1;
}
* @param array $message The message data
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
- * @param bool $no_defer Don't defer a failing delivery
*
* @return int Result of the transmission
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $no_defer = false)
+ private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "")
{
$msg = self::buildPostXml($type, $message);
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
- $return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid, $no_defer);
+ $return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
$public = ($item["private"] ? "false" : "true");
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
+ $edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM);
// Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
$message = ["author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
+ "edited_at" => $edited,
"public" => $public,
"text" => $body,
"provider_display_name" => $item["app"],
$text = html_entity_decode(BBCode::toMarkdown($body));
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
+ $edited = DateTimeFormat::utc($item["edited"], DateTimeFormat::ATOM);
$comment = [
"author" => self::myHandle($owner),
"guid" => $item["guid"],
"created_at" => $created,
+ "edited_at" => $edited,
"parent_guid" => $toplevel_item["guid"],
"text" => $text,
"author_signature" => ""
} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$message = self::constructLike($item, $owner);
$type = "like";
- } elseif (!in_array($item["verb"], [ACTIVITY_FOLLOW])) {
+ } elseif (!in_array($item["verb"], [ACTIVITY_FOLLOW, ACTIVITY_TAG])) {
$message = self::constructComment($item, $owner);
$type = "comment";
}
$message = self::createProfileData($uid);
+ // @ToDo Split this into single worker jobs
foreach ($recips as $recip) {
Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
- self::buildAndTransmit($owner, $recip, "profile", $message, false, '', true);
+ self::buildAndTransmit($owner, $recip, "profile", $message);
}
}
projects / friendica.git / blobdiff