' . $leading . '
' . $content;
+ if ($shared) {
+ $content = str_replace(BBCode::ANCHOR, '' . $leading . '
' . BBCode::ANCHOR, $content);
+ $content = str_replace(BBCode::ANCHOR, BBCode::ANCHOR . '' . $trailing . '
', $content);
+ } else {
+ if ($leading != '') {
+ $content = '' . $leading . '
' . $content;
+ }
+
+ if ($trailing != '') {
+ $content .= '' . $trailing . '
';
+ }
+ }
+
+ return $content;
+ }
+
+ /**
+ * Add link attachment to the content
+ *
+ * @param array $attachments
+ * @param array $item
+ * @param string $content
+ * @param bool $shared
+ * @return string modified content
+ */
+ private static function addLinkAttachment(array $attachments, array $item, string $content, bool $shared, string $ignore_link)
+ {
+ // @ToDo Check only for audio and video
+ $preview = empty($attachments['visual']);
+
+ if (!empty($attachments['link'])) {
+ foreach ($attachments['link'] as $link) {
+ if (!Strings::compareLink($link['url'], $ignore_link)) {
+ $attachment = $link;
+ }
+ }
+ }
+
+ if (!empty($attachment)) {
+ $data = [
+ 'author_img' => $attachment['author-image'] ?? '',
+ 'author_name' => $attachment['author-name'] ?? '',
+ 'author_url' => $attachment['author-url'] ?? '',
+ 'publisher_img' => $attachment['publisher-image'] ?? '',
+ 'publisher_name' => $attachment['publisher-name'] ?? '',
+ 'publisher_url' => $attachment['publisher-url'] ?? '',
+ 'text' => $attachment['description'] ?? '',
+ 'title' => $attachment['name'] ?? '',
+ 'type' => 'link',
+ 'url' => $attachment['url'] ?? '',
+ ];
+
+ if ($preview && !empty($attachment['preview']) && !empty($attachment['preview-height']) && !empty($attachment['preview-width'])) {
+ $data['images'][] = ['src' => $attachment['preview'],
+ 'width' => $attachment['preview-width'], 'height' => $attachment['preview-height']];
+ }
+ $footer = PageInfo::getFooterFromData($data);
+ } elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $item['body'], $match)) {
+ $footer = $match[1];
+ }
+
+ if (!empty($footer)) {
+ // @todo Use a template
+ $rendered = BBCode::convert($footer);
+ if ($shared) {
+ return str_replace(BBCode::ANCHOR, BBCode::ANCHOR . $rendered, $content);
+ } else {
+ return $content . $rendered;
+ }
+ }
+ return $content;
+ }
+
+ /**
+ * Add non visual attachments to the content
+ *
+ * @param array $attachments
+ * @param array $item
+ * @param string $content
+ * @return string modified content
+ */
+ private static function addNonVisualAttachments(array $attachments, array $item, string $content)
+ {
+ $trailing = '';
+ foreach ($attachments['additional'] as $attachment) {
+ if (strpos($item['body'], $attachment['url'])) {
+ continue;
+ }
+
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $the_url = Contact::magicLinkByContact($author, $attachment['url']);
+
+ $title = Strings::escapeHtml(trim(($attachment['description'] ?? '') ?: $attachment['url']));
+
+ if (!empty($attachment['size'])) {
+ $title .= ' ' . $attachment['size'] . ' ' . DI::l10n()->t('bytes');
+ }
+
+ /// @todo Use a template
+ $icon = '';
+ $trailing .= '' . $icon . '';
}
if ($trailing != '') {
@@ -2849,8 +2983,8 @@ class Item
}
/**
- * Return the URI for a link to the post
- *
+ * Return the URI for a link to the post
+ *
* @param string $uri URI or link to post
*
* @return string URI
diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index a120bf02b..460ee1447 100644
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -76,6 +76,27 @@ class ItemURI
return self::insert(['uri' => $uri]);
}
+ return $itemuri['id'];
+ }
+ /**
+ * Searched for an id of a given guid.
+ *
+ * @param string $guid
+ *
+ * @return integer item-uri id
+ * @throws \Exception
+ */
+ public static function getIdByGUID($guid)
+ {
+ // If the GUID gets too long we only take the first parts and hope for best
+ $guid = substr($guid, 0, 255);
+
+ $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $guid]);
+
+ if (!DBA::isResult($itemuri)) {
+ return 0;
+ }
+
return $itemuri['id'];
}
}
diff --git a/src/Model/Post.php b/src/Model/Post.php
index d56674c3e..864e2a574 100644
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -406,7 +406,7 @@ class Post
if (!DBA::isResult($postthreaduser)) {
return $postthreaduser;
}
-
+
$pinned = [];
while ($useritem = DBA::fetch($postthreaduser)) {
$pinned[] = $useritem['uri-id'];
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 8601be02a..82525dc57 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -21,12 +21,15 @@
namespace Friendica\Model\Post;
+use Friendica\Content\PageInfo;
+use Friendica\Content\Text\BBCode;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Util\Images;
+use Friendica\Util\ParseUrl;
/**
* Class Media
@@ -62,7 +65,7 @@ class Media
}
// "document" has got the lowest priority. So when the same file is both attached as document
- // and embedded as picture then we only store the picture or replace the document
+ // and embedded as picture then we only store the picture or replace the document
$found = DBA::selectFirst('post-media', ['type'], ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
if (!$force && !empty($found) && (($found['type'] != self::DOCUMENT) || ($media['type'] == self::DOCUMENT))) {
Logger::info('Media already exists', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]);
@@ -188,13 +191,27 @@ class Media
$media = self::addType($media);
}
+ if ($media['type'] == self::HTML) {
+ $data = ParseUrl::getSiteinfoCached($media['url'], false);
+ $media['preview'] = $data['images'][0]['src'] ?? null;
+ $media['preview-height'] = $data['images'][0]['height'] ?? null;
+ $media['preview-width'] = $data['images'][0]['width'] ?? null;
+ $media['description'] = $data['text'] ?? null;
+ $media['name'] = $data['title'] ?? null;
+ $media['author-url'] = $data['author_url'] ?? null;
+ $media['author-name'] = $data['author_name'] ?? null;
+ $media['author-image'] = $data['author_img'] ?? null;
+ $media['publisher-url'] = $data['publisher_url'] ?? null;
+ $media['publisher-name'] = $data['publisher_name'] ?? null;
+ $media['publisher-image'] = $data['publisher_img'] ?? null;
+ }
return $media;
}
/**
* Add the detected type to the media array
*
- * @param array $data
+ * @param array $data
* @return array data array with the detected type
*/
public static function addType(array $data)
@@ -274,7 +291,7 @@ class Media
}
$body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
+ $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => $picture[3]];
}
}
@@ -282,7 +299,7 @@ class Media
if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
$body = str_replace($picture[0], '', $body);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1], 'description' => $picture[2]];
+ $attachments[$picture[1]] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1], 'description' => $picture[2]];
}
}
@@ -293,7 +310,7 @@ class Media
}
$body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
+ $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => null];
}
}
@@ -301,24 +318,30 @@ class Media
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/ism", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
$body = str_replace($picture[0], '', $body);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1]];
+ $attachments[$picture[1]] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1]];
}
}
if (preg_match_all("/\[audio\]([^\[\]]*)\[\/audio\]/ism", $body, $audios, PREG_SET_ORDER)) {
foreach ($audios as $audio) {
$body = str_replace($audio[0], '', $body);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::AUDIO, 'url' => $audio[1]];
+ $attachments[$audio[1]] = ['uri-id' => $uriid, 'type' => self::AUDIO, 'url' => $audio[1]];
}
}
if (preg_match_all("/\[video\]([^\[\]]*)\[\/video\]/ism", $body, $videos, PREG_SET_ORDER)) {
foreach ($videos as $video) {
$body = str_replace($video[0], '', $body);
- $attachments[] = ['uri-id' => $uriid, 'type' => self::VIDEO, 'url' => $video[1]];
+ $attachments[$video[1]] = ['uri-id' => $uriid, 'type' => self::VIDEO, 'url' => $video[1]];
}
}
+ $url = PageInfo::getRelevantUrlFromBody($body);
+ if (!empty($url)) {
+ Logger::debug('Got page url', ['url' => $url]);
+ $attachments[$url] = ['uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $url];
+ }
+
foreach ($attachments as $attachment) {
self::insert($attachment);
}
@@ -326,6 +349,38 @@ class Media
return trim($body);
}
+ /**
+ * Add media links from the attachment field
+ *
+ * @param integer $uriid
+ * @param string $body
+ */
+ public static function insertFromAttachmentData(int $uriid, string $body)
+ {
+ $data = BBCode::getAttachmentData($body);
+ if (empty($data)) {
+ return;
+ }
+
+ Logger::info('Adding attachment data', ['data' => $data]);
+ $attachment = [
+ 'uri-id' => $uriid,
+ 'type' => self::HTML,
+ 'url' => $data['url'],
+ 'preview' => $data['preview'] ?? null,
+ 'description' => $data['description'] ?? null,
+ 'name' => $data['title'] ?? null,
+ 'author-url' => $data['author_url'] ?? null,
+ 'author-name' => $data['author_name'] ?? null,
+ 'publisher-url' => $data['provider_url'] ?? null,
+ 'publisher-name' => $data['provider_name'] ?? null,
+ ];
+ if (!empty($data['image'])) {
+ $attachment['preview'] = $data['image'];
+ }
+ self::insert($attachment);
+ }
+
/**
* Add media links from the attach field
*
@@ -369,4 +424,67 @@ class Media
return DBA::selectToArray('post-media', [], $condition);
}
+
+ /**
+ * Checks if media attachments are associated with the provided item ID.
+ *
+ * @param int $uri_id
+ * @param array $types
+ * @return array
+ * @throws \Exception
+ */
+ public static function existsByURIId(int $uri_id, array $types = [])
+ {
+ $condition = ['uri-id' => $uri_id];
+
+ if (!empty($types)) {
+ $condition = DBA::mergeConditions($condition, ['type' => $types]);
+ }
+
+ return DBA::exists('post-media', $condition);
+ }
+
+ /**
+ * Split the attachment media in the three segments "visual", "link" and "additional"
+ *
+ * @param int $uri_id
+ * @return array attachments
+ */
+ public static function splitAttachments(int $uri_id)
+ {
+ $attachments = ['visual' => [], 'link' => [], 'additional' => []];
+
+ $media = self::getByURIId($uri_id);
+ if (empty($media)) {
+ return $attachments;
+ }
+
+ foreach ($media as $medium) {
+ $type = explode('/', current(explode(';', $medium['mimetype'])));
+ if (count($type) < 2) {
+ Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]);
+ $filetype = 'unkn';
+ $subtype = 'unkn';
+ } else {
+ $filetype = strtolower($type[0]);
+ $subtype = strtolower($type[1]);
+ }
+
+ $medium['filetype'] = $filetype;
+ $medium['subtype'] = $subtype;
+
+ if ($medium['type'] == self::HTML || (($filetype == 'text') && ($subtype == 'html'))) {
+ $attachments['link'][] = $medium;
+ continue;
+ }
+
+ if (in_array($medium['type'], [self::AUDIO, self::VIDEO, self::IMAGE]) ||
+ in_array($filetype, ['audio', 'video', 'image'])) {
+ $attachments['visual'][] = $medium;
+ } else {
+ $attachments['additional'][] = $medium;
+ }
+ }
+ return $attachments;
+ }
}
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index fdb97337f..e36e2e703 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -135,113 +135,20 @@ class Processor
}
/**
- * Add attachment data to the item array
+ * Stire attachment data
*
* @param array $activity
* @param array $item
- *
- * @return array array
*/
- private static function constructAttachList($activity, $item)
+ private static function storeAttachments($activity, $item)
{
if (empty($activity['attachments'])) {
- return $item;
+ return;
}
- $leading = '';
- $trailing = '';
-
foreach ($activity['attachments'] as $attach) {
- switch ($attach['type']) {
- case 'link':
- $data = [
- 'url' => $attach['url'],
- 'type' => $attach['type'],
- 'title' => $attach['title'] ?? '',
- 'text' => $attach['desc'] ?? '',
- 'image' => $attach['image'] ?? '',
- 'images' => [],
- 'keywords' => [],
- ];
- $item['body'] = PageInfo::appendDataToBody($item['body'], $data);
- break;
- default:
- self::storeAttachmentAsMedia($item['uri-id'], $attach);
-
- $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
- if ($filetype == 'image') {
- if (!empty($activity['source'])) {
- foreach ([0, 1, 2] as $size) {
- if (preg_match('#/photo/.*-' . $size . '\.#ism', $attach['url']) &&
- strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $activity['source']), $attach['url'])) {
- continue 3;
- }
- }
- if (strpos($activity['source'], $attach['url'])) {
- continue 2;
- }
- }
-
- // image is the preview/thumbnail URL
- if (!empty($attach['image'])) {
- $media = '[url=' . $attach['url'] . ']';
- $attach['url'] = $attach['image'];
- } else {
- $media = '';
- }
-
- if (empty($attach['name'])) {
- $media .= '[img]' . $attach['url'] . '[/img]';
- } else {
- $media .= '[img=' . $attach['url'] . ']' . $attach['name'] . '[/img]';
- }
-
- if (!empty($attach['image'])) {
- $media .= '[/url]';
- }
-
- if ($item['post-type'] == Item::PT_IMAGE) {
- $leading .= $media;
- } else {
- $trailing .= $media;
- }
- } elseif ($filetype == 'audio') {
- if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
- continue 2;
- }
-
- if ($item['post-type'] == Item::PT_AUDIO) {
- $leading .= '[audio]' . $attach['url'] . "[/audio]\n";
- } else {
- $trailing .= '[audio]' . $attach['url'] . "[/audio]\n";
- }
- } elseif ($filetype == 'video') {
- if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
- continue 2;
- }
-
- if ($item['post-type'] == Item::PT_VIDEO) {
- $leading .= '[video]' . $attach['url'] . "[/video]\n";
- } else {
- $trailing .= '[video]' . $attach['url'] . "[/video]\n";
- }
- }
- }
+ self::storeAttachmentAsMedia($item['uri-id'], $attach);
}
-
- if (!empty($leading) && !empty(trim($item['body']))) {
- $item['body'] = $leading . "[hr]\n" . $item['body'];
- } elseif (!empty($leading)) {
- $item['body'] = $leading;
- }
-
- if (!empty($trailing) && !empty(trim($item['body']))) {
- $item['body'] = $item['body'] . "\n[hr]" . $trailing;
- } elseif (!empty($trailing)) {
- $item['body'] = $trailing;
- }
-
- return $item;
}
/**
@@ -265,7 +172,7 @@ class Processor
$item = self::processContent($activity, $item);
- $item = self::constructAttachList($activity, $item);
+ self::storeAttachments($activity, $item);
if (empty($item)) {
return;
@@ -399,7 +306,7 @@ class Processor
$item['plink'] = $activity['alternate-url'] ?? $item['uri'];
- $item = self::constructAttachList($activity, $item);
+ self::storeAttachments($activity, $item);
// We received the post via AP, so we set the protocol of the server to AP
$contact = Contact::getById($item['author-id'], ['gsid']);
@@ -863,12 +770,12 @@ class Processor
$object = ActivityPub::fetchContent($url, $uid);
if (empty($object)) {
- Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
+ Logger::notice('Activity was not fetchable, aborting.', ['url' => $url]);
return '';
}
if (empty($object['id'])) {
- Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
+ Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
return '';
}
@@ -1019,7 +926,7 @@ class Processor
DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
- Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
+ Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
}
/**
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 4b00ead00..4ad70eac0 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -22,7 +22,6 @@
namespace Friendica\Protocol;
use Friendica\Content\Feature;
-use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
@@ -1067,7 +1066,7 @@ class Diaspora
* 'key' => The public key of the author
* @throws \Exception
*/
- private static function message($guid, $server, $level = 0)
+ public static function message($guid, $server, $level = 0)
{
if ($level > 5) {
return false;
@@ -2303,9 +2302,6 @@ class Diaspora
$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
- // Add OEmbed and other information to the body
- $item["body"] = PageInfo::searchAndAppendToBody($item["body"], false, true);
-
return $item;
} else {
return $item;
@@ -2489,7 +2485,6 @@ class Diaspora
Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
- Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
$datarray["app"] = $original_item["app"];
$datarray["plink"] = self::plink($author, $guid);
@@ -2733,8 +2728,6 @@ class Diaspora
if ($data->photo) {
foreach ($data->photo as $photo) {
self::storePhotoAsMedia($datarray['uri-id'], $photo);
- $body = "[img]".XML::unescape($photo->remote_photo_path).
- XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
}
$datarray["object-type"] = Activity\ObjectType::IMAGE;
@@ -2742,11 +2735,6 @@ class Diaspora
} else {
$datarray["object-type"] = Activity\ObjectType::NOTE;
$datarray["post-type"] = Item::PT_NOTE;
-
- // Add OEmbed and other information to the body
- if (!self::isHubzilla($contact["url"])) {
- $body = PageInfo::searchAndAppendToBody($body, false, true);
- }
}
/// @todo enable support for polls
@@ -3378,6 +3366,36 @@ class Diaspora
return $eventdata;
}
+ /**
+ * Add media attachments to the body
+ *
+ * @param array $item
+ * @return string body
+ */
+ private static function addAttachments(array $item)
+ {
+ $body = $item['body'];
+
+ foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO]) as $media) {
+ if (Item::containsLink($item['body'], $media['url'])) {
+ continue;
+ }
+
+ if ($media['type'] == Post\Media::IMAGE) {
+ if (!empty($media['description'])) {
+ $body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
+ } else {
+ $body .= "\n[img]" . $media['url'] .'[/img]';
+ }
+ } elseif ($media['type'] == Post\Media::AUDIO) {
+ $body .= "\n[audio]" . $media['url'] . "[/audio]\n";
+ } elseif ($media['type'] == Post\Media::VIDEO) {
+ $body .= "\n[video]" . $media['url'] . "[/video]\n";
+ }
+ }
+ return $body;
+ }
+
/**
* Create a post (status message or reshare)
*
@@ -3418,7 +3436,7 @@ class Diaspora
$type = "reshare";
} else {
$title = $item["title"];
- $body = $item["body"];
+ $body = self::addAttachments($item);
// Fetch the title from an attached link - if there is one
if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
@@ -3632,7 +3650,7 @@ class Diaspora
$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
}
- $body = $item["body"];
+ $body = self::addAttachments($item);
// The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 13e1d4de2..7ae98f070 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -23,7 +23,6 @@ namespace Friendica\Protocol;
use DOMDocument;
use DOMXPath;
-use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache\Duration;
@@ -673,11 +672,6 @@ class OStatus
$item["body"] .= $add_body;
- // Only add additional data when there is no picture in the post
- if (!strstr($item["body"], '[/img]')) {
- $item["body"] = PageInfo::searchAndAppendToBody($item["body"]);
- }
-
Tag::storeFromBody($item['uri-id'], $item['body']);
// Mastodon Content Warning
@@ -1098,7 +1092,9 @@ class OStatus
if (($item["object-type"] == Activity\ObjectType::QUESTION)
|| ($item["object-type"] == Activity\ObjectType::EVENT)
) {
- $item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
+ Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
+ 'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
+ 'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "ostatus:conversation":
@@ -1125,7 +1121,9 @@ class OStatus
}
$link_data['related'] = $attribute['href'];
} else {
- $item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
+ Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
+ 'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
+ 'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "self":
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 9ce9b0e9f..77611168d 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -54,7 +54,7 @@ class ParseUrl
/**
* Fetch the content type of the given url
* @param string $url URL of the page
- * @return array content type
+ * @return array content type
*/
public static function getContentType(string $url)
{
@@ -197,7 +197,7 @@ class ParseUrl
];
if ($count > 10) {
- Logger::log('Endless loop detected for ' . $url, Logger::DEBUG);
+ Logger::notice('Endless loop detected', ['url' => $url]);
return $siteinfo;
}
@@ -297,7 +297,7 @@ class ParseUrl
// See https://github.com/friendica/friendica/issues/5470#issuecomment-418351211
$charset = str_ireplace('latin-1', 'latin1', $charset);
- Logger::log('detected charset ' . $charset, Logger::DEBUG);
+ Logger::info('detected charset', ['charset' => $charset]);
$body = iconv($charset, 'UTF-8//TRANSLIT', $body);
}
@@ -477,7 +477,7 @@ class ParseUrl
}
}
-// Currently deactivated, see https://github.com/friendica/friendica/pull/10148#issuecomment-821512658
+// Currently deactivated, see https://github.com/friendica/friendica/pull/10148#issuecomment-821512658
// Prevent to have a photo type without an image
// if ($twitter_card && $twitter_image && !empty($siteinfo['image'])) {
// $siteinfo['type'] = 'photo';
@@ -778,7 +778,7 @@ class ParseUrl
case 'QAPage':
case 'RealEstateListing':
case 'SearchResultsPage':
- case 'MediaGallery':
+ case 'MediaGallery':
case 'ImageGallery':
case 'VideoGallery':
case 'RadioEpisode':
@@ -807,7 +807,7 @@ class ParseUrl
case 'PerformingGroup':
case 'DanceGroup';
case 'MusicGroup':
- case 'TheaterGroup':
+ case 'TheaterGroup':
return self::parseJsonLdWebPerson($siteinfo, $jsonld);
case 'AudioObject':
case 'Audio':
diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 8ec833ca6..247552761 100644
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) {
- define('DB_UPDATE_VERSION', 1413);
+ define('DB_UPDATE_VERSION', 1414);
}
return [
@@ -1092,6 +1092,13 @@ return [
"preview-height" => ["type" => "smallint unsigned", "comment" => "Height of the preview picture"],
"preview-width" => ["type" => "smallint unsigned", "comment" => "Width of the preview picture"],
"description" => ["type" => "text", "comment" => ""],
+ "name" => ["type" => "varchar(255)", "comment" => "Name of the media"],
+ "author-url" => ["type" => "varbinary(255)", "comment" => "URL of the author of the media"],
+ "author-name" => ["type" => "varchar(255)", "comment" => "Name of the author of the media"],
+ "author-image" => ["type" => "varbinary(255)", "comment" => "Image of the author of the media"],
+ "publisher-url" => ["type" => "varbinary(255)", "comment" => "URL of the publisher of the media"],
+ "publisher-name" => ["type" => "varchar(255)", "comment" => "Name of the publisher of the media"],
+ "publisher-image" => ["type" => "varbinary(255)", "comment" => "Image of the publisher of the media"],
],
"indexes" => [
"PRIMARY" => ["id"],
@@ -1122,7 +1129,7 @@ return [
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
- "changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
+ "changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""]
],
"indexes" => [
diff --git a/view/templates/content/image.tpl b/view/templates/content/image.tpl
new file mode 100644
index 000000000..6251761dc
--- /dev/null
+++ b/view/templates/content/image.tpl
@@ -0,0 +1,2 @@
+