use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
private $l10n;
/** @var Profiler */
private $profiler;
+ /** @var IHandleUserSessions */
+ private $userSession;
- public function __construct(Profiler $profiler, Activity $activity, L10n $l10n)
+ public function __construct(Profiler $profiler, Activity $activity, L10n $l10n, IHandleUserSessions $userSession)
{
- $this->profiler = $profiler;
- $this->activity = $activity;
- $this->l10n = $l10n;
+ $this->profiler = $profiler;
+ $this->activity = $activity;
+ $this->l10n = $l10n;
+ $this->userSession = $userSession;
}
/**
$categories[] = [
'name' => $savedFolderName,
'url' => $url,
- 'removeurl' => Session::getLocalUser() == $uid ? 'filerm/' . $item['id'] . '?cat=' . rawurlencode($savedFolderName) : '',
+ 'removeurl' => $this->userSession->getLocalUserId() == $uid ? 'filerm/' . $item['id'] . '?cat=' . rawurlencode($savedFolderName) : '',
'first' => $first,
'last' => false
];
$categories[count($categories) - 1]['last'] = true;
}
- if (Session::getLocalUser() == $uid) {
+ if ($this->userSession->getLocalUserId() == $uid) {
foreach (Post\Category::getArrayByURIId($item['uri-id'], $uid, Post\Category::FILE) as $savedFolderName) {
$folders[] = [
'name' => $savedFolderName,
'url' => "#",
- 'removeurl' => Session::getLocalUser() == $uid ? 'filerm/' . $item['id'] . '?term=' . rawurlencode($savedFolderName) : '',
+ 'removeurl' => $this->userSession->getLocalUserId() == $uid ? 'filerm/' . $item['id'] . '?term=' . rawurlencode($savedFolderName) : '',
'first' => $first,
'last' => false
];
$sub_link = $contact_url = $pm_url = $status_link = '';
$photos_link = $posts_link = $block_link = $ignore_link = '';
- if (Session::getLocalUser() && Session::getLocalUser() == $item['uid'] && $item['gravity'] == ItemModel::GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
+ if ($this->userSession->getLocalUserId() && $this->userSession->getLocalUserId() == $item['uid'] && $item['gravity'] == ItemModel::GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
$sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
}
$pcid = $item['author-id'];
$network = '';
$rel = 0;
- $condition = ['uid' => Session::getLocalUser(), 'uri-id' => $item['author-uri-id']];
+ $condition = ['uid' => $this->userSession->getLocalUserId(), 'uri-id' => $item['author-uri-id']];
$contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
if (DBA::isResult($contact)) {
$cid = $contact['id'];
}
}
- if (Session::getLocalUser()) {
+ if ($this->userSession->getLocalUserId()) {
$menu = [
$this->l10n->t('Follow Thread') => $sub_link,
$this->l10n->t('View Status') => $status_link,
return (!($this->activity->match($item['verb'], Activity::FOLLOW) &&
$item['object-type'] === Activity\ObjectType::NOTE &&
empty($item['self']) &&
- $item['uid'] == Session::getLocalUser())
+ $item['uid'] == $this->userSession->getLocalUserId())
);
}
}
/**
- * 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($body)) {
+ $body = $item['body'];
}
- if (empty($id)) {
- $id = ItemModel::fetchByLink($url);
+ if (empty($item['quote-uri-id'])) {
+ return $body;
}
- if (!$id) {
- Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid, 'callstack' => System::callstack()]);
- return '';
- }
-
- 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]]);
+ $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 $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']);
}
$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
}
- $shared = BBCode::fetchShareAttributes($item['body']);
+ $shared = $this->getShareArray($item);
// If it is a reshared post then reformat it to avoid display problems with two share elements
- if (Diaspora::isReshare($item['body'], false)) {
- if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid'], 0, '', $add_media))) {
+ if (!empty($shared)) {
+ if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], $add_media))) {
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
}
return $shared_content;
}
+
+ /**
+ * Return the shared post from an item array (if the item is shared item)
+ *
+ * @param array $item
+ * @param array $fields
+ *
+ * @return array with the shared post
+ */
+ public function getSharedPost(array $item, array $fields = []): array
+ {
+ if (!empty($item['quote-uri-id'])) {
+ $shared = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [0, $item['uid'] ?? 0]]);
+ if (is_array($shared)) {
+ return [
+ 'comment' => BBCode::removeSharedData($item['body'] ?? ''),
+ 'post' => $shared
+ ];
+ }
+ }
+
+ $attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
+ if (!empty($attributes)) {
+ $shared = Post::selectFirst($fields, ['guid' => $attributes['guid'], 'uid' => [0, $item['uid'] ?? 0]]);
+ if (is_array($shared)) {
+ return [
+ 'comment' => $attributes['comment'],
+ 'post' => $shared
+ ];
+ }
+ }
+
+ return [];
+ }
+
+ /**
+ * 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
+ * we hopefully will define these values not in the body anymore but in some item fields.
+ * This function is meant to replace all similar functions in the system.
+ *
+ * @param array $item
+ *
+ * @return array with share information
+ */
+ private function getShareArray(array $item): array
+ {
+ $attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
+ if (!empty($attributes)) {
+ return $attributes;
+ }
+
+ if (!empty($item['quote-uri-id'])) {
+ $shared = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'body'], ['uri-id' => $item['quote-uri-id']]);
+ if (!empty($shared)) {
+ return [
+ 'author' => $shared['author-name'],
+ 'profile' => $shared['author-link'],
+ 'avatar' => $shared['author-avatar'],
+ 'link' => $shared['plink'],
+ 'posted' => $shared['created'],
+ 'guid' => $shared['guid'],
+ '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 .= "\n♲ " . ($post['plink'] ?: $post['uri']);
+
+ return $body;
+ }
}
projects / friendica.git / blobdiff