<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
}
if (!empty($href)) {
- $attachments[] = ['type' => Post\Media::DOCUMENT, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+ $attachment = ['type' => Post\Media::UNKNOWN, 'url' => $href, 'mimetype' => $type, 'size' => $length];
+
+ $attachment = Post\Media::fetchAdditionalData($attachment);
+
+ // By now we separate the visible media types (audio, video, image) from the rest
+ // In the future we should try to avoid the DOCUMENT type and only use the real one - but not in the RC phase.
+ if (!in_array($attachment['type'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO])) {
+ $attachment['type'] = Post\Media::DOCUMENT;
+ }
+ $attachments[] = $attachment;
}
}
$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
$item["object-type"] = Activity\ObjectType::BOOKMARK;
$attachments = [];
+
+ foreach (['audio', 'video'] as $elementname) {
+ if (!empty($data[$elementname])) {
+ foreach ($data[$elementname] as $element) {
+ if (!empty($element['src'])) {
+ $src = $element['src'];
+ } elseif (!empty($element['content'])) {
+ $src = $element['content'];
+ } else {
+ continue;
+ }
+
+ $attachments[] = [
+ 'type' => ($elementname == 'audio') ? Post\Media::AUDIO : Post\Media::VIDEO,
+ 'url' => $src,
+ 'preview' => $element['image'] ?? null,
+ 'mimetype' => $element['contenttype'] ?? null,
+ 'name' => $element['name'] ?? null,
+ 'description' => $element['description'] ?? null,
+ ];
+ }
+ }
+ }
}
} else {
if (!empty($summary)) {
}
// Add the link to the original feed entry if not present in feed
- if (($item['plink'] != '') && !strstr($item["body"], $item['plink'])) {
+ if (($item['plink'] != '') && !strstr($item["body"], $item['plink']) && !in_array($item['plink'], array_column($attachments, 'url'))) {
$item["body"] .= "[hr][url]" . $item['plink'] . "[/url]";
}
}
$cachekey = "feed:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
+ // Display events in the users's timezone
+ if (strlen($owner['timezone'])) {
+ DI::app()->setTimeZone($owner['timezone']);
+ }
+
$previous_created = $last_update;
// Don't cache when the last item was posted less then 15 minutes ago (Cache duration)