use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\FileTag;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
use Friendica\Model\Item as ItemModel;
use Friendica\Model\Photo;
use Friendica\Model\Tag;
}
/**
- * Return array with details for categories and folders for an item
+ * Lists categories and folders for an item
*
* @param array $item
* @param int $uid
- * @return [array, array]
- *
+ * @return array
* [
- * [ // categories array
- * {
- * 'name': 'category name',
- * 'removeurl': 'url to remove this category',
- * 'first': 'is the first in this array? true/false',
- * 'last': 'is the last in this array? true/false',
- * } ,
- * ....
- * ],
- * [ //folders array
- * {
- * 'name': 'folder name',
- * 'removeurl': 'url to remove this folder',
- * 'first': 'is the first in this array? true/false',
- * 'last': 'is the last in this array? true/false',
- * } ,
- * ....
- * ]
- * ]
+ * [ // categories array
+ * {
+ * 'name': 'category name',
+ * 'removeurl': 'url to remove this category',
+ * 'first': 'is the first in this array? true/false',
+ * 'last': 'is the last in this array? true/false',
+ * },
+ * ...
+ * ],
+ * [ //folders array
+ * {
+ * 'name': 'folder name',
+ * 'removeurl': 'url to remove this folder',
+ * 'first': 'is the first in this array? true/false',
+ * 'last': 'is the last in this array? true/false',
+ * } ,
+ * ...
+ * ]
+ * ]
+ *
+ * @throws \Exception
*/
public function determineCategoriesTerms(array $item, int $uid = 0): array
{
return [$categories, $folders];
}
- foreach (Post\Category::getArrayByURIId($item['uri-id'], $uid, Post\Category::CATEGORY) as $savedFolderName) {
+ foreach (Post\Category::getArrayByURIId($item['uri-id'], $uid) as $savedFolderName) {
if (!empty($item['author-link'])) {
- $url = $item['author-link'] . "?category=" . rawurlencode($savedFolderName);
+ $url = $item['author-link'] . '/conversations?category=' . rawurlencode($savedFolderName);
} else {
$url = '#';
}
// select someone by nick in the current network
if (!DBA::isResult($contact) && ($network != '')) {
- $condition = ["`nick` = ? AND `network` = ? AND `uid` = ?",
- $name, $network, $profile_uid];
+ $condition = ['nick' => $name, 'network' => $network, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition);
}
// select someone by attag in the current network
if (!DBA::isResult($contact) && ($network != '')) {
- $condition = ["`attag` = ? AND `network` = ? AND `uid` = ?",
- $name, $network, $profile_uid];
+ $condition = ['attag' => $name, 'network' => $network, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition);
}
// select someone by nick in any network
if (!DBA::isResult($contact)) {
- $condition = ["`nick` = ? AND `uid` = ?", $name, $profile_uid];
+ $condition = ['nick' => $name, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition);
}
// select someone by attag in any network
if (!DBA::isResult($contact)) {
- $condition = ["`attag` = ? AND `uid` = ?", $name, $profile_uid];
+ $condition = ['attag' => $name, 'uid' => $profile_uid];
$contact = DBA::selectFirst('contact', $fields, $condition);
}
$replaced = true;
// create profile link
$profile = str_replace(',', '%2c', $profile);
- $newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
+ $newtag = $tag_type . '[url=' . $profile . ']' . $newname . '[/url]';
$body = str_replace($tag_type . $name, $newtag, $body);
}
}
$xmlhead = '<?xml version="1.0" encoding="UTF-8" ?>';
if ($this->activity->match($item['verb'], Activity::TAG)) {
- $fields = ['author-id', 'author-link', 'author-name', 'author-network',
- 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+ $fields = [
+ 'author-id', 'author-link', 'author-name', 'author-network',
+ 'verb', 'object-type', 'resource-id', 'body', 'plink'
+ ];
$obj = Post::selectFirst($fields, ['uri' => $item['parent-uri']]);
if (!DBA::isResult($obj)) {
$this->profiler->stopRecording();
}
$author_arr = [
- 'uid' => 0,
- 'id' => $item['author-id'],
+ 'uid' => 0,
+ 'id' => $item['author-id'],
'network' => $item['author-network'],
- 'url' => $item['author-link'],
+ 'url' => $item['author-link'],
+ 'alias' => $item['author-alias'],
];
$author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
$author_arr = [
- 'uid' => 0,
- 'id' => $obj['author-id'],
+ 'uid' => 0,
+ 'id' => $obj['author-id'],
'network' => $obj['author-network'],
- 'url' => $obj['author-link'],
+ 'url' => $obj['author-link'],
+ 'alias' => $obj['author-alias'],
];
$objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
default:
if ($obj['resource-id']) {
$post_type = $this->l10n->t('photo');
- $m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
- $rr['plink'] = $m[1];
+ preg_match("/\[url=([^]]*)\]/", $obj['body'], $matches);
+ $rr['plink'] = $matches[1];
} else {
$post_type = $this->l10n->t('status');
}
- // Let's break everthing ... ;-)
+ // Let's break everything ... ;-)
break;
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
}
$author = [
- 'uid' => 0,
- 'id' => $item['author-id'],
+ 'uid' => 0,
+ 'id' => $item['author-id'],
'network' => $item['author-network'],
- 'url' => $item['author-link'],
+ 'url' => $item['author-link'],
+ 'alias' => $item['author-alias'],
];
$profile_link = Contact::magicLinkByContact($author, $item['author-link']);
- $sparkle = (strpos($profile_link, 'contact/redir/') === 0);
+ if (strpos($profile_link, 'contact/redir/') === 0) {
+ $status_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/status']);
+ $photos_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/photos']);
+ $profile_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/profile']);
+ }
$cid = 0;
$pcid = $item['author-id'];
$rel = $contact['rel'];
}
- if ($sparkle) {
- $status_link = $profile_link . '/status';
- $photos_link = $profile_link . '/photos';
- $profile_link = $profile_link . '/profile';
- }
-
if (!empty($pcid)) {
$contact_url = 'contact/' . $pcid;
$posts_link = $contact_url . '/posts';
}
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
- in_array($item['network'], Protocol::FEDERATED)) {
+ in_array($item['network'], Protocol::FEDERATED)
+ ) {
$menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1';
}
} else {
{
// Look for any tags and linkify them
$item['inform'] = '';
- $private_forum = false;
+ $private_group = false;
$private_id = null;
- $only_to_forum = false;
- $forum_contact = [];
+ $only_to_group = false;
+ $group_contact = [];
$receivers = [];
// Convert mentions in the body to a unified format
$item['body'] = BBCode::setMentions($item['body'], $item['uid'], $item['network']);
- // Search for forum mentions
+ // Search for group mentions
foreach (Tag::getFromBody($item['body'], Tag::TAG_CHARACTER[Tag::MENTION] . Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]) as $tag) {
$contact = Contact::getByURLForUser($tag[2], $item['uid']);
if (empty($contact)) {
}
if (!empty($contact['prv']) || ($tag[1] == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) {
- $private_forum = $contact['prv'];
- $only_to_forum = ($tag[1] == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]);
+ $private_group = $contact['prv'];
+ $only_to_group = ($tag[1] == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]);
$private_id = $contact['id'];
- $forum_contact = $contact;
- Logger::info('Private forum or exclusive mention', ['url' => $tag[2], 'mention' => $tag[1]]);
+ $group_contact = $contact;
+ Logger::info('Private group or exclusive mention', ['url' => $tag[2], 'mention' => $tag[1]]);
} elseif ($item['allow_cid'] == '<' . $contact['id'] . '>') {
- $private_forum = false;
- $only_to_forum = true;
+ $private_group = false;
+ $only_to_group = true;
$private_id = $contact['id'];
- $forum_contact = $contact;
- Logger::info('Public forum', ['url' => $tag[2], 'mention' => $tag[1]]);
+ $group_contact = $contact;
+ Logger::info('Public group', ['url' => $tag[2], 'mention' => $tag[1]]);
} else {
- Logger::info('Post with forum mention will not be converted to a forum post', ['url' => $tag[2], 'mention' => $tag[1]]);
+ Logger::info('Post with group mention will not be converted to a group post', ['url' => $tag[2], 'mention' => $tag[1]]);
}
}
Logger::info('Got inform', ['inform' => $item['inform']]);
- if (($item['gravity'] == ItemModel::GRAVITY_PARENT) && !empty($forum_contact) && ($private_forum || $only_to_forum)) {
- // we tagged a forum in a top level post. Now we change the post
- $item['private'] = $private_forum ? ItemModel::PRIVATE : ItemModel::UNLISTED;
-
- if ($only_to_forum) {
+ if (($item['gravity'] == ItemModel::GRAVITY_PARENT) && !empty($group_contact) && ($private_group || $only_to_group)) {
+ // we tagged a group in a top level post. Now we change the post
+ $item['private'] = $private_group ? ItemModel::PRIVATE : ItemModel::UNLISTED;
+
+ if ($only_to_group) {
+ $cdata = Contact::getPublicAndUserContactID($group_contact['id'], $item['uid']);
+ if (!empty($cdata['user'])) {
+ $item['owner-id'] = $cdata['user'];
+ unset($item['owner-link']);
+ unset($item['owner-name']);
+ unset($item['owner-avatar']);
+ }
+
$item['postopts'] = '';
}
$item['deny_cid'] = '';
$item['deny_gid'] = '';
- if ($private_forum) {
+ if ($private_group) {
$item['allow_cid'] = '<' . $private_id . '>';
- $item['allow_gid'] = '<' . Group::getIdForForum($forum_contact['id']) . '>';
+ $item['allow_gid'] = '<' . Circle::getIdForGroup($group_contact['id']) . '>';
} else {
$item['allow_cid'] = '';
$item['allow_gid'] = '';
}
- } elseif ($setPermissions && ($item['gravity'] == ItemModel::GRAVITY_PARENT)) {
+ } elseif ($setPermissions) {
if (empty($receivers)) {
// For security reasons direct posts without any receiver will be posts to yourself
$self = Contact::selectFirst(['id'], ['uid' => $item['uid'], 'self' => true]);
* Add a share block for the given item array
*
* @param array $item
- * @param bool $add_media
+ * @param bool $add_media true = Media is added to the body
+ * @param bool $for_display true = The share block is used for display purposes, false = used for connectors, transport to other systems, ...
* @return string
*/
- public function createSharedBlockByArray(array $item, bool $add_media = false): string
+ public function createSharedBlockByArray(array $item, bool $add_media = false, bool $for_display = false): string
{
if ($item['network'] == Protocol::FEED) {
return PageInfo::getFooterFromUrl($item['plink']);
- } elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED)) {
+ } elseif (!in_array($item['network'] ?? '', Protocol::FEDERATED) && !$for_display) {
$item['guid'] = '';
$item['uri'] = '';
}
// 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'], true))) {
+ if (($item['network'] != Protocol::BLUESKY) && !empty($shared['guid']) && ($encapsulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
if (!empty(BBCode::fetchShareAttributes($item['body']))) {
- $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+ $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encapsulated_share, $item['body']);
} else {
- $item['body'] .= $encaspulated_share;
+ $item['body'] .= $encapsulated_share;
}
}
$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
$user = User::getById($post['uid'], ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
if (!$user) {
- throw new HTTPException\NotFoundException($this->l10n->t('Unable to locate original post.'));
+ throw new HTTPException\NotFoundException($this->l10n->t('Unable to fetch user.'));
}
$post['allow_cid'] = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? '';
- $post['allow_gid'] = isset($request['group_allow']) ? $this->aclFormatter->toString($request['group_allow']) : $user['allow_gid'] ?? '';
+ $post['allow_gid'] = isset($request['circle_allow']) ? $this->aclFormatter->toString($request['circle_allow']) : $user['allow_gid'] ?? '';
$post['deny_cid'] = isset($request['contact_deny']) ? $this->aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? '';
- $post['deny_gid'] = isset($request['group_deny']) ? $this->aclFormatter->toString($request['group_deny']) : $user['deny_gid'] ?? '';
+ $post['deny_gid'] = isset($request['circle_deny']) ? $this->aclFormatter->toString($request['circle_deny']) : $user['deny_gid'] ?? '';
$visibility = $request['visibility'] ?? '';
if ($visibility === 'public') {
public function moveAttachmentsFromBodyToAttach(array $post): array
{
- if (!preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$post['body'], $match)) {
+ if (!preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/', $post['body'], $match)) {
return $post;
}
if ($post['attach']) {
$post['attach'] .= ',';
}
- $post['attach'] .= Post\Media::getAttachElement($this->baseURL->get() . '/attach/' . $attachment['id'],
- $attachment['filesize'], $attachment['filetype'], $attachment['filename'] ?? '');
-
- $fields = ['allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'],
- 'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']];
+ $post['attach'] .= Post\Media::getAttachElement(
+ $this->baseURL . '/attach/' . $attachment['id'],
+ $attachment['filesize'],
+ $attachment['filetype'],
+ $attachment['filename'] ?? ''
+ );
+
+ $fields = [
+ 'allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'],
+ 'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']
+ ];
$condition = ['id' => $attachment_id];
Attach::update($fields, $condition);
}
// embedded bookmark or attachment in post? set bookmark flag
$data = BBCode::getAttachmentData($post['body']);
- if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || isset($data['type']))
- && ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)) {
+ if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || !empty($data['type']))
+ && ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)
+ ) {
$post['post-type'] = ItemModel::PT_PAGE;
$post['object-type'] = Activity\ObjectType::BOOKMARK;
}
// Setting the object type if not defined before
if (empty($post['object-type'])) {
$post['object-type'] = ($post['gravity'] == ItemModel::GRAVITY_PARENT) ? Activity\ObjectType::NOTE : Activity\ObjectType::COMMENT;
-
- $objectdata = BBCode::getAttachedData($post['body']);
-
- if ($objectdata['type'] == 'link') {
- $post['object-type'] = Activity\ObjectType::BOOKMARK;
- } elseif ($objectdata['type'] == 'video') {
- $post['object-type'] = Activity\ObjectType::VIDEO;
- } elseif ($objectdata['type'] == 'photo') {
- $post['object-type'] = Activity\ObjectType::IMAGE;
- }
}
return $post;
}
public function initializePost(array $post): array
{
- $post['network'] = Protocol::DFRN;
- $post['protocol'] = Conversation::PARCEL_DIRECT;
- $post['direction'] = Conversation::PUSH;
- $post['received'] = DateTimeFormat::utcNow();
- $post['origin'] = true;
- $post['wall'] = $post['wall'] ?? true;
- $post['guid'] = $post['guid'] ?? System::createUUID();
- $post['uri'] = $post['uri'] ?? ItemModel::newURI($post['guid']);
- $post['verb'] = $post['verb'] ?? Activity::POST;
+ $post['network'] = Protocol::DFRN;
+ $post['protocol'] = Conversation::PARCEL_DIRECT;
+ $post['direction'] = Conversation::PUSH;
+ $post['received'] = DateTimeFormat::utcNow();
+ $post['origin'] = true;
+ $post['wall'] = $post['wall'] ?? true;
+ $post['guid'] = $post['guid'] ?? System::createUUID();
+ $post['verb'] = $post['verb'] ?? Activity::POST;
+ $post['uri'] = $post['uri'] ?? ItemModel::newURI($post['guid']);
+ $post['thr-parent'] = $post['thr-parent'] ?? $post['uri'];
+
+ if (empty($post['gravity'])) {
+ $post['gravity'] = ($post['uri'] == $post['thr-parent']) ? ItemModel::GRAVITY_PARENT : ItemModel::GRAVITY_COMMENT;
+ }
+
$owner = User::getOwnerDataById($post['uid']);
+ if (!isset($post['allow_cid']) || !isset($post['allow_gid']) || !isset($post['deny_cid']) || !isset($post['deny_gid'])) {
+ $post['allow_cid'] = $owner['allow_cid'];
+ $post['allow_gid'] = $owner['allow_gid'];
+ $post['deny_cid'] = $owner['deny_cid'];
+ $post['deny_gid'] = $owner['deny_gid'];
+ }
+
+ if ($post['allow_gid'] || $post['allow_cid'] || $post['deny_gid'] || $post['deny_cid']) {
+ $post['private'] = ItemModel::PRIVATE;
+ } elseif ($this->pConfig->get($post['uid'], 'system', 'unlisted')) {
+ $post['private'] = ItemModel::UNLISTED;
+ } else {
+ $post['private'] = ItemModel::PUBLIC;
+ }
+
if (empty($post['contact-id'])) {
$post['contact-id'] = $owner['id'];
}
// Convert links with empty descriptions to links without an explicit description
$post['body'] = trim(preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $post['body']));
$post['body'] = $this->bbCodeVideo->transform($post['body']);
- $post['body'] = BBCode::scaleExternalImages($post['body']);
$post = $this->setObjectType($post);
- // Personal notes must never be altered to a forum post.
+ // Personal notes must never be altered to a group post.
if ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE) {
// Look for any tags and linkify them
$post = $this->expandTags($post);
continue;
}
- $this->emailer->send(new ItemCCEMail($this->app, $this->l10n, $this->baseURL,
- $post, $address, $author['thumb'] ?? ''));
+ $this->emailer->send(new ItemCCEMail(
+ $this->app,
+ $this->l10n,
+ $this->baseURL,
+ $post,
+ $address,
+ $author['thumb'] ?? ''
+ ));
}
}
}
projects / friendica.git / blobdiff