use Friendica\Model\Tag;
use Friendica\Model\Post;
use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
use Friendica\Util\Profiler;
use Friendica\Util\Proxy;
use Friendica\Util\XML;
'url' => $item['author-link'],
];
$profile_link = Contact::magicLinkByContact($author, $item['author-link']);
- $sparkle = (strpos($profile_link, 'redir/') === 0);
+ $sparkle = (strpos($profile_link, 'contact/redir/') === 0);
$cid = 0;
$pcid = $item['author-id'];
if ($sparkle) {
$status_link = $profile_link . '/status';
- $photos_link = str_replace('/profile/', '/photos/', $profile_link);
+ $photos_link = $profile_link . '/photos';
$profile_link = $profile_link . '/profile';
}
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
in_array($item['network'], Protocol::FEDERATED)) {
- $menu[$this->l10n->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']) . '&auto=1';
+ $menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1';
}
} else {
$menu = [$this->l10n->t('View Profile') => $item['author-link']];
}
/**
- * Add a share block for the given url
+ * Add a share block for the given uri-id
*
- * @param string $url
- * @param integer $uid
- * @param bool $add_media
+ * @param array $item
+ * @param string $body
* @return string
*/
- public function createSharedPostByUrl(string $url, int $uid = 0, bool $add_media = false): string
+ public function addSharedPost(array $item, string $body = ''): string
{
- if (!empty($uid)) {
- $id = ItemModel::searchByLink($url, $uid);
- }
-
- if (empty($id)) {
- $id = ItemModel::fetchByLink($url);
+ if (empty($body)) {
+ $body = $item['body'];
}
- if (!$id) {
- Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid, 'callstack' => System::callstack()]);
- return '';
+ if (empty($item['quote-uri-id'])) {
+ return $body;
}
- Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid, 'callstack' => System::callstack()]);
-
- $shared_item = Post::selectFirst(['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'], ['id' => $id]);
- if (!DBA::isResult($shared_item)) {
- Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]);
- return '';
- }
-
- return $this->createSharedBlockByArray($shared_item, $add_media);
- }
-
- /**
- * Add a share block for the given uri-id
- *
- * @param integer $UriId
- * @param integer $uid
- * @param bool $add_media
- * @return string
- */
- public function createSharedPostByUriId(int $UriId, int $uid = 0, bool $add_media = false): string
- {
- $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
- $shared_item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
+ $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'quote-uri-id'];
+ $shared_item = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [$item['uid'], 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
if (!DBA::isResult($shared_item)) {
- Logger::notice('Post does not exist.', ['uri-id' => $UriId, 'uid' => $uid]);
- return '';
+ Logger::notice('Post does not exist.', ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid']]);
+ return $body;
}
- return $this->createSharedBlockByArray($shared_item, $add_media);
+ return trim(BBCode::removeSharedData($body) . "\n" . $this->createSharedBlockByArray($shared_item, true));
}
/**
* @param bool $add_media
* @return string
*/
- public function createSharedPostByGuid(string $guid, int $uid = 0, string $host = '', bool $add_media = false): string
+ private function createSharedPostByGuid(string $guid, bool $add_media): string
{
$fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network'];
- $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
-
- if (!DBA::isResult($shared_item) && !empty($host) && Diaspora::storeByGuid($guid, $host, true)) {
- Logger::debug('Fetched post', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
- $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => [$uid, 0], 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
- } elseif (DBA::isResult($shared_item)) {
- Logger::debug('Found existing post', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
- }
+ $shared_item = Post::selectFirst($fields, ['guid' => $guid, 'uid' => 0, 'private' => [ItemModel::PUBLIC, ItemModel::UNLISTED]]);
if (!DBA::isResult($shared_item)) {
- Logger::notice('Post does not exist.', ['guid' => $guid, 'host' => $host, 'uid' => $uid]);
+ Logger::notice('Post does not exist.', ['guid' => $guid]);
return '';
}
} elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED)) {
$item['guid'] = '';
$item['uri'] = '';
- $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
- } elseif ($add_media) {
+ }
+
+ if ($add_media) {
$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
}
// If it is a reshared post then reformat it to avoid display problems with two share elements
if (!empty($shared)) {
- if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], 0, '', $add_media))) {
- $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+ if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
+ if (!empty(BBCode::fetchShareAttributes($item['body']))) {
+ $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+ } else {
+ $item['body'] .= $encaspulated_share;
+ }
}
-
$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
}
return [];
}
- /**
- * Improve the data in shared posts
- *
- * @param array $item
- * @param bool $add_media
- * @return string body
- */
- public function improveSharedDataInBody(array $item, bool $add_media = false): string
- {
- $shared = BBCode::fetchShareAttributes($item['body']);
- if (empty($shared['guid']) && empty($shared['message_id'])) {
- return $item['body'];
- }
-
- $link = $shared['link'] ?: $shared['message_id'];
-
- if (empty($shared_content)) {
- $shared_content = $this->createSharedPostByUrl($link, $item['uid'] ?? 0, $add_media);
- }
-
- if (empty($shared_content)) {
- return $item['body'];
- }
-
- $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content, $item['body']);
-
- Logger::debug('New shared data', ['uri-id' => $item['uri-id'], 'link' => $link, 'guid' => $item['guid']]);
- return $item['body'];
- }
-
/**
* Return share data from an item array (if the item is shared item)
* We are providing the complete Item array, because at some time in the future
'message_id' => $shared['uri'],
'comment' => $item['body'],
'shared' => $shared['body'],
- ];
+ ];
}
}
return [];
}
+
+ /**
+ * Add a link to a shared post at the end of the post
+ *
+ * @param string $body
+ * @param integer $quote_uri_id
+ * @return string
+ */
+ public function addShareLink(string $body, int $quote_uri_id): string
+ {
+ $post = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $quote_uri_id]);
+ if (empty($post)) {
+ return $body;
+ }
+
+ $body = BBCode::removeSharedData($body);
+
+ $body .= "\n♲ " . ($post['plink'] ?: $post['uri']);
+
+ return $body;
+ }
}
projects / friendica.git / blobdiff