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;
}
$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]';
}
$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';
{
// 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'] = '';
}
$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') {
$post['body'] = $this->bbCodeVideo->transform($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);
projects / friendica.git / blobdiff