Merge pull request #12866 from annando/no-attached-data

The function "getAttachedData" has been removed
This commit is contained in:
Hypolite Petovan 2023-03-06 10:06:07 -05:00 committed by GitHub
commit 009c2a122e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 352 additions and 471 deletions

View file

@ -223,15 +223,13 @@ class Item
// select someone by nick in the current network // select someone by nick in the current network
if (!DBA::isResult($contact) && ($network != '')) { if (!DBA::isResult($contact) && ($network != '')) {
$condition = ["`nick` = ? AND `network` = ? AND `uid` = ?", $condition = ['nick' => $name, 'network' => $network, 'uid' => $profile_uid];
$name, $network, $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition); $contact = DBA::selectFirst('contact', $fields, $condition);
} }
// select someone by attag in the current network // select someone by attag in the current network
if (!DBA::isResult($contact) && ($network != '')) { if (!DBA::isResult($contact) && ($network != '')) {
$condition = ["`attag` = ? AND `network` = ? AND `uid` = ?", $condition = ['attag' => $name, 'network' => $network, 'uid' => $profile_uid];
$name, $network, $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition); $contact = DBA::selectFirst('contact', $fields, $condition);
} }
@ -243,13 +241,13 @@ class Item
// select someone by nick in any network // select someone by nick in any network
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
$condition = ["`nick` = ? AND `uid` = ?", $name, $profile_uid]; $condition = ['nick' => $name, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition); $contact = DBA::selectFirst('contact', $fields, $condition);
} }
// select someone by attag in any network // select someone by attag in any network
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
$condition = ["`attag` = ? AND `uid` = ?", $name, $profile_uid]; $condition = ['attag' => $name, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition); $contact = DBA::selectFirst('contact', $fields, $condition);
} }
@ -295,8 +293,10 @@ class Item
$xmlhead = '<?xml version="1.0" encoding="UTF-8" ?>'; $xmlhead = '<?xml version="1.0" encoding="UTF-8" ?>';
if ($this->activity->match($item['verb'], Activity::TAG)) { if ($this->activity->match($item['verb'], Activity::TAG)) {
$fields = ['author-id', 'author-link', 'author-name', 'author-network', $fields = [
'verb', 'object-type', 'resource-id', 'body', 'plink']; 'author-id', 'author-link', 'author-name', 'author-network',
'verb', 'object-type', 'resource-id', 'body', 'plink'
];
$obj = Post::selectFirst($fields, ['uri' => $item['parent-uri']]); $obj = Post::selectFirst($fields, ['uri' => $item['parent-uri']]);
if (!DBA::isResult($obj)) { if (!DBA::isResult($obj)) {
$this->profiler->stopRecording(); $this->profiler->stopRecording();
@ -333,8 +333,8 @@ class Item
default: default:
if ($obj['resource-id']) { if ($obj['resource-id']) {
$post_type = $this->l10n->t('photo'); $post_type = $this->l10n->t('photo');
$m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); preg_match("/\[url=([^]]*)\]/", $obj['body'], $matches);
$rr['plink'] = $m[1]; $rr['plink'] = $matches[1];
} else { } else {
$post_type = $this->l10n->t('status'); $post_type = $this->l10n->t('status');
} }
@ -433,7 +433,8 @@ class Item
} }
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) && if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
in_array($item['network'], Protocol::FEDERATED)) { in_array($item['network'], Protocol::FEDERATED)
) {
$menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1'; $menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1';
} }
} else { } else {
@ -903,11 +904,17 @@ class Item
if ($post['attach']) { if ($post['attach']) {
$post['attach'] .= ','; $post['attach'] .= ',';
} }
$post['attach'] .= Post\Media::getAttachElement($this->baseURL . '/attach/' . $attachment['id'], $post['attach'] .= Post\Media::getAttachElement(
$attachment['filesize'], $attachment['filetype'], $attachment['filename'] ?? ''); $this->baseURL . '/attach/' . $attachment['id'],
$attachment['filesize'],
$attachment['filetype'],
$attachment['filename'] ?? ''
);
$fields = ['allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'], $fields = [
'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']]; 'allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'],
'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']
];
$condition = ['id' => $attachment_id]; $condition = ['id' => $attachment_id];
Attach::update($fields, $condition); Attach::update($fields, $condition);
} }
@ -925,8 +932,9 @@ class Item
// embedded bookmark or attachment in post? set bookmark flag // embedded bookmark or attachment in post? set bookmark flag
$data = BBCode::getAttachmentData($post['body']); $data = BBCode::getAttachmentData($post['body']);
if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || isset($data['type'])) if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || !empty($data['type']))
&& ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)) { && ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)
) {
$post['post-type'] = ItemModel::PT_PAGE; $post['post-type'] = ItemModel::PT_PAGE;
$post['object-type'] = Activity\ObjectType::BOOKMARK; $post['object-type'] = Activity\ObjectType::BOOKMARK;
} }
@ -934,16 +942,6 @@ class Item
// Setting the object type if not defined before // Setting the object type if not defined before
if (empty($post['object-type'])) { if (empty($post['object-type'])) {
$post['object-type'] = ($post['gravity'] == ItemModel::GRAVITY_PARENT) ? Activity\ObjectType::NOTE : Activity\ObjectType::COMMENT; $post['object-type'] = ($post['gravity'] == ItemModel::GRAVITY_PARENT) ? Activity\ObjectType::NOTE : Activity\ObjectType::COMMENT;
$objectdata = BBCode::getAttachedData($post['body']);
if ($objectdata['type'] == 'link') {
$post['object-type'] = Activity\ObjectType::BOOKMARK;
} elseif ($objectdata['type'] == 'video') {
$post['object-type'] = Activity\ObjectType::VIDEO;
} elseif ($objectdata['type'] == 'photo') {
$post['object-type'] = Activity\ObjectType::IMAGE;
}
} }
return $post; return $post;
} }
@ -1039,8 +1037,14 @@ class Item
continue; continue;
} }
$this->emailer->send(new ItemCCEMail($this->app, $this->l10n, $this->baseURL, $this->emailer->send(new ItemCCEMail(
$post, $address, $author['thumb'] ?? '')); $this->app,
$this->l10n,
$this->baseURL,
$post,
$address,
$author['thumb'] ?? ''
));
} }
} }
} }

View file

