use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item;
+use Friendica\Model\ItemDeliveryData;
use Friendica\Model\Mail;
use Friendica\Model\Profile;
use Friendica\Model\User;
*/
class Diaspora
{
+ /**
+ * Mark the relay contact of the given contact for archival
+ * This is called whenever there is a communication issue with the server.
+ * It avoids sending stuff to servers who don't exist anymore.
+ * The relay contact is a technical contact entry that exists once per server.
+ *
+ * @param array $contact of the relay contact
+ */
+ public static function markRelayForArchival(array $contact)
+ {
+ if (!empty($contact['contact-type']) && ($contact['contact-type'] == Contact::TYPE_RELAY)) {
+ // This is already the relay contact, we don't need to fetch it
+ $relay_contact = $contact;
+ } elseif (empty($contact['baseurl'])) {
+ if (!empty($contact['batch'])) {
+ $condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => Contact::TYPE_RELAY];
+ $relay_contact = DBA::selectFirst('contact', [], $condition);
+ } else {
+ return;
+ }
+ } else {
+ $relay_contact = self::getRelayContact($contact['baseurl'], []);
+ }
+
+ if (!empty($relay_contact)) {
+ Logger::info('Relay contact will be marked for archival', ['id' => $relay_contact['id'], 'url' => $relay_contact['url']]);
+ Contact::markForArchival($relay_contact);
+ }
+ }
+
/**
* @brief Return a list of relay servers
*
* @brief Return a contact for a given server address or creates a dummy entry
*
* @param string $server_url The url of the server
+ * @param array $fields Fieldlist
* @return array with the contact
* @throws \Exception
*/
- private static function getRelayContact($server_url)
+ private static function getRelayContact(string $server_url, array $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'])
{
- $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'];
-
// Fetch the relay contact
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
'contact-type' => Contact::TYPE_RELAY];
DBA::update('contact', $fields, $condition, $old);
} else {
Logger::info('Create relay contact', ['fields' => $fields]);
- DBA::insert('contact', $fields);
+ Contact::insert($fields);
}
}
`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`
- WHERE `participation`.`iid` = ?", $thread);
+ WHERE `participation`.`iid` = ? AND NOT `contact`.`archive`", $thread);
while ($contact = DBA::fetch($r)) {
if (!empty($contact['fnetwork'])) {
}
Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $contact_id]);
- Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $contact_id);
+ if (Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $contact_id)) {
+ ItemDeliveryData::incrementQueueCount($comment['id'], 1);
+ }
}
DBA::close($comments);
$logid = Strings::getRandomHex(4);
- $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
-
// We always try to use the data from the fcontact table.
// This is important for transmitting data to Friendica servers.
if (!empty($contact['addr'])) {
}
}
+ if (empty($dest_url)) {
+ $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
+ }
+
if (!$dest_url) {
Logger::log("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
return 0;
return $result;
}
- $toplevel_item = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+ $toplevel_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
if (!DBA::isResult($toplevel_item)) {
Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
return false;
$thread_parent_item = $toplevel_item;
if ($item['thr-parent'] != $item['parent-uri']) {
- $thread_parent_item = Item::selectFirst(['guid', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
+ $thread_parent_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
}
$body = $item["body"];
- if ((empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
+ // The replied to autor mention is prepended for clarity if:
+ // - Item replied isn't yours
+ // - Item is public or explicit mentions are disabled
+ // - Implicit mentions are enabled
+ if (
+ $item['author-id'] != $thread_parent_item['author-id']
+ && (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
&& !Config::get('system', 'disable_implicit_mentions')
) {
$body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);