Merge pull request #9526 from MrPetovan/bug/9525-mastodon-emojis-tag

[friendica.git] / src / Protocol / ActivityPub / Transmitter.php

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 0044b5240b194049e0bdd2420486d90dd74cb8b3..6ac55dc12317946ca22392cc9a9c3941634cb18c 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -37,13 +37,13 @@ use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Profile;
 use Friendica\Model\Photo;
+use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
-use Friendica\Util\Images;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
 use Friendica\Util\Map;
@@ -146,7 +146,8 @@ class Transmitter
                        'deleted' => false,
                        'hidden' => false,
                        'archive' => false,
-                       'pending' => false
+                       'pending' => false,
+                       'blocked' => false,
                ];
                $condition = DBA::buildCondition($parameters);
 
@@ -680,7 +681,7 @@ class Transmitter
                        $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
                }
 
-               $condition = ['uid' => $uid, 'archive' => false, 'pending' => false];
+               $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false];
 
                if (!empty($uid)) {
                        $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
@@ -829,7 +830,6 @@ class Transmitter
                $mail['gravity'] = ($mail['reply'] ? GRAVITY_COMMENT: GRAVITY_PARENT);
 
                $mail['event-type'] = '';
-               $mail['attach'] = '';
 
                $mail['parent'] = 0;
 
@@ -1220,57 +1220,22 @@ class Transmitter
                        $attachments[] = $attachment;
                }
                */
-               $arr = explode('[/attach],', $item['attach']);
-               if (count($arr)) {
-                       foreach ($arr as $r) {
-                               $matches = false;
-                               $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
-                               if ($cnt) {
-                                       $attributes = ['type' => 'Document',
-                                                       'mediaType' => $matches[3],
-                                                       'url' => $matches[1],
-                                                       'name' => null];
-
-                                       if (trim($matches[4]) != '') {
-                                               $attributes['name'] = trim($matches[4]);
-                                       }
-
-                                       $attachments[] = $attributes;
-                               }
-                       }
+               foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
+                       $attachments[] = ['type' => 'Document',
+                               'mediaType' => $attachment['mimetype'],
+                               'url' => $attachment['url'],
+                               'name' => $attachment['description']];
                }
 
                if ($type != 'Note') {
                        return $attachments;
                }
 
-               // Simplify image codes
-               $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
-
-               // Grab all pictures without alternative descriptions and create attachments out of them
-               if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
-                       foreach ($pictures[1] as $picture) {
-                               $imgdata = Images::getInfoFromURLCached($picture);
-                               if ($imgdata) {
-                                       $attachments[] = ['type' => 'Document',
-                                               'mediaType' => $imgdata['mime'],
-                                               'url' => $picture,
-                                               'name' => null];
-                               }
-                       }
-               }
-
-               // Grab all pictures with alternative description and create attachments out of them
-               if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
-                       foreach ($pictures as $picture) {
-                               $imgdata = Images::getInfoFromURLCached($picture[1]);
-                               if ($imgdata) {
-                                       $attachments[] = ['type' => 'Document',
-                                               'mediaType' => $imgdata['mime'],
-                                               'url' => $picture[1],
-                                               'name' => $picture[2]];
-                               }
-                       }
+               foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]) as $attachment) {
+                       $attachments[] = ['type' => 'Document',
+                               'mediaType' => $attachment['mimetype'],
+                               'url' => $attachment['url'],
+                               'name' => $attachment['description']];
                }
 
                return $attachments;
@@ -1289,12 +1254,12 @@ class Transmitter
                        return '';
                }
 
-               $data = Contact::getByURL($match[1], false, ['url', 'nick']);
+               $data = Contact::getByURL($match[1], false, ['url', 'alias', 'nick']);
                if (empty($data['nick'])) {
                        return $match[0];
                }
 
-               return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
+               return '[url=' . ($data['alias'] ?: $data['url']) . ']@' . $data['nick'] . '[/url]';
        }
 
        /**
@@ -1454,16 +1419,16 @@ class Transmitter
 
                $body = $item['body'];
 
-               if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
-                       $body = self::prependMentions($body, $item['uri-id']);
-               }
-
                if ($type == 'Note') {
-                       $body = self::removePictures($body);
+                       $body = $item['raw-body'] ?? self::removePictures($body);
                } elseif (($type == 'Article') && empty($data['summary'])) {
                        $data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($body), 1000));
                }
 
+               if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
+                       $body = self::prependMentions($body, $item['uri-id'], $item['author-link']);
+               }
+
                if ($type == 'Event') {
                        $data = array_merge($data, self::createEvent($item));
                } else {
@@ -2009,7 +1974,7 @@ class Transmitter
                return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
-       private static function prependMentions($body, int $uriid)
+       private static function prependMentions($body, int $uriid, string $authorLink)
        {
                $mentions = [];
 
@@ -2019,6 +1984,7 @@ class Transmitter
                                && $profile['contact-type'] != Contact::TYPE_COMMUNITY
                                && !strstr($body, $profile['addr'])
                                && !strstr($body, $tag['url'])
+                               && $tag['url'] !== $authorLink
                        ) {
                                $mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
                        }