X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPost%2FMedia.php;h=a0d55b6e0036990c82fcac9f6db72eb303447019;hb=fdaff4303952427f222ee21f6b501d5087e25932;hp=6454cefda148ee338ee39e098363a4c14c32b4e3;hpb=98aed4dde31234883bb3eb5f77143159641a8ea5;p=friendica.git diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 6454cefda1..a0d55b6e00 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -21,6 +21,7 @@ namespace Friendica\Model\Post; +use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Core\Logger; use Friendica\Core\Protocol; @@ -161,8 +162,10 @@ class Media */ public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string { - $media = self::fetchAdditionalData(['type' => self::DOCUMENT, 'url' => $href, - 'size' => $length, 'mimetype' => $type, 'description' => $title]); + $media = self::fetchAdditionalData([ + 'type' => self::DOCUMENT, 'url' => $href, + 'size' => $length, 'mimetype' => $type, 'description' => $title + ]); return '[attach]href="' . $media['url'] . '" length="' . $media['size'] . '" type="' . $media['mimetype'] . '" title="' . $media['description'] . '"[/attach]'; @@ -262,8 +265,10 @@ class Media return $media; } - if (!empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) && - parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST)) { + if ( + !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']]); return $media; } @@ -450,25 +455,66 @@ class Media } /** - * Tests for path patterns that are usef for picture links in Friendica + * Tests for path patterns that are used for picture links in Friendica * * @param string $page Link to the image page * @param string $preview Preview picture * @return boolean */ - private static function isPictureLink(string $page, string $preview): bool + private static function isLinkToPhoto(string $page, string $preview): bool { - return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-1\.#ism', $preview); + return preg_match('#/photo/.*-0\.#ism', $page) && preg_match('#/photo/.*-[012]\.#ism', $preview); + } + + /** + * Tests for path patterns that are used for picture links in Friendica + * + * @param string $page Link to the image page + * @param string $preview Preview picture + * @return boolean + */ + private static function isLinkToImagePage(string $page, string $preview): bool + { + return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-[012]\.#ism', $preview); + } + + /** + * Replace the image link in Friendica image posts with a link to the image + * + * @param string $body + * @return string + */ + public static function replaceImage(string $body): string + { + if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { + foreach ($pictures as $picture) { + if (self::isLinkToImagePage($picture[1], $picture[2])) { + $body = str_replace($picture[0], Images::getBBCodeByUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], $picture[3]), $body); + } + } + } + + if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { + foreach ($pictures as $picture) { + if (self::isLinkToImagePage($picture[1], $picture[2])) { + $body = str_replace($picture[0], Images::getBBCodeByUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2]), $body); + } + } + } + + return $body; } /** * Add media links and remove them from the body * * @param integer $uriid - * @param string $body + * @param string $body + * @param bool $endmatch + * @param bool $removepicturelinks * @return string Body without media links */ - public static function insertFromBody(int $uriid, string $body, bool $endmatch = false): string + public static function insertFromBody(int $uriid, string $body, bool $endmatch = false, bool $removepicturelinks = false): string { $endmatchpattern = $endmatch ? '\z' : ''; // Simplify image codes @@ -477,13 +523,26 @@ class Media $attachments = []; if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]$endmatchpattern#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { - if (!self::isPictureLink($picture[1], $picture[2])) { - continue; + if (self::isLinkToImagePage($picture[1], $picture[2])) { + $body = str_replace($picture[0], '', $body); + $image = str_replace(['-1.', '-2.'], '-0.', $picture[2]); + $attachments[$image] = [ + 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, + 'preview' => $picture[2], 'description' => $picture[3] + ]; + } elseif (self::isLinkToPhoto($picture[1], $picture[2])) { + $body = str_replace($picture[0], '', $body); + $attachments[$picture[1]] = [ + 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1], + 'preview' => $picture[2], 'description' => $picture[3] + ]; + } elseif ($removepicturelinks) { + $body = str_replace($picture[0], '', $body); + $attachments[$picture[1]] = [ + 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1], + 'preview' => $picture[2], 'description' => $picture[3] + ]; } - $body = str_replace($picture[0], '', $body); - $image = str_replace('-1.', '-0.', $picture[2]); - $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, - 'preview' => $picture[2], 'description' => $picture[3]]; } } @@ -496,13 +555,26 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]$endmatchpattern#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { - if (!self::isPictureLink($picture[1], $picture[2])) { - continue; + if (self::isLinkToImagePage($picture[1], $picture[2])) { + $body = str_replace($picture[0], '', $body); + $image = str_replace(['-1.', '-2.'], '-0.', $picture[2]); + $attachments[$image] = [ + 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, + 'preview' => $picture[2], 'description' => null + ]; + } elseif (self::isLinkToPhoto($picture[1], $picture[2])) { + $body = str_replace($picture[0], '', $body); + $attachments[$picture[1]] = [ + 'uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $picture[1], + 'preview' => $picture[2], 'description' => null + ]; + } elseif ($removepicturelinks) { + $body = str_replace($picture[0], '', $body); + $attachments[$picture[1]] = [ + 'uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $picture[1], + 'preview' => $picture[2], 'description' => null + ]; } - $body = str_replace($picture[0], '', $body); - $image = str_replace('-1.', '-0.', $picture[2]); - $attachments[$image] = ['uri-id' => $uriid, 'type' => self::IMAGE, 'url' => $image, - 'preview' => $picture[2], 'description' => null]; } } @@ -558,6 +630,21 @@ class Media return $body; } + /** + * Remove media from the body + * + * @param string $body + * @return string + */ + public static function removeFromBody(string $body): string + { + do { + $prebody = $body; + $body = self::insertFromBody(0, $body, false, true); + } while ($prebody != $body); + return $body; + } + /** * Add media links from a relevant url in the body * @@ -575,7 +662,7 @@ class Media foreach ($matches[1] as $url) { Logger::info('Got page url (link without description)', ['uri-id' => $uriid, 'url' => $url]); $result = self::insert(['uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $url], false, $network); - if ($result && ($network == Protocol::DFRN)) { + if ($result && !in_array($network, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA])) { self::revertHTMLType($uriid, $url, $fullbody); Logger::debug('Revert HTML type', ['uri-id' => $uriid, 'url' => $url]); } elseif ($result) { @@ -591,7 +678,7 @@ class Media foreach ($matches[1] as $url) { Logger::info('Got page url (link with description)', ['uri-id' => $uriid, 'url' => $url]); $result = self::insert(['uri-id' => $uriid, 'type' => self::UNKNOWN, 'url' => $url], false, $network); - if ($result && ($network == Protocol::DFRN)) { + if ($result && !in_array($network, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA])) { self::revertHTMLType($uriid, $url, $fullbody); Logger::debug('Revert HTML type', ['uri-id' => $uriid, 'url' => $url]); } elseif ($result) { @@ -630,7 +717,7 @@ class Media public static function insertFromAttachmentData(int $uriid, string $body) { $data = BBCode::getAttachmentData($body); - if (empty($data)) { + if (empty($data)) { return; } @@ -697,6 +784,41 @@ class Media return DBA::selectToArray('post-media', [], $condition, ['order' => ['id']]); } + public static function getByURL(int $uri_id, string $url, array $types = []) + { + $condition = ["`uri-id` = ? AND `url` = ? AND `type` != ?", $uri_id, $url, self::UNKNOWN]; + + if (!empty($types)) { + $condition = DBA::mergeConditions($condition, ['type' => $types]); + } + + return DBA::selectFirst('post-media', [], $condition); + } + + /** + * Retrieves the media attachment with the provided media id. + * + * @param int $id id + * @return array|bool Array on success, false on error + * @throws \Exception + */ + public static function getById(int $id) + { + return DBA::selectFirst('post-media', [], ['id' => $id]); + } + + /** + * Update post-media entries + * + * @param array $fields + * @param int $id + * @return bool + */ + public static function updateById(array $fields, int $id): bool + { + return DBA::update('post-media', $fields, ['id' => $id]); + } + /** * Checks if media attachments are associated with the provided item ID. * @@ -814,8 +936,10 @@ class Media continue; } - if (in_array($medium['type'], [self::AUDIO, self::IMAGE]) || - in_array($filetype, ['audio', 'image'])) { + if ( + in_array($medium['type'], [self::AUDIO, self::IMAGE]) || + in_array($filetype, ['audio', 'image']) + ) { $attachments['visual'][] = $medium; } elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) { if (!empty($medium['height'])) { @@ -880,19 +1004,7 @@ class Media } if ($media['type'] == self::IMAGE) { - if (!empty($media['preview'])) { - if (!empty($media['description'])) { - $body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] .'[/img][/url]'; - } else { - $body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] .'[/img][/url]'; - } - } else { - if (!empty($media['description'])) { - $body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]'; - } else { - $body .= "\n[img]" . $media['url'] .'[/img]'; - } - } + $body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description'] ?? ''); } elseif ($media['type'] == self::AUDIO) { $body .= "\n[audio]" . $media['url'] . "[/audio]\n"; } elseif ($media['type'] == self::VIDEO) { @@ -907,6 +1019,92 @@ class Media 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 + { + if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) { + return $body; + } + + $links = self::getByURIId($uriid, [self::HTML]); + if (empty($links)) { + return $body; + } + + $data = [ + 'type' => 'link', + 'url' => $links[0]['url'], + 'title' => $links[0]['name'], + 'text' => $links[0]['description'], + 'publisher_name' => $links[0]['publisher-name'], + 'publisher_url' => $links[0]['publisher-url'], + 'publisher_img' => $links[0]['publisher-image'], + 'author_name' => $links[0]['author-name'], + 'author_url' => $links[0]['author-url'], + 'author_img' => $links[0]['author-image'], + 'images' => [[ + 'src' => $links[0]['preview'], + 'height' => $links[0]['preview-height'], + 'width' => $links[0]['preview-width'], + ]] + ]; + $body .= "\n" . PageInfo::getFooterFromData($data); + + 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 + { + $links = self::getByURIId($uriid, [self::HTML]); + if (empty($links)) { + return $body; + } + + if (strpos($body, $links[0]['url'])) { + return $body; + } + + if (!empty($links[0]['name']) && ($links[0]['name'] != $links[0]['url'])) { + return $body . "\n[url=" . $links[0]['url'] . ']' . $links[0]['name'] . "[/url]"; + } else { + return $body . "\n[url]" . $links[0]['url'] . "[/url]"; + } + } + + /** + * 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 + { + if (($item['gravity'] == Item::GRAVITY_ACTIVITY) || empty($item['uri-id'])) { + return $item; + } + + $item['body'] = self::addHTMLAttachmentToBody($item['uri-id'], $item['body']); + + if (!empty($item['raw-body'])) { + $item['raw-body'] = self::addHTMLLinkToBody($item['uri-id'], $item['raw-body']); + } + + return $item; + } + /** * Get preview link for given media id *