use Friendica\Core\Cache\Duration;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\Item;
+use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
$dfrn_importer = DFRN::getImporter($contact['id'], $importer['uid']);
if (!empty($dfrn_importer)) {
Logger::info('Now import the DFRN feed');
- DFRN::import($xml, $dfrn_importer, true);
+ DFRN::import($xml, $dfrn_importer, true, Conversation::PARCEL_LEGACY_DFRN);
return;
}
}
$total_items = $max_items;
}
+ $postings = [];
+
// Importing older entries first
for ($i = $total_items; $i >= 0; --$i) {
$entry = $entries->item($i);
$item["plink"] = DI::httpRequest()->finalUrl($item["plink"]);
- $item["parent-uri"] = $item["uri"];
-
$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
if (empty($item["title"])) {
$enclosures = $xpath->query("enclosure|atom:link[@rel='enclosure']", $entry);
foreach ($enclosures AS $enclosure) {
$href = "";
- $length = "";
- $type = "";
+ $length = null;
+ $type = null;
foreach ($enclosure->attributes AS $attribute) {
if (in_array($attribute->name, ["url", "href"])) {
$href = $attribute->textContent;
} elseif ($attribute->name == "length") {
- $length = $attribute->textContent;
+ $length = (int)$attribute->textContent;
} elseif ($attribute->name == "type") {
$type = $attribute->textContent;
}
}
- if (!empty($item["attach"])) {
- $item["attach"] .= ',';
- } else {
- $item["attach"] = '';
+ if (!empty($href)) {
+ $attachments[] = ['type' => Post\Media::DOCUMENT, 'url' => $href, 'mimetype' => $type, 'size' => $length];
}
-
- $attachments[] = ["link" => $href, "type" => $type, "length" => $length];
-
- $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '"[/attach]';
}
$taglist = [];
}
$item["body"] = HTML::toBBCode($body, $basepath);
+ // Remove tracking pixels
+ $item["body"] = preg_replace("/\[img=1x1\]([^\[\]]*)\[\/img\]/Usi", '', $item["body"]);
+
if (($item["body"] == '') && ($item["title"] != '')) {
$item["body"] = $item["title"];
$item["title"] = '';
$items[] = $item;
break;
} elseif (!Item::isValid($item)) {
- Logger::info('Feed is invalid', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
+ Logger::info('Feed item is invalid', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
+ continue;
+ } elseif (Item::isTooOld($item)) {
+ Logger::info('Feed is too old', ['created' => $item['created'], 'uid' => $item['uid'], 'uri' => $item['uri']]);
continue;
}
if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] < 3)) {
// Handle enclosures and treat them as preview picture
foreach ($attachments AS $attachment) {
- if ($attachment["type"] == "image/jpeg") {
- $preview = $attachment["link"];
+ if ($attachment["mimetype"] == "image/jpeg") {
+ $preview = $attachment["url"];
}
}
$replace = true;
}
+ $saved_body = $item["body"];
+ $saved_title = $item["title"];
+
if ($replace) {
$item["body"] = trim($item["title"]);
}
}
}
- // We always strip the title since it will be added in the page information
- $item["title"] = "";
- $item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
- $taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
- $item["object-type"] = Activity\ObjectType::BOOKMARK;
- unset($item["attach"]);
+ $data = PageInfo::queryUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
+
+ if (!empty($data)) {
+ // Take the data that was provided by the feed if the query is empty
+ if (($data['type'] == 'link') && empty($data['title']) && empty($data['text'])) {
+ $data['title'] = $saved_title;
+ $item["body"] = $saved_body;
+ }
+
+ $data_text = strip_tags(trim($data['text'] ?? ''));
+ $item_body = strip_tags(trim($item['body'] ?? ''));
+
+ if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
+ $data['text'] = '';
+ }
+
+ // We always strip the title since it will be added in the page information
+ $item["title"] = "";
+ $item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromData($data, false);
+ $taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
+ $item["object-type"] = Activity\ObjectType::BOOKMARK;
+ $attachments = [];
+ }
} else {
if (!empty($summary)) {
$item["body"] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item["body"];
// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
if ($notify) {
$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
- unset($item['uri']);
+ $item['uri'] = Item::newURI($item['uid'], $item['guid']);
+ unset($item['thr-parent']);
unset($item['parent-uri']);
// Set the delivery priority for "remote self" to "medium"
$notify = PRIORITY_MEDIUM;
}
- $id = Item::insert($item, $notify);
+ if (!Post\Delayed::exists($item["uri"])) {
+ $postings[] = ['item' => $item, 'notify' => $notify,
+ 'taglist' => $taglist, 'attachments' => $attachments];
+ } else {
+ Logger::info('Post already exists in the delayed posts queue', ['uri' => $item["uri"]]);
+ }
+ }
- Logger::info("Feed for contact " . $contact["url"] . " stored under id " . $id);
+ if (!empty($postings)) {
+ $min_posting = DI::config()->get('system', 'minimum_posting_interval', 0);
+ $total = count($postings);
+ if ($total > 1) {
+ // Posts shouldn't be delayed more than a day
+ $interval = min(1440, self::getPollInterval($contact));
+ $delay = max(round(($interval * 60) / $total), 60 * $min_posting);
+ Logger::notice('Got posting delay', ['delay' => $delay, 'interval' => $interval, 'items' => $total, 'cid' => $contact['id'], 'url' => $contact['url']]);
+ } else {
+ $delay = 0;
+ }
- if (!empty($id) && !empty($taglist)) {
- $feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
- foreach ($taglist as $tag) {
- Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);
+ $post_delay = 0;
+
+ foreach ($postings as $posting) {
+ if ($delay > 0) {
+ $publish_time = time() + $post_delay;
+ Logger::notice('Got publishing date', ['delay' => $delay, 'cid' => $contact['id'], 'url' => $contact['url']]);
+ $post_delay += $delay;
+ } else {
+ $publish_time = time();
+ }
+
+ $last_publish = DI::pConfig()->get($posting['item']['uid'], 'system', 'last_publish', 0, true);
+ $next_publish = max($last_publish + (60 * $min_posting), time());
+ if ($publish_time < $next_publish) {
+ Logger::notice('Adapting publish time',
+ ['last' => date(DateTimeFormat::MYSQL, $last_publish),
+ 'next' => date(DateTimeFormat::MYSQL, $next_publish),
+ 'publish' => date(DateTimeFormat::MYSQL, $publish_time)]);
+ $publish_time = $next_publish;
}
+ $publish_at = date(DateTimeFormat::MYSQL, $publish_time);
+
+ Post\Delayed::add($publish_at, $posting['item'], $posting['notify'], $posting['taglist'], $posting['attachments']);
+ DI::pConfig()->set($item['uid'], 'system', 'last_publish', $next_publish);
}
}
*/
private static function adjustPollFrequency(array $contact, array $creation_dates)
{
- if (($contact['priority'] > 3) || ($contact['network'] != Protocol::FEED)) {
- Logger::info('Contact is no feed or has a low priority, skip.', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url'], 'priority' => $contact['priority'], 'network' => $contact['network']]);
+ if ($contact['network'] != Protocol::FEED) {
+ Logger::info('Contact is no feed, skip.', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url'], 'network' => $contact['network']]);
return;
}
$oldest = $day;
$oldest_date = $date;
}
-
+
if ($newest < $day) {
$newest = $day;
$newest_date = $date;
}
}
- if (($newest == $oldest) && count($creation_dates) > 1) {
- Logger::info('Feed has no different creation dates, quitting', ['date' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
- return;
+ if (count($creation_dates) == 1) {
+ Logger::info('Feed had posted a single time, switching to daily polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
+ $priority = 8; // Poll once a day
}
- if (empty($frequency)) {
- Logger::info('Feed had not posted for at least a week, switching to daily polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
- $priority = 3; // Poll once a day
+ if (empty($priority) && (((time() / 86400) - $newest) > 730)) {
+ Logger::info('Feed had not posted for two years, switching to monthly polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
+ $priority = 10; // Poll every month
}
- if (empty($priority) && (count($creation_dates) == 1)) {
- Logger::info('Feed had posted a single time, switching to daily polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
- $priority = 3; // Poll once a day
+ if (empty($priority) && (((time() / 86400) - $newest) > 365)) {
+ Logger::info('Feed had not posted for a year, switching to weekly polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
+ $priority = 9; // Poll every week
}
- if (empty($priority) && (($newest - $oldest) > count($creation_dates))) {
- Logger::info('Less than a post per day, switching to daily polling', ['posts' => count($creation_dates), 'oldest' => $oldest_date, 'newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
- $priority = 3; // Poll once a day
+ if (empty($priority) && empty($frequency)) {
+ Logger::info('Feed had not posted for at least a week, switching to daily polling', ['newest' => $newest_date, 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
+ $priority = 8; // Poll once a day
}
if (empty($priority)) {
// Calculate the highest "posts per day" value
- $max = 1;
+ $max = 0;
foreach ($frequency as $entry) {
if (($entry['count'] == 1) || ($entry['high'] == $entry['low'])) {
continue;
$max = $ppd;
}
}
-
- if ($max >= 24) {
- $priority = 0; // Poll with the minimum poll intervall
- } elseif ($max >= 12) {
- $priority = 1; // Poll hourly
- } elseif ($max > 1) {
- $priority = 2; // Poll twice a day
+ if ($max > 48) {
+ $priority = 1; // Poll every quarter hour
+ } elseif ($max > 24) {
+ $priority = 2; // Poll half an hour
+ } elseif ($max > 12) {
+ $priority = 3; // Poll hourly
+ } elseif ($max > 8) {
+ $priority = 4; // Poll every two hours
+ } elseif ($max > 4) {
+ $priority = 5; // Poll every three hours
+ } elseif ($max > 2) {
+ $priority = 6; // Poll every six hours
} else {
- /// @todo In the future we could calculate the days between the posts to set even lower priorities
- $priority = 3; // Poll once a day
+ $priority = 7; // Poll twice a day
}
Logger::info('Calculated priority by the posts per day', ['priority' => $priority, 'max' => round($max, 2), 'id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
}
} else {
Logger::info('No posts, switching to daily polling', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $contact['url']]);
- $priority = 3; // Poll once a day
+ $priority = 8; // Poll once a day
}
if ($contact['rating'] != $priority) {
}
}
+ /**
+ * Get the poll interval for the given contact array
+ *
+ * @param array $contact
+ * @return int Poll interval in minutes
+ */
+ public static function getPollInterval(array $contact)
+ {
+ if (in_array($contact['network'], [Protocol::MAIL, Protocol::FEED])) {
+ $ratings = [0, 3, 7, 8, 9, 10];
+ if (DI::config()->get('system', 'adjust_poll_frequency') && ($contact['network'] == Protocol::FEED)) {
+ $rating = $contact['rating'];
+ } elseif (array_key_exists($contact['priority'], $ratings)) {
+ $rating = $ratings[$contact['priority']];
+ } else {
+ $rating = -1;
+ }
+ } else {
+ // Check once a week per default for all other networks
+ $rating = 9;
+ }
+
+ // Friendica and OStatus are checked once a day
+ if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
+ $rating = 8;
+ }
+
+ // Check archived contacts or contacts with unsupported protocols once a month
+ if ($contact['archive'] || in_array($contact['network'], [Protocol::ZOT, Protocol::PHANTOM])) {
+ $rating = 10;
+ }
+
+ if ($rating < 0) {
+ return 0;
+ }
+ /*
+ * Based on $contact['priority'], should we poll this site now? Or later?
+ */
+
+ $min_poll_interval = max(1, DI::config()->get('system', 'min_poll_interval'));
+
+ $poll_intervals = [$min_poll_interval, 15, 30, 60, 120, 180, 360, 720 ,1440, 10080, 43200];
+
+ //$poll_intervals = [$min_poll_interval . ' minute', '15 minute', '30 minute',
+ // '1 hour', '2 hour', '3 hour', '6 hour', '12 hour' ,'1 day', '1 week', '1 month'];
+
+ return $poll_intervals[$rating];
+ }
+
/**
* Convert a tag array to a tag string
*
if ($tagstr != "") {
$tagstr .= ", ";
}
-
+
$tagstr .= "#[url=" . DI::baseUrl() . "/search?tag=" . urlencode($tag) . "]" . $tag . "[/url]";
}
if ($item['gravity'] != GRAVITY_PARENT) {
$parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
- $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
- $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
+ $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $item['thr-parent']]);
if (DBA::isResult($thrparent)) {
$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
}
$attributes = [
- "ref" => $parent_item,
+ "ref" => $item['thr-parent'],
"href" => $parent_plink];
XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
projects / friendica.git / blobdiff