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($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($server_url, $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];
$fields = array_merge($fields, $network_fields);
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url)];
- $relay = DBA::selectFirst('contact', ['id'], $condition);
- if (DBA::isResult($relay)) {
+ $old = DBA::selectFirst('contact', [], $condition);
+ if (DBA::isResult($old)) {
unset($fields['created']);
- $condition = ['id' => $relay['id']];
- }
+ $condition = ['id' => $old['id']];
- Logger::info('Set relay contact', ['fields' => $fields, 'condition' => $condition]);
-
- DBA::update('contact', $fields, $condition, true);
+ Logger::info('Update relay contact', ['fields' => $fields, 'condition' => $condition]);
+ DBA::update('contact', $fields, $condition, $old);
+ } else {
+ Logger::info('Create relay contact', ['fields' => $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'])) {
* @brief Fetches data for a given handle
*
* @param string $handle The handle
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
*
* @return array the queried data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function personByHandle($handle)
+ public static function personByHandle($handle, $update = null)
{
- $update = false;
-
$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+ if (!DBA::isResult($person)) {
+ $urls = [$handle, str_replace('http://', 'https://', $handle), Strings::normaliseLink($handle)];
+ $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'url' => $urls]);
+ }
+
if (DBA::isResult($person)) {
Logger::debug("In cache " . print_r($person, true));
- // update record occasionally so it doesn't get stale
- $d = strtotime($person["updated"]." +00:00");
- if ($d < strtotime("now - 14 days")) {
- $update = true;
- }
+ if (is_null($update)) {
+ // update record occasionally so it doesn't get stale
+ $d = strtotime($person["updated"]." +00:00");
+ if ($d < strtotime("now - 14 days")) {
+ $update = true;
+ }
- if ($person["guid"] == "") {
- $update = true;
+ if ($person["guid"] == "") {
+ $update = true;
+ }
}
+ } elseif (is_null($update)) {
+ $update = !DBA::isResult($person);
+ } else {
+ $person = [];
}
- if (!DBA::isResult($person) || $update) {
+ if ($update) {
Logger::log("create or refresh", Logger::DEBUG);
$r = Probe::uri($handle, Protocol::DIASPORA);
if ($r && ($r["network"] === Protocol::DIASPORA)) {
self::updateFContact($r);
- // Fetch the updated or added contact
- $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
- if (!DBA::isResult($person)) {
- $person = $r;
- $person['id'] = 0;
- }
+ $person = self::personByHandle($handle, false);
}
}
return $contact;
}
+ /**
+ * Checks if the given contact url does support ActivityPub
+ *
+ * @param string $url profile url
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+ * @return boolean
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function isSupportedByContactUrl($url, $update = null)
+ {
+ return !empty(self::personByHandle($url, $update));
+ }
+
/**
* @brief Check if posting is allowed for this contact
*
return $msg;
}
+ /**
+ * @brief Fetches an item with a given URL
+ *
+ * @param string $url the message url
+ *
+ * @return int the message id of the stored message or false
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function fetchByURL($url, $uid = 0)
+ {
+ // Check for Diaspora (and Friendica) typical paths
+ if (!preg_match("=(https?://.+)/(?:posts|display)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) {
+ return false;
+ }
+
+ $guid = urldecode($matches[2]);
+
+ $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
+ if (DBA::isResult($item)) {
+ return $item['id'];
+ }
+
+ self::storeByGuid($guid, $matches[1], $uid);
+
+ $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
+ if (DBA::isResult($item)) {
+ return $item['id'];
+ } else {
+ return false;
+ }
+ }
+
/**
* @brief Fetches the item record of a given guid
*
}
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;