@ -74,77 +74,6 @@ class BBCode
const PREVIEW_LARGE = 2; const PREVIEW_LARGE = 2;
const PREVIEW_SMALL = 3; const PREVIEW_SMALL = 3;
/**
* Fetches attachment data that were generated the old way
*
* @param string $body Message body
* @return array
* 'type' -> Message type ('link', 'video', 'photo')
* 'text' -> Text before the shared message
* 'after' -> Text after the shared message
* 'image' -> Preview image of the message
* 'url' -> Url to the attached message
* 'title' -> Title of the attachment
* 'description' -> Description of the attachment
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function getOldAttachmentData(string $body): array
{
$post = [];
// Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
if (preg_match_all("(\[class=(.*?)\](.*?)\[\/class\])ism", $body, $attached, PREG_SET_ORDER)) {
foreach ($attached as $data) {
if (!in_array($data[1], ['type-link', 'type-video', 'type-photo'])) {
continue;
}
$post['type'] = substr($data[1], 5);
$pos = strpos($body, $data[0]);
if ($pos > 0) {
$post['text'] = trim(substr($body, 0, $pos));
$post['after'] = trim(substr($body, $pos + strlen($data[0])));
} else {
$post['text'] = trim(str_replace($data[0], '', $body));
$post['after'] = '';
}
$attacheddata = $data[2];
if (preg_match("/\[img\](.*?)\[\/img\]/ism", $attacheddata, $matches)) {
$picturedata = Images::getInfoFromURLCached($matches[1]);
if ($picturedata) {
if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) {
$post['image'] = $matches[1];
} else {
$post['preview'] = $matches[1];
}
}
}
if (preg_match("/\[bookmark\=(.*?)\](.*?)\[\/bookmark\]/ism", $attacheddata, $matches)) {
$post['url'] = $matches[1];
$post['title'] = $matches[2];
}
if (!empty($post['url']) && (in_array($post['type'], ['link', 'video']))
&& preg_match("/\[url\=(.*?)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
$post['url'] = $matches[1];
}
// Search for description
if (preg_match("/\[quote\](.*?)\[\/quote\]/ism", $attacheddata, $matches)) {
$post['description'] = $matches[1];
}
}
}
return $post;
}
/** /**
* Fetches attachment data that were generated with the "attachment" element * Fetches attachment data that were generated with the "attachment" element
* *
@ -178,7 +107,7 @@ class BBCode
if (!preg_match("/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/ism", $body, $match)) { if (!preg_match("/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/ism", $body, $match)) {
DI::profiler()->stopRecording(); DI::profiler()->stopRecording();
return self::getOldAttachmentData($body); return [];
} }
$attributes = $match[2]; $attributes = $match[2];
@ -253,183 +182,6 @@ class BBCode
return $data; return $data;
} }
public static function getAttachedData(string $body, array $item = []): array
{
/*
- text:
- type: link, video, photo
- title:
- url:
- image:
- description:
- (thumbnail)
*/
DI::profiler()->startRecording('rendering');
$has_title = !empty($item['title']);
$plink = $item['plink'] ?? '';
$post = self::getAttachmentData($body);
// Get all linked images with alternative image description
if (preg_match_all("/\[img=(http[^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
if ($id = Photo::getIdForName($picture[1])) {
$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => $picture[2], 'id' => $id];
} else {
$post['remote_images'][] = ['url' => $picture[1], 'description' => $picture[2]];
}
}
if (!empty($post['images']) && !empty($post['images'][0]['description'])) {
$post['image_description'] = $post['images'][0]['description'];
}
}
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
if ($id = Photo::getIdForName($picture[1])) {
$post['images'][] = ['url' => str_replace('-1.', '-0.', $picture[1]), 'description' => '', 'id' => $id];
} else {
$post['remote_images'][] = ['url' => $picture[1], 'description' => ''];
}
}
}
if (!isset($post['type'])) {
$post['text'] = $body;
}
// Simplify image codes
$post['text'] = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $post['text']);
$post['text'] = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $post['text']);
// if nothing is found, it maybe having an image.
if (!isset($post['type'])) {
if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $post['text'], $pictures, PREG_SET_ORDER)) {
if ((count($pictures) == 1) && !$has_title && !Photo::isLocal($pictures[0][2])) {
if (!empty($item['object-type']) && ($item['object-type'] == Activity\ObjectType::IMAGE)) {
// Replace the preview picture with the real picture
$url = str_replace('-1.', '-0.', $pictures[0][2]);
$data = ['url' => $url, 'type' => 'photo'];
} else {
// Checking, if the link goes to a picture
$data = ParseUrl::getSiteinfoCached($pictures[0][1]);
}
// Workaround:
// Sometimes photo posts to the own album are not detected at the start.
// So we seem to cannot use the cache for these cases. That's strange.
if (($data['type'] != 'photo') && strstr($pictures[0][1], '/photos/')) {
$data = ParseUrl::getSiteinfo($pictures[0][1]);
}
if ($data['type'] == 'photo') {
$post['type'] = 'photo';
if (isset($data['images'][0])) {
$post['image'] = $data['images'][0]['src'];
$post['url'] = $data['url'];
} else {
$post['image'] = $data['url'];
}
$post['preview'] = $pictures[0][2];
$post['text'] = trim(str_replace($pictures[0][0], '', $post['text']));
} else {
$imgdata = Images::getInfoFromURLCached($pictures[0][1]);
if (($imgdata) && substr($imgdata['mime'], 0, 6) == 'image/') {
$post['type'] = 'photo';
$post['image'] = $pictures[0][1];
$post['preview'] = $pictures[0][2];
$post['text'] = trim(str_replace($pictures[0][0], '', $post['text']));
}
}
} elseif (count($pictures) > 0) {
if (count($pictures) > 4) {
$post['type'] = 'link';
$post['url'] = $plink;
} else {
$post['type'] = 'photo';
}
$post['image'] = $pictures[0][2];
foreach ($pictures as $picture) {
$post['text'] = trim(str_replace($picture[0], '', $post['text']));
}
}
} elseif (preg_match_all("(\[img\](.*?)\[\/img\])ism", $post['text'], $pictures, PREG_SET_ORDER)) {
if ($has_title) {
$post['type'] = 'link';
$post['url'] = $plink;
} else {
$post['type'] = 'photo';
}
$post['image'] = $pictures[0][1];
foreach ($pictures as $picture) {
$post['text'] = trim(str_replace($picture[0], '', $post['text']));
}
}
// Test for the external links
preg_match_all("(\[url\](.*?)\[\/url\])ism", $post['text'], $links1, PREG_SET_ORDER);
preg_match_all("(\[url\=(.*?)\].*?\[\/url\])ism", $post['text'], $links2, PREG_SET_ORDER);
$links = array_merge($links1, $links2);
// If there is only a single one, then use it.
// This should cover link posts via API.
if ((count($links) == 1) && !isset($post['preview']) && !$has_title) {
$post['type'] = 'link';
$post['url'] = $links[0][1];
}
// Simplify "video" element
$post['text'] = preg_replace('(\[video.*?\ssrc\s?=\s?([^\s\]]+).*?\].*?\[/video\])ism', '[video]$1[/video]', $post['text']);
// Now count the number of external media links
preg_match_all("(\[vimeo\](.*?)\[\/vimeo\])ism", $post['text'], $links1, PREG_SET_ORDER);
preg_match_all("(\[youtube\\](.*?)\[\/youtube\\])ism", $post['text'], $links2, PREG_SET_ORDER);
preg_match_all("(\[video\\](.*?)\[\/video\\])ism", $post['text'], $links3, PREG_SET_ORDER);
preg_match_all("(\[audio\\](.*?)\[\/audio\\])ism", $post['text'], $links4, PREG_SET_ORDER);
// Add them to the other external links
$links = array_merge($links, $links1, $links2, $links3, $links4);
// Are there more than one?
if (count($links) > 1) {
// The post will be the type "text", which means a blog post
unset($post['type']);
$post['url'] = $plink;
}
if (!isset($post['type'])) {
$post['type'] = 'text';
}
if (($post['type'] == 'photo') && empty($post['images']) && !empty($post['remote_images'])) {
$post['images'] = $post['remote_images'];
$post['image'] = $post['images'][0]['url'];
if (!empty($post['images']) && !empty($post['images'][0]['description'])) {
$post['image_description'] = $post['images'][0]['description'];
}
}
unset($post['remote_images']);
} elseif (isset($post['url']) && ($post['type'] == 'video')) {
$data = ParseUrl::getSiteinfoCached($post['url']);
if (isset($data['images'][0])) {
$post['image'] = $data['images'][0]['src'];
}
} elseif (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $post['text'], $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
$post['text'] = trim(str_replace($picture[0], '', $post['text']));
}
}
DI::profiler()->stopRecording();
return $post;
}
/** /**
* Remove [attachment] BBCode and replaces it with a regular [url] * Remove [attachment] BBCode and replaces it with a regular [url]
* *
@ -439,7 +191,8 @@ class BBCode
*/ */
public static function replaceAttachment(string $body, bool $no_link_desc = false): string public static function replaceAttachment(string $body, bool $no_link_desc = false): string
{ {
return preg_replace_callback("/\s*\[attachment (.*?)\](.*?)\[\/attachment\]\s*/ism", return preg_replace_callback(
"/\s*\[attachment (.*?)\](.*?)\[\/attachment\]\s*/ism",
function ($match) use ($body, $no_link_desc) { function ($match) use ($body, $no_link_desc) {
$attach_data = self::getAttachmentData($match[0]); $attach_data = self::getAttachmentData($match[0]);
if (empty($attach_data['url'])) { if (empty($attach_data['url'])) {
@ -451,7 +204,9 @@ class BBCode
} else { } else {
return " \n[url=" . $attach_data['url'] . ']' . $attach_data['title'] . "[/url]\n"; return " \n[url=" . $attach_data['url'] . ']' . $attach_data['title'] . "[/url]\n";
} }
}, $body); },
$body
);
} }
/** /**
@ -956,8 +711,11 @@ class BBCode
// We're depending on the property of 'foreach' (specified on the PHP website) that // We're depending on the property of 'foreach' (specified on the PHP website) that
// it loops over the array starting from the first element and going sequentially // it loops over the array starting from the first element and going sequentially
// to the last element // to the last element
$newbody = str_replace('[$#saved_image' . $cnt . '#$]', $newbody = str_replace(
'<img src="' . self::proxyUrl($image, self::INTERNAL, $uriid) . '" alt="' . DI::l10n()->t('Image/photo') . '" />', $newbody); '[$#saved_image' . $cnt . '#$]',
'<img src="' . self::proxyUrl($image, self::INTERNAL, $uriid) . '" alt="' . DI::l10n()->t('Image/photo') . '" />',
$newbody
);
$cnt++; $cnt++;
} }
@ -1112,8 +870,7 @@ class BBCode
$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8'); $attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
} }
$img_str = '<img src="' . $img_str = '<img src="' . self::proxyUrl($match[2], $simplehtml, $uriid) . '"';
self::proxyUrl($match[2], $simplehtml, $uriid) . '"';
foreach ($attributes as $key => $value) { foreach ($attributes as $key => $value) {
if (!empty($value)) { if (!empty($value)) {
$img_str .= ' ' . $key . '="' . htmlspecialchars($value, ENT_COMPAT) . '"'; $img_str .= ' ' . $key . '="' . htmlspecialchars($value, ENT_COMPAT) . '"';
@ -1500,8 +1257,7 @@ class BBCode
* $match[1] = $url * $match[1] = $url
* $match[2] = $title or absent * $match[2] = $title or absent
*/ */
$try_oembed_callback = function (array $match) $try_oembed_callback = function (array $match) {
{
$url = $match[1]; $url = $match[1];
$title = $match[2] ?? ''; $title = $match[2] ?? '';
@ -1554,18 +1310,22 @@ class BBCode
} }
// Remove linefeeds inside of the table elements. See issue #6799 // Remove linefeeds inside of the table elements. See issue #6799
$search = ["\n[th]", "[th]\n", " [th]", "\n[/th]", "[/th]\n", "[/th] ", $search = [
"\n[th]", "[th]\n", " [th]", "\n[/th]", "[/th]\n", "[/th] ",
"\n[td]", "[td]\n", " [td]", "\n[/td]", "[/td]\n", "[/td] ", "\n[td]", "[td]\n", " [td]", "\n[/td]", "[/td]\n", "[/td] ",
"\n[tr]", "[tr]\n", " [tr]", "[tr] ", "\n[/tr]", "[/tr]\n", " [/tr]", "[/tr] ", "\n[tr]", "[tr]\n", " [tr]", "[tr] ", "\n[/tr]", "[/tr]\n", " [/tr]", "[/tr] ",
"\n[hr]", "[hr]\n", " [hr]", "[hr] ", "\n[hr]", "[hr]\n", " [hr]", "[hr] ",
"\n[attachment ", " [attachment ", "\n[/attachment]", "[/attachment]\n", " [/attachment]", "[/attachment] ", "\n[attachment ", " [attachment ", "\n[/attachment]", "[/attachment]\n", " [/attachment]", "[/attachment] ",
"[table]\n", "[table] ", " [table]", "\n[/table]", " [/table]", "[/table] "]; "[table]\n", "[table] ", " [table]", "\n[/table]", " [/table]", "[/table] "
$replace = ["[th]", "[th]", "[th]", "[/th]", "[/th]", "[/th]", ];
$replace = [
"[th]", "[th]", "[th]", "[/th]", "[/th]", "[/th]",
"[td]", "[td]", "[td]", "[/td]", "[/td]", "[/td]", "[td]", "[td]", "[td]", "[/td]", "[/td]", "[/td]",
"[tr]", "[tr]", "[tr]", "[tr]", "[/tr]", "[/tr]", "[/tr]", "[/tr]", "[tr]", "[tr]", "[tr]", "[tr]", "[/tr]", "[/tr]", "[/tr]", "[/tr]",
"[hr]", "[hr]", "[hr]", "[hr]", "[hr]", "[hr]", "[hr]", "[hr]",
"[attachment ", "[attachment ", "[/attachment]", "[/attachment]", "[/attachment]", "[/attachment]", "[attachment ", "[attachment ", "[/attachment]", "[/attachment]", "[/attachment]", "[/attachment]",
"[table]", "[table]", "[table]", "[/table]", "[/table]", "[/table]"]; "[table]", "[table]", "[table]", "[/table]", "[/table]", "[/table]"
];
do { do {
$oldtext = $text; $oldtext = $text;
$text = str_replace($search, $replace, $text); $text = str_replace($search, $replace, $text);
@ -1581,10 +1341,14 @@ class BBCode
// removing multiplicated newlines // removing multiplicated newlines
if (DI::config()->get('system', 'remove_multiplicated_lines')) { if (DI::config()->get('system', 'remove_multiplicated_lines')) {
$search = ["\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[*]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n", $search = [
"\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n"]; "\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[*]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
$replace = ["\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[*]", "[ul]", "[/ul]", "\n[share ", "[/attachment]", "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n"
"[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]"]; ];
$replace = [
"\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[*]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
"[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]"
];
do { do {
$oldtext = $text; $oldtext = $text;
$text = str_replace($search, $replace, $text); $text = str_replace($search, $replace, $text);
@ -1751,9 +1515,11 @@ class BBCode
// handle nested quotes // handle nested quotes
$endlessloop = 0; $endlessloop = 0;
while ((strpos($text, "[/spoiler]") !== false) && (strpos($text, "[spoiler=") !== false) && (++$endlessloop < 20)) { while ((strpos($text, "[/spoiler]") !== false) && (strpos($text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
$text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", $text = preg_replace(
"/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
'<details class="spoiler"><summary>$1</summary>$2</details>', '<details class="spoiler"><summary>$1</summary>$2</details>',
$text); $text
);
} }
// Declare the format for [quote] layout // Declare the format for [quote] layout
@ -1773,9 +1539,11 @@ class BBCode
// handle nested quotes // handle nested quotes
$endlessloop = 0; $endlessloop = 0;
while ((strpos($text, "[/quote]") !== false) && (strpos($text, "[quote=") !== false) && (++$endlessloop < 20)) { while ((strpos($text, "[/quote]") !== false) && (strpos($text, "[quote=") !== false) && (++$endlessloop < 20)) {
$text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", $text = preg_replace(
"/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
"<p><strong class=" . '"author"' . ">" . $t_wrote . "</strong></p><blockquote>$2</blockquote>", "<p><strong class=" . '"author"' . ">" . $t_wrote . "</strong></p><blockquote>$2</blockquote>",
$text); $text
);
} }
@ -1796,13 +1564,15 @@ class BBCode
$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $text); $text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $text);
$text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$3" style="width: $1px;" >', $text); $text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$3" style="width: $1px;" >', $text);
$text = preg_replace_callback("/\[img\=(.*?)\](.*?)\[\/img\]/ism", $text = preg_replace_callback(
"/\[img\=(.*?)\](.*?)\[\/img\]/ism",
function ($matches) use ($simple_html, $uriid) { function ($matches) use ($simple_html, $uriid) {
$matches[1] = self::proxyUrl($matches[1], $simple_html, $uriid); $matches[1] = self::proxyUrl($matches[1], $simple_html, $uriid);
$matches[2] = htmlspecialchars($matches[2], ENT_COMPAT); $matches[2] = htmlspecialchars($matches[2], ENT_COMPAT);
return '<img src="' . $matches[1] . '" alt="' . $matches[2] . '" title="' . $matches[2] . '">'; return '<img src="' . $matches[1] . '" alt="' . $matches[2] . '" title="' . $matches[2] . '">';
}, },
$text); $text
);
// Images // Images
// [img]pathtoimage[/img] // [img]pathtoimage[/img]
@ -1833,20 +1603,32 @@ class BBCode
if ($try_oembed) { if ($try_oembed) {
// html5 video and audio // html5 video and audio
$text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4).*?)\[\/video\]/ism", $text = preg_replace(
'<video src="$1" controls width="100%" height="auto"><a href="$1">$1</a></video>', $text); "/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4).*?)\[\/video\]/ism",
'<video src="$1" controls width="100%" height="auto"><a href="$1">$1</a></video>',
$text
);
$text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", $try_oembed_callback, $text); $text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", $try_oembed_callback, $text);
$text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", $try_oembed_callback, $text); $text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", $try_oembed_callback, $text);
$text = preg_replace("/\[video\](.*?)\[\/video\]/ism", $text = preg_replace(
'<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>', $text); "/\[video\](.*?)\[\/video\]/ism",
'<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>',
$text
);
$text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls><a href="$1">$1</a></audio>', $text); $text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls><a href="$1">$1</a></audio>', $text);
} else { } else {
$text = preg_replace("/\[video\](.*?)\[\/video\]/ism", $text = preg_replace(
'<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>', $text); "/\[video\](.*?)\[\/video\]/ism",
$text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>',
'<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>', $text); $text
);
$text = preg_replace(
"/\[audio\](.*?)\[\/audio\]/ism",
'<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>',
$text
);
} }
// Backward compatibility, [iframe] support has been removed in version 2020.12 // Backward compatibility, [iframe] support has been removed in version 2020.12
@ -1868,8 +1650,11 @@ class BBCode
if ($try_oembed) { if ($try_oembed) {
$text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->getThemeInfoValue('videowidth') . '" height="' . $a->getThemeInfoValue('videoheight') . '" src="https://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $text); $text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->getThemeInfoValue('videowidth') . '" height="' . $a->getThemeInfoValue('videoheight') . '" src="https://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $text);
} else { } else {
$text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", $text = preg_replace(
'<a href="https://www.youtube.com/watch?v=$1" target="_blank" rel="noopener noreferrer">https://www.youtube.com/watch?v=$1</a>', $text); "/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
'<a href="https://www.youtube.com/watch?v=$1" target="_blank" rel="noopener noreferrer">https://www.youtube.com/watch?v=$1</a>',
$text
);
} }
if ($try_oembed) { if ($try_oembed) {
@ -1883,8 +1668,11 @@ class BBCode
if ($try_oembed) { if ($try_oembed) {
$text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->getThemeInfoValue('videowidth') . '" height="' . $a->getThemeInfoValue('videoheight') . '" src="https://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $text); $text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->getThemeInfoValue('videowidth') . '" height="' . $a->getThemeInfoValue('videoheight') . '" src="https://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $text);
} else { } else {
$text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", $text = preg_replace(
'<a href="https://vimeo.com/$1" target="_blank" rel="noopener noreferrer">https://vimeo.com/$1</a>', $text); "/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
'<a href="https://vimeo.com/$1" target="_blank" rel="noopener noreferrer">https://vimeo.com/$1</a>',
$text
);
} }
// oembed tag // oembed tag
@ -1920,27 +1708,39 @@ class BBCode
// Handle mentions and hashtag links // Handle mentions and hashtag links
if ($simple_html == self::DIASPORA) { if ($simple_html == self::DIASPORA) {
// The ! is converted to @ since Diaspora only understands the @ // The ! is converted to @ since Diaspora only understands the @
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace(
"/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'@<a href="$2">$3</a>', '@<a href="$2">$3</a>',
$text); $text
);
} elseif (in_array($simple_html, [self::OSTATUS, self::ACTIVITYPUB])) { } elseif (in_array($simple_html, [self::OSTATUS, self::ACTIVITYPUB])) {
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace(
"/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<span class="h-card"><a href="$2" class="u-url mention">$1<span>$3</span></a></span>', '<span class="h-card"><a href="$2" class="u-url mention">$1<span>$3</span></a></span>',
$text); $text
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism", );
$text = preg_replace(
"/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a href="$2" class="mention hashtag" rel="tag">$1<span>$3</span></a>', '<a href="$2" class="mention hashtag" rel="tag">$1<span>$3</span></a>',
$text); $text
);
} elseif (in_array($simple_html, [self::INTERNAL, self::EXTERNAL, self::TWITTER_API])) { } elseif (in_array($simple_html, [self::INTERNAL, self::EXTERNAL, self::TWITTER_API])) {
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace(
"/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>', '<bdi>$1<a href="$2" class="userinfo mention" title="$3">$3</a></bdi>',
$text); $text
);
} elseif ($simple_html == self::MASTODON_API) { } elseif ($simple_html == self::MASTODON_API) {
$text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", $text = preg_replace(
"/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="u-url mention status-link" href="$2" rel="nofollow noopener noreferrer" target="_blank" title="$3">$1<span>$3</span></a>', '<a class="u-url mention status-link" href="$2" rel="nofollow noopener noreferrer" target="_blank" title="$3">$1<span>$3</span></a>',
$text); $text
$text = preg_replace("/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism", );
$text = preg_replace(
"/([#])\[url\=(.*?)\](.*?)\[\/url\]/ism",
'<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>', '<a class="mention hashtag status-link" href="$2" rel="tag">$1<span>$3</span></a>',
$text); $text
);
} else { } else {
$text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text); $text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
} }
@ -1958,8 +1758,11 @@ class BBCode
// Bookmarks in red - will be converted to bookmarks in friendica // Bookmarks in red - will be converted to bookmarks in friendica
$text = preg_replace("/#\^\[url\](.*?)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text); $text = preg_replace("/#\^\[url\](.*?)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $text);
$text = preg_replace("/#\^\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text); $text = preg_replace("/#\^\[url\=(.*?)\](.*?)\[\/url\]/ism", '[bookmark=$1]$2[/bookmark]', $text);
$text = preg_replace("/#\[url\=.*?\]\^\[\/url\]\[url\=(.*?)\](.*?)\[\/url\]/i", $text = preg_replace(
"[bookmark=$1]$2[/bookmark]", $text); "/#\[url\=.*?\]\^\[\/url\]\[url\=(.*?)\](.*?)\[\/url\]/i",
"[bookmark=$1]$2[/bookmark]",
$text
);
if (in_array($simple_html, [self::OSTATUS, self::TWITTER])) { if (in_array($simple_html, [self::OSTATUS, self::TWITTER])) {
$text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", [self::class, 'expandLinksCallback'], $text); $text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", [self::class, 'expandLinksCallback'], $text);
@ -1979,14 +1782,16 @@ class BBCode
"&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi", "&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) { function ($match) {
return "[url=" . DI::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]"; return "[url=" . DI::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]";
}, $text },
$text
); );
$text = preg_replace_callback( $text = preg_replace_callback(
"&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi", "&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
function ($match) { function ($match) {
return "[url=" . DI::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]"; return "[url=" . DI::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
}, $text },
$text
); );
// Server independent link to posts and comments // Server independent link to posts and comments
@ -2049,10 +1854,15 @@ class BBCode
// sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails) // sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
$allowed_src_protocols = ['//', 'http://', 'https://', 'contact/redir/', 'cid:']; $allowed_src_protocols = ['//', 'http://', 'https://', 'contact/redir/', 'cid:'];
array_walk($allowed_src_protocols, function(&$value) { $value = preg_quote($value, '#');}); array_walk($allowed_src_protocols, function (&$value) {
$value = preg_quote($value, '#');
});
$text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism', $text = preg_replace(
'<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . DI::l10n()->t('Invalid source protocol') . '">', $text); '#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
'<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . DI::l10n()->t('Invalid source protocol') . '">',
$text
);
// sanitize href attributes (only allowlisted protocols URLs) // sanitize href attributes (only allowlisted protocols URLs)
// default value for backward compatibility // default value for backward compatibility
@ -2064,7 +1874,9 @@ class BBCode
$allowed_link_protocols[] = 'https://'; $allowed_link_protocols[] = 'https://';
$allowed_link_protocols[] = 'contact/redir/'; $allowed_link_protocols[] = 'contact/redir/';
array_walk($allowed_link_protocols, function(&$value) { $value = preg_quote($value, '#');}); array_walk($allowed_link_protocols, function (&$value) {
$value = preg_quote($value, '#');
});
$regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
$text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 data-original-href="$3" class="invalid-href" title="' . DI::l10n()->t('Invalid link protocol') . '">', $text); $text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 data-original-href="$3" class="invalid-href" title="' . DI::l10n()->t('Invalid link protocol') . '">', $text);
@ -2074,7 +1886,8 @@ class BBCode
$text, $text,
function (array $attributes, array $author_contact, $content, $is_quote_share) use ($simple_html) { function (array $attributes, array $author_contact, $content, $is_quote_share) use ($simple_html) {
return self::convertShareCallback($attributes, $author_contact, $content, $is_quote_share, $simple_html); return self::convertShareCallback($attributes, $author_contact, $content, $is_quote_share, $simple_html);
}, $uriid },
$uriid
); );
$text = self::interpolateSavedImagesIntoItemBody($uriid, $text, $saved_image); $text = self::interpolateSavedImagesIntoItemBody($uriid, $text, $saved_image);
@ -2095,7 +1908,8 @@ class BBCode
return $text; return $text;
}); // Escaped code }); // Escaped code
$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism", $text = preg_replace_callback(
"#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism",
function ($matches) { function ($matches) {
if (strpos($matches[2], "\n") !== false) { if (strpos($matches[2], "\n") !== false) {
$return = '<pre><code class="language-' . trim($matches[1]) . '">' . htmlentities(trim($matches[2], "\n\r"), ENT_NOQUOTES, 'UTF-8') . '</code></pre>'; $return = '<pre><code class="language-' . trim($matches[1]) . '">' . htmlentities(trim($matches[2], "\n\r"), ENT_NOQUOTES, 'UTF-8') . '</code></pre>';
@ -2225,7 +2039,8 @@ class BBCode
* Transform #tags, strip off the [url] and replace spaces with underscore * Transform #tags, strip off the [url] and replace spaces with underscore
*/ */
$url_search_string = "^\[\]"; $url_search_string = "^\[\]";
$text = preg_replace_callback("/#\[url\=([$url_search_string]*)\](.*?)\[\/url\]/i", $text = preg_replace_callback(
"/#\[url\=([$url_search_string]*)\](.*?)\[\/url\]/i",
function ($matches) { function ($matches) {
return '#' . str_replace(' ', '_', $matches[2]); return '#' . str_replace(' ', '_', $matches[2]);
}, },
@ -2360,7 +2175,8 @@ class BBCode
*/ */
public static function expandTags(string $body): string public static function expandTags(string $body): string
{ {
return preg_replace_callback("/(?<=\W|^)([!#@])([^\^ \x0D\x0A,;:?'\"]*[^\^ \x0D\x0A,;:?!'\".])/", return preg_replace_callback(
"/(?<=\W|^)([!#@])([^\^ \x0D\x0A,;:?'\"]*[^\^ \x0D\x0A,;:?!'\".])/",
function (array $match) { function (array $match) {
switch ($match[1]) { switch ($match[1]) {
case '!': case '!':
@ -2377,7 +2193,9 @@ class BBCode
default: default:
return $match[1] . '[url=' . DI::baseUrl() . '/search?tag=' . $match[2] . ']' . $match[2] . '[/url]'; return $match[1] . '[url=' . DI::baseUrl() . '/search?tag=' . $match[2] . ']' . $match[2] . '[/url]';
} }
}, $body); },
$body
);
} }
/** /**

View file

@ -122,14 +122,17 @@ class Plaintext
$body = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $item['body']); $body = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $item['body']);
// Add an URL element if the text contains a raw link // Add an URL element if the text contains a raw link
$body = preg_replace('/([^\]\=\'"]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism', $body = preg_replace(
'$1[url]$2[/url]', $body); '/([^\]\=\'"]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism',
'$1[url]$2[/url]',
$body
);
// Remove the abstract // Remove the abstract
$body = BBCode::stripAbstract($body); $body = BBCode::stripAbstract($body);
// At first look at data that is attached via "type-..." stuff // At first look at data that is attached via "type-..." stuff
$post = BBCode::getAttachedData($body, $item); $post = BBCode::getAttachmentData($body, $item);
if (($item['title'] != '') && ($post['text'] != '')) { if (($item['title'] != '') && ($post['text'] != '')) {
$post['text'] = trim($item['title'] . "\n\n" . $post['text']); $post['text'] = trim($item['title'] . "\n\n" . $post['text']);

View file

@ -39,44 +39,39 @@ class Card extends BaseFactory
*/ */
public function createFromUriId(int $uriId, array $history = []): \Friendica\Object\Api\Mastodon\Card public function createFromUriId(int $uriId, array $history = []): \Friendica\Object\Api\Mastodon\Card
{ {
$item = Post::selectFirst(['body'], ['uri-id' => $uriId]); $media = Post\Media::getByURIId($uriId, [Post\Media::HTML]);
if (!empty($item['body'])) { if (empty($media) || (empty($media[0]['description']) && empty($media[0]['image']) && empty($media[0]['preview']))) {
$data = BBCode::getAttachmentData($item['body']); return new \Friendica\Object\Api\Mastodon\Card([], $history);
} else {
$data = [];
} }
foreach (Post\Media::getByURIId($uriId, [Post\Media::HTML]) as $attached) { $parts = parse_url($media[0]['url']);
if ((empty($data['url']) || Strings::compareLink($data['url'], $attached['url'])) &&
(!empty($attached['description']) || !empty($attached['image']) || !empty($attached['preview']))) {
$parts = parse_url($attached['url']);
if (!empty($parts['scheme']) && !empty($parts['host'])) { if (!empty($parts['scheme']) && !empty($parts['host'])) {
if (empty($attached['publisher-name'])) { if (empty($media[0]['publisher-name'])) {
$attached['publisher-name'] = $parts['host']; $media[0]['publisher-name'] = $parts['host'];
} }
if (empty($attached['publisher-url']) || empty(parse_url($attached['publisher-url'], PHP_URL_SCHEME))) { if (empty($media[0]['publisher-url']) || empty(parse_url($media[0]['publisher-url'], PHP_URL_SCHEME))) {
$attached['publisher-url'] = $parts['scheme'] . '://' . $parts['host']; $media[0]['publisher-url'] = $parts['scheme'] . '://' . $parts['host'];
if (!empty($parts['port'])) { if (!empty($parts['port'])) {
$attached['publisher-url'] .= ':' . $parts['port']; $media[0]['publisher-url'] .= ':' . $parts['port'];
} }
} }
} }
$data['url'] = $attached['url']; $data = [];
$data['title'] = $attached['name'];
$data['description'] = $attached['description']; $data['url'] = $media[0]['url'];
$data['title'] = $media[0]['name'];
$data['description'] = $media[0]['description'];
$data['type'] = 'link'; $data['type'] = 'link';
$data['author_name'] = $attached['author-name']; $data['author_name'] = $media[0]['author-name'];
$data['author_url'] = $attached['author-url']; $data['author_url'] = $media[0]['author-url'];
$data['provider_name'] = $attached['publisher-name']; $data['provider_name'] = $media[0]['publisher-name'];
$data['provider_url'] = $attached['publisher-url']; $data['provider_url'] = $media[0]['publisher-url'];
$data['image'] = $attached['preview']; $data['image'] = $media[0]['preview'];
$data['width'] = $attached['preview-width']; $data['width'] = $media[0]['preview-width'];
$data['height'] = $attached['preview-height']; $data['height'] = $media[0]['preview-height'];
$data['blurhash'] = $attached['blurhash']; $data['blurhash'] = $media[0]['blurhash'];
}
}
return new \Friendica\Object\Api\Mastodon\Card($data, $history); return new \Friendica\Object\Api\Mastodon\Card($data, $history);
} }

View file

@ -162,8 +162,10 @@ class Media
*/ */
public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string
{ {
$media = self::fetchAdditionalData(['type' => self::DOCUMENT, 'url' => $href, $media = self::fetchAdditionalData([
'size' => $length, 'mimetype' => $type, 'description' => $title]); 'type' => self::DOCUMENT, 'url' => $href,
'size' => $length, 'mimetype' => $type, 'description' => $title
]);
return '[attach]href="' . $media['url'] . '" length="' . $media['size'] . return '[attach]href="' . $media['url'] . '" length="' . $media['size'] .
'" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]'; '" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]';
@ -263,8 +265,10 @@ class Media
return $media; return $media;
} }
if (!empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) && if (
parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)) { !empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) &&
parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)
) {
Logger::debug('Not a link to an activity', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]); Logger::debug('Not a link to an activity', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]);
return $media; return $media;
} }
@ -483,8 +487,10 @@ class Media
} }
$body = str_replace($picture[0], '', $body); $body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]); $image = str_replace('-1.', '-0.', $picture[2]);
$attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, $attachments[$image] = [
'preview' => $picture[2], 'description' => $picture[3]]; 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => $picture[3]
];
} }
} }
@ -502,8 +508,10 @@ class Media
} }
$body = str_replace($picture[0], '', $body); $body = str_replace($picture[0], '', $body);
$image = str_replace('-1.', '-0.', $picture[2]); $image = str_replace('-1.', '-0.', $picture[2]);
$attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, $attachments[$image] = [
'preview' => $picture[2], 'description' => null]; 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image,
'preview' => $picture[2], 'description' => null
];
} }
} }
@ -803,8 +811,10 @@ class Media
continue; continue;
} }
if (in_array($medium['type'], [self::AUDIO, self::IMAGE]) || if (
in_array($filetype, ['audio', 'image'])) { in_array($medium['type'], [self::AUDIO, self::IMAGE]) ||
in_array($filetype, ['audio', 'image'])
) {
$attachments['visual'][] = $medium; $attachments['visual'][] = $medium;
} elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) { } elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) {
if (!empty($medium['height'])) { if (!empty($medium['height'])) {
@ -896,6 +906,13 @@ class Media
return $body; return $body;
} }
/**
* Add an [attachment] element to the body for a given uri-id with a HTML media element
*
* @param integer $uriid
* @param string $body
* @return string
*/
public static function addHTMLAttachmentToBody(int $uriid, string $body): string public static function addHTMLAttachmentToBody(int $uriid, string $body): string
{ {
if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) { if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
@ -929,6 +946,13 @@ class Media
return $body; return $body;
} }
/**
* Add a link to the body for a given uri-id with a HTML media element
*
* @param integer $uriid
* @param string $body
* @return string
*/
public static function addHTMLLinkToBody(int $uriid, string $body): string public static function addHTMLLinkToBody(int $uriid, string $body): string
{ {
$links = self::getByURIId($uriid, [self::HTML]); $links = self::getByURIId($uriid, [self::HTML]);
@ -947,6 +971,12 @@ class Media
} }
} }
/**
* Add an [attachment] element to the body and a link to raw-body for a given uri-id with a HTML media element
*
* @param array $item
* @return array
*/
public static function addHTMLAttachmentToItem(array $item): array public static function addHTMLAttachmentToItem(array $item): array
{ {
if (($item['gravity'] == Item::GRAVITY_ACTIVITY) || empty($item['uri-id'])) { if (($item['gravity'] == Item::GRAVITY_ACTIVITY) || empty($item['uri-id'])) {

View file

@ -83,14 +83,21 @@ class Diaspora
return $contacts; return $contacts;
} }
$items = Post::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'], $items = Post::select(
['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]); ['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
);
while ($item = Post::fetch($items)) { while ($item = Post::fetch($items)) {
$contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'], $contact = DBA::selectFirst(
['id' => $item['author-id']]); 'contact',
if (!DBA::isResult($contact) || empty($contact['batch']) || ['id', 'url', 'name', 'protocol', 'batch', 'network'],
['id' => $item['author-id']]
);
if (
!DBA::isResult($contact) || empty($contact['batch']) ||
($contact['network'] != Protocol::DIASPORA) || ($contact['network'] != Protocol::DIASPORA) ||
Strings::compareLink($item['parent-author-link'], $item['author-link'])) { Strings::compareLink($item['parent-author-link'], $item['author-link'])
) {
continue; continue;
} }
@ -719,7 +726,8 @@ class Diaspora
$signed_data .= $entry; $signed_data .= $entry;
} }
if (!in_array($fieldname, ['parent_author_signature', 'target_author_signature']) if (
!in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
|| ($orig_type == 'relayable_retraction') || ($orig_type == 'relayable_retraction')
) { ) {
XML::copy($entry, $fields, $fieldname); XML::copy($entry, $fields, $fieldname);
@ -1185,9 +1193,11 @@ class Diaspora
*/ */
private static function parentItem(int $uid, string $guid, WebFingerUri $author, array $contact) private static function parentItem(int $uid, string $guid, WebFingerUri $author, array $contact)
{ {
$fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin', $fields = [
'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
'author-name', 'author-link', 'author-avatar', 'gravity', 'author-name', 'author-link', 'author-avatar', 'gravity',
'owner-name', 'owner-link', 'owner-avatar']; 'owner-name', 'owner-link', 'owner-avatar'
];
$condition = ['uid' => $uid, 'guid' => $guid]; $condition = ['uid' => $uid, 'guid' => $guid];
$item = Post::selectFirst($fields, $condition); $item = Post::selectFirst($fields, $condition);
@ -1472,7 +1482,6 @@ class Diaspora
$contact = DI::dsprContact()->getByUrl(new Uri($match[3])); $contact = DI::dsprContact()->getByUrl(new Uri($match[3]));
Tag::storeByHash($uriid, $match[1], $contact->name ?: $contact->nick, $contact->url); Tag::storeByHash($uriid, $match[1], $contact->name ?: $contact->nick, $contact->url);
} catch (\Throwable $e) { } catch (\Throwable $e) {
} }
} }
} }
@ -2013,8 +2022,10 @@ class Diaspora
Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]); Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
// Send all existing comments and likes to the requesting server // Send all existing comments and likes to the requesting server
$comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'], $comments = Post::select(
['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]); ['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
);
while ($comment = Post::fetch($comments)) { while ($comment = Post::fetch($comments)) {
if (($comment['gravity'] == Item::GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) { if (($comment['gravity'] == Item::GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) {
Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]); Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]);
@ -2136,10 +2147,12 @@ class Diaspora
$birthday = $contact['bd']; $birthday = $contact['bd'];
} }
$fields = ['name' => $name, 'location' => $location, $fields = [
'name' => $name, 'location' => $location,
'name-date' => DateTimeFormat::utcNow(), 'about' => $about, 'name-date' => DateTimeFormat::utcNow(), 'about' => $about,
'addr' => $author->getAddr(), 'nick' => $author->getUser(), 'keywords' => $keywords, 'addr' => $author->getAddr(), 'nick' => $author->getUser(), 'keywords' => $keywords,
'unsearchable' => !$searchable, 'sensitive' => $nsfw]; 'unsearchable' => !$searchable, 'sensitive' => $nsfw
];
if (!empty($birthday)) { if (!empty($birthday)) {
$fields['bd'] = $birthday; $fields['bd'] = $birthday;
@ -2931,7 +2944,6 @@ class Diaspora
$target = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr'])); $target = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']));
$dest_url = $public_batch ? $target->batch : $target->notify; $dest_url = $public_batch ? $target->batch : $target->notify;
} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) { } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
} }
if (empty($dest_url)) { if (empty($dest_url)) {
@ -3012,7 +3024,6 @@ class Diaspora
try { try {
$pubkey = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']))->pubKey; $pubkey = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']))->pubKey;
} catch (HTTPException\NotFoundException | \InvalidArgumentException $e) { } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
} }
} else { } else {
// The "addr" field should always be filled. // The "addr" field should always be filled.
@ -3058,8 +3069,10 @@ class Diaspora
// If the item belongs to a user, we take this user id. // If the item belongs to a user, we take this user id.
if ($item['uid'] == 0) { if ($item['uid'] == 0) {
// @todo Possibly use an administrator account? // @todo Possibly use an administrator account?
$condition = ['verified' => true, 'blocked' => false, $condition = [
'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON]; 'verified' => true, 'blocked' => false,
'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON
];
$first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]); $first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
$owner = User::getOwnerDataById($first_user['uid']); $owner = User::getOwnerDataById($first_user['uid']);
} else { } else {
@ -3330,9 +3343,9 @@ class Diaspora
// Fetch the title from an attached link - if there is one // Fetch the title from an attached link - if there is one
if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) { if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
$page_data = BBCode::getAttachmentData($item['body']); $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::HTML]);
if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) { if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
$title = $page_data['title']; $title = $media[0]['name'];
} }
} }
@ -3388,9 +3401,11 @@ class Diaspora
if (count($event)) { if (count($event)) {
$message['event'] = $event; $message['event'] = $event;
if (!empty($event['location']['address']) && if (
!empty($event['location']['address']) &&
!empty($event['location']['lat']) && !empty($event['location']['lat']) &&
!empty($event['location']['lng'])) { !empty($event['location']['lng'])
) {
$message['location'] = $event['location']; $message['location'] = $event['location'];
} }
@ -3453,7 +3468,8 @@ class Diaspora
private static function prependParentAuthorMention(string $body, string $profile_url): string private static function prependParentAuthorMention(string $body, string $profile_url): string
{ {
$profile = Contact::getByURL($profile_url, false, ['addr', 'name']); $profile = Contact::getByURL($profile_url, false, ['addr', 'name']);
if (!empty($profile['addr']) if (
!empty($profile['addr'])
&& !strstr($body, $profile['addr']) && !strstr($body, $profile['addr'])
&& !strstr($body, $profile_url) && !strstr($body, $profile_url)
) { ) {

View file

@ -384,8 +384,10 @@ class Feed
} }
if (!$dryRun) { if (!$dryRun) {
$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)", $condition = [
$importer['uid'], $item['uri'], Protocol::FEED, Protocol::DFRN]; "`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
$importer['uid'], $item['uri'], Protocol::FEED, Protocol::DFRN
];
$previous = Post::selectFirst(['id', 'created'], $condition); $previous = Post::selectFirst(['id', 'created'], $condition);
if (DBA::isResult($previous)) { if (DBA::isResult($previous)) {
// Use the creation date when the post had been stored. It can happen this date changes in the feed. // Use the creation date when the post had been stored. It can happen this date changes in the feed.
@ -644,8 +646,10 @@ class Feed
if (!$notify) { if (!$notify) {
Post\Delayed::publish($item, $notify, $taglist, $attachments); Post\Delayed::publish($item, $notify, $taglist, $attachments);
} else { } else {
$postings[] = ['item' => $item, 'notify' => $notify, $postings[] = [
'taglist' => $taglist, 'attachments' => $attachments]; 'item' => $item, 'notify' => $notify,
'taglist' => $taglist, 'attachments' => $attachments
];
} }
} else { } else {
Logger::info('Post already created or exists in the delayed posts queue', ['uid' => $item['uid'], 'uri' => $item['uri']]); Logger::info('Post already created or exists in the delayed posts queue', ['uid' => $item['uid'], 'uri' => $item['uri']]);
@ -953,11 +957,13 @@ class Feed
$check_date = empty($last_update) ? '' : DateTimeFormat::utc($last_update); $check_date = empty($last_update) ? '' : DateTimeFormat::utc($last_update);
$authorid = Contact::getIdForURL($owner['url']); $authorid = Contact::getIdForURL($owner['url']);
$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted` AND `gravity` IN (?, ?) $condition = [
"`uid` = ? AND `received` > ? AND NOT `deleted` AND `gravity` IN (?, ?)
AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?, ?, ?)", AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?, ?, ?)",
$owner['uid'], $check_date, Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT, $owner['uid'], $check_date, Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT,
Item::PRIVATE, Protocol::ACTIVITYPUB, Item::PRIVATE, Protocol::ACTIVITYPUB,
Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA]; Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA
];
if ($filter === 'comments') { if ($filter === 'comments') {
$condition[0] .= " AND `gravity` = ? "; $condition[0] .= " AND `gravity` = ? ";
@ -1130,8 +1136,15 @@ class Feed
XML::addElement($doc, $entry, 'content', $body, ['type' => 'html']); XML::addElement($doc, $entry, 'content', $body, ['type' => 'html']);
XML::addElement($doc, $entry, 'link', '', ['rel' => 'alternate', 'type' => 'text/html', XML::addElement(
'href' => DI::baseUrl() . '/display/' . $item['guid']] $doc,
$entry,
'link',
'',
[
'rel' => 'alternate', 'type' => 'text/html',
'href' => DI::baseUrl() . '/display/' . $item['guid']
]
); );
XML::addElement($doc, $entry, 'published', DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM)); XML::addElement($doc, $entry, 'published', DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
@ -1173,12 +1186,14 @@ class Feed
if (isset($parent_plink)) { if (isset($parent_plink)) {
$attributes = [ $attributes = [
'ref' => $item['thr-parent'], 'ref' => $item['thr-parent'],
'href' => $parent_plink]; 'href' => $parent_plink
];
XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes); XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes);
$attributes = [ $attributes = [
'rel' => 'related', 'rel' => 'related',
'href' => $parent_plink]; 'href' => $parent_plink
];
XML::addElement($doc, $entry, 'link', '', $attributes); XML::addElement($doc, $entry, 'link', '', $attributes);
} }
} }
@ -1211,9 +1226,9 @@ class Feed
} }
// Fetch information about the post // Fetch information about the post
$siteinfo = BBCode::getAttachedData($item['body']); $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::HTML]);
if (isset($siteinfo['title'])) { if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
return $siteinfo['title']; return $media[0]['name'];
} }
// If no bookmark is found then take the first line // If no bookmark is found then take the first line