X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FPost%2FMedia.php;h=854e5d8f91335e435e08a1db60ec47af69463954;hb=0ec7238da49d7e9a98b0a49f86e8ed2ca721ae9a;hp=8fb10ddd88868c64d5090a83c0f6b72421f39cfd;hpb=15d975f143992a3f21bec4ac86430b684de8f7f9;p=friendica.git

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 8fb10ddd88..854e5d8f91 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -23,10 +23,12 @@ namespace Friendica\Model\Post;
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
@@ -56,6 +58,8 @@ class Media
 	const HTML        = 17;
 	const XML         = 18;
 	const PLAIN       = 19;
+	const ACTIVITY    = 20;
+	const ACCOUNT     = 21;
 	const DOCUMENT    = 128;
 
 	/**
@@ -215,6 +219,14 @@ class Media
 			$media = self::addType($media);
 		}
 
+		if (in_array($media['type'], [self::TEXT, self::APPLICATION, self::HTML, self::XML, self::PLAIN])) {
+			$media = self::addActivity($media);
+		}
+
+		if (in_array($media['type'], [self::TEXT, self::APPLICATION, self::HTML, self::XML, self::PLAIN])) {
+			$media = self::addAccount($media);
+		}
+
 		if ($media['type'] == self::HTML) {
 			$data = ParseUrl::getSiteinfoCached($media['url'], false);
 			$media['preview'] = $data['images'][0]['src'] ?? null;
@@ -232,6 +244,103 @@ class Media
 		return $media;
 	}
 
+	/**
+	 * Adds the activity type if the media entry is linked to an activity
+	 *
+	 * @param array $media
+	 * @return array
+	 */
+	private static function addActivity(array $media): array
+	{
+		$id = Item::fetchByLink($media['url']);
+		if (empty($id)) {
+			return $media;
+		}
+
+		$item = Post::selectFirst([], ['id' => $id, 'network' => Protocol::FEDERATED]);
+		if (empty($item['id'])) {
+			Logger::debug('Not a federated activity', ['id' => $id, 'uri-id' => $media['uri-id'], 'url' => $media['url']]);
+			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)) {
+			Logger::debug('Not a link to an activity', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]);
+			return $media;
+		}
+
+		if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+			$media['mimetype'] = 'application/activity+json';
+		} elseif ($item['network'] == Protocol::DIASPORA) {
+			$media['mimetype'] = 'application/xml';
+		}
+
+		$contact = Contact::getById($item['author-id'], ['avatar', 'gsid']);
+		if (!empty($contact['gsid'])) {
+			$gserver = DBA::selectFirst('gserver', ['url', 'site_name'], ['id' => $contact['gsid']]);
+		}
+
+		$media['type'] = self::ACTIVITY;
+		$media['media-uri-id'] = $item['uri-id'];
+		$media['height'] = null;
+		$media['width'] = null;
+		$media['preview'] = null;
+		$media['preview-height'] = null;
+		$media['preview-width'] = null;
+		$media['description'] = $item['body'];
+		$media['name'] = $item['title'];
+		$media['author-url'] = $item['author-link'];
+		$media['author-name'] = $item['author-name'];
+		$media['author-image'] = $contact['avatar'] ?? $item['author-avatar'];
+		$media['publisher-url'] = $gserver['url'] ?? null;
+		$media['publisher-name'] = $gserver['site_name'] ?? null;
+		$media['publisher-image'] = null;
+
+		Logger::debug('Activity detected', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'plink' => $item['plink'], 'uri' => $item['uri']]);
+		return $media;
+	}
+
+	/**
+	 * Adds the account type if the media entry is linked to an account
+	 *
+	 * @param array $media
+	 * @return array
+	 */
+	private static function addAccount(array $media): array
+	{
+		$contact = Contact::getByURL($media['url'], false);
+		if (empty($contact) || ($contact['network'] == Protocol::PHANTOM)) {
+			return $media;
+		}
+
+		if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+			$media['mimetype'] = 'application/activity+json';
+		}
+
+		if (!empty($contact['gsid'])) {
+			$gserver = DBA::selectFirst('gserver', ['url', 'site_name'], ['id' => $contact['gsid']]);
+		}
+
+		$media['type'] = self::ACCOUNT;
+		$media['media-uri-id'] = $contact['uri-id'];
+		$media['height'] = null;
+		$media['width'] = null;
+		$media['preview'] = null;
+		$media['preview-height'] = null;
+		$media['preview-width'] = null;
+		$media['description'] = $contact['about'];
+		$media['name'] = $contact['name'];
+		$media['author-url'] = $contact['url'];
+		$media['author-name'] = $contact['name'];
+		$media['author-image'] = $contact['avatar'];
+		$media['publisher-url'] = $gserver['url'] ?? null;
+		$media['publisher-name'] = $gserver['site_name'] ?? null;
+		$media['publisher-image'] = null;
+
+		Logger::debug('Account detected', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'uri' => $contact['url']]);
+		return $media;
+	}
+
 	/**
 	 * Fetch media data from local resources
 	 * @param array $media
@@ -337,12 +446,6 @@ class Media
 		// Simplify image codes
 		$unshared_body = $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
 
-		// Only remove the shared data from "real" reshares
-		$shared = BBCode::fetchShareAttributes($body);
-		if (!empty($shared['guid'])) {
-			$unshared_body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
-		}
-
 		$attachments = [];
 		if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) {
 			foreach ($pictures as $picture) {
@@ -419,13 +522,6 @@ class Media
 	 */
 	public static function insertFromRelevantUrl(int $uriid, string $body)
 	{
-		// Only remove the shared data from "real" reshares
-		$shared = BBCode::fetchShareAttributes($body);
-		if (!empty($shared['guid'])) {
-			// Don't look at the shared content
-			$body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
-		}
-
 		// Remove all hashtags and mentions
 		$body = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '', $body);
 
@@ -455,9 +551,6 @@ class Media
 	 */
 	public static function insertFromAttachmentData(int $uriid, string $body)
 	{
-		// Don't look at the shared content
-		$body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
-
 		$data = BBCode::getAttachmentData($body);
 		if (empty($data))  {
 			return;
@@ -549,12 +642,11 @@ class Media
 	 * Split the attachment media in the three segments "visual", "link" and "additional"
 	 *
 	 * @param int    $uri_id URI id
-	 * @param string $guid GUID
 	 * @param array  $links list of links that shouldn't be added
 	 * @param bool   $has_media
 	 * @return array attachments
 	 */
-	public static function splitAttachments(int $uri_id, string $guid = '', array $links = [], bool $has_media = true): array
+	public static function splitAttachments(int $uri_id, array $links = [], bool $has_media = true): array
 	{
 		$attachments = ['visual' => [], 'link' => [], 'additional' => []];
 
@@ -585,11 +677,17 @@ class Media
 				}
 			}
 
+			// Currently these two types are ignored here.
+			// Posts are added differently and contacts are not displayed as attachments.
+			if (in_array($medium['type'], [self::ACCOUNT, self::ACTIVITY])) {
+				continue;
+			}
+
 			if (!empty($medium['preview'])) {
 				$previews[] = $medium['preview'];
 			}
 
-			$type = explode('/', current(explode(';', $medium['mimetype'])));
+			$type = explode('/', explode(';', $medium['mimetype'] ?? '')[0]);
 			if (count($type) < 2) {
 				Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]);
 				$filetype = 'unkn';
@@ -648,11 +746,13 @@ class Media
 	/**
 	 * Add media attachments to the body
 	 *
-	 * @param int $uriid
+	 * @param int    $uriid
 	 * @param string $body
+	 * @param array  $types
+	 *
 	 * @return string body
 	 */
-	public static function addAttachmentsToBody(int $uriid, string $body = ''): string
+	public static function addAttachmentsToBody(int $uriid, string $body = '', array $types = [self::IMAGE, self::AUDIO, self::VIDEO]): string
 	{
 		if (empty($body)) {
 			$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
@@ -665,7 +765,7 @@ class Media
 
 		$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
 
-		foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) {
+		foreach (self::getByURIId($uriid, $types) as $media) {
 			if (Item::containsLink($body, $media['preview'] ?? $media['url'], $media['type'])) {
 				continue;
 			}