*/
use Friendica\App;
-use Friendica\Content\Pager;
+use Friendica\Content\Item as ItemHelper;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Model\Item;
use Friendica\Model\Notify\Type;
use Friendica\Model\Photo;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
use Friendica\Network\HTTPException;
use Friendica\Object\EMail\ItemCCEMail;
use Friendica\Protocol\Activity;
$toplevel_item_id = intval($_REQUEST['parent'] ?? 0);
$thr_parent_uri = trim($_REQUEST['parent_uri'] ?? '');
- $thread_parent_id = 0;
- $thread_parent_contact = null;
-
$toplevel_item = null;
$parent_user = null;
- $parent_contact = null;
-
$objecttype = null;
$profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user();
$posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE;
// if this isn't the top-level parent of the conversation, find it
if (DBA::isResult($toplevel_item)) {
// The URI and the contact is taken from the direct parent which needn't to be the top parent
- $thread_parent_id = $toplevel_item['id'];
$thr_parent_uri = $toplevel_item['uri'];
- $thread_parent_contact = Contact::getDetailsByURL($toplevel_item["author-link"]);
- if ($toplevel_item['id'] != $toplevel_item['parent']) {
+ if ($toplevel_item['gravity'] != GRAVITY_PARENT) {
$toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]);
}
}
$body = preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $body);
if (!empty($orig_post)) {
- $str_group_allow = $orig_post['allow_gid'] ?? '';
- $str_contact_allow = $orig_post['allow_cid'] ?? '';
- $str_group_deny = $orig_post['deny_gid'] ?? '';
- $str_contact_deny = $orig_post['deny_cid'] ?? '';
+ $str_group_allow = $orig_post['allow_gid'];
+ $str_contact_allow = $orig_post['allow_cid'];
+ $str_group_deny = $orig_post['deny_gid'];
+ $str_contact_deny = $orig_post['deny_cid'];
$location = $orig_post['location'];
$coord = $orig_post['coord'];
$verb = $orig_post['verb'];
$objecttype = $orig_post['object-type'];
$app = $orig_post['app'];
- $categories = $orig_post['file'];
+ $categories = $orig_post['file'] ?? '';
$title = Strings::escapeTags(trim($_REQUEST['title']));
$body = trim($body);
$private = $orig_post['private'];
$guid = $orig_post['guid'];
$extid = $orig_post['extid'];
} else {
- $aclFormatter = DI::aclFormatter();
+ $str_contact_allow = '';
+ $str_group_allow = '';
+ $str_contact_deny = '';
+ $str_group_deny = '';
- $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? '';
- $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact__allow']) : $user['allow_cid'] ?? '';
- $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? '';
- $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? '';
+ if (($_REQUEST['visibility'] ?? '') !== 'public') {
+ $aclFormatter = DI::aclFormatter();
+ $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
+ $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? '';
+ $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? '';
+ $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? '';
+ }
$title = Strings::escapeTags(trim($_REQUEST['title'] ?? ''));
$location = Strings::escapeTags(trim($_REQUEST['location'] ?? ''));
}
// Look for any tags and linkify them
- $str_tags = '';
$inform = '';
-
- $tags = BBCode::getTags($body);
-
- if ($thread_parent_id && !\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions')) {
- $tags = item_add_implicit_mentions($tags, $thread_parent_contact, $thread_parent_id);
- }
-
- $tagged = [];
-
$private_forum = false;
+ $private_id = null;
$only_to_forum = false;
$forum_contact = [];
- if (count($tags)) {
+ $body = BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code'], function ($body) use ($profile_uid, $network, $str_contact_allow, &$inform, &$private_forum, &$private_id, &$only_to_forum, &$forum_contact) {
+ $tags = BBCode::getTags($body);
+
+ $tagged = [];
+
foreach ($tags as $tag) {
$tag_type = substr($tag, 0, 1);
- if ($tag_type == Term::TAG_CHARACTER[Term::HASHTAG]) {
+ if ($tag_type == Tag::TAG_CHARACTER[Tag::HASHTAG]) {
continue;
}
- /*
- * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+ /* If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
* Robert Johnson should be first in the $tags array
*/
- $fullnametagged = false;
- /// @TODO $tagged is initialized above if () block and is not filled, maybe old-lost code?
foreach ($tagged as $nextTag) {
if (stristr($nextTag, $tag . ' ')) {
- $fullnametagged = true;
- break;
+ continue 2;
}
}
- if ($fullnametagged) {
- continue;
- }
- $success = handle_tag($body, $inform, $str_tags, local_user() ? local_user() : $profile_uid, $tag, $network);
+ $success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network);
if ($success['replaced']) {
$tagged[] = $tag;
}
// When the forum is private or the forum is addressed with a "!" make the post private
- if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]))) {
+ if (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) {
$private_forum = $success['contact']['prv'];
- $only_to_forum = ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]);
+ $only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]);
$private_id = $success['contact']['id'];
$forum_contact = $success['contact'];
- } elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
- ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
+ } elseif (!empty($success['contact']['forum']) && ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
$private_forum = false;
$only_to_forum = true;
$private_id = $success['contact']['id'];
$forum_contact = $success['contact'];
}
}
- }
+
+ return $body;
+ });
$original_contact_id = $contact_id;
$match = null;
- if (!$preview && Photo::setPermissionFromBody($body, $profile_uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
+ if (!$preview && Photo::setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
$objecttype = Activity\ObjectType::IMAGE;
}
$datarray['app'] = $app;
$datarray['location'] = $location;
$datarray['coord'] = $coord;
- $datarray['tag'] = $str_tags;
$datarray['file'] = $categories;
$datarray['inform'] = $inform;
$datarray['verb'] = $verb;
// Check for hashtags in the body and repair or add hashtag links
if ($preview || $orig_post) {
- Item::setHashtags($datarray);
+ $datarray['body'] = Item::setHashtags($datarray['body']);
}
// preview mode - prepare the body for display and send it via json
// We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID.
$datarray["id"] = -1;
+ $datarray["uri-id"] = -1;
$datarray["item_id"] = -1;
$datarray["author-network"] = Protocol::DFRN;
$fields = [
'title' => $datarray['title'],
'body' => $datarray['body'],
- 'tag' => $datarray['tag'],
'attach' => $datarray['attach'],
'file' => $datarray['file'],
'rendered-html' => $datarray['rendered-html'],
throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.'));
}
+ Tag::storeFromBody($datarray['uri-id'], $datarray['body']);
+
+ if (!\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions') && ($datarray['gravity'] == GRAVITY_COMMENT)) {
+ Tag::createImplicitMentions($datarray['uri-id'], $datarray['thr-parent-id']);
+ }
+
// update filetags in pconfig
FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
return $o;
}
-
-/**
- * This function removes the tag $tag from the text $body and replaces it with
- * the appropriate link.
- *
- * @param App $a
- * @param string $body the text to replace the tag in
- * @param string $inform a comma-seperated string containing everybody to inform
- * @param string $str_tags string to add the tag to
- * @param integer $profile_uid
- * @param string $tag the tag to replace
- * @param string $network The network of the post
- *
- * @return array|bool ['replaced' => $replaced, 'contact' => $contact];
- * @throws ImagickException
- * @throws HTTPException\InternalServerErrorException
- */
-function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "")
-{
- $replaced = false;
- $r = null;
-
- //is it a person tag?
- if (Term::isType($tag, Term::MENTION, Term::IMPLICIT_MENTION, Term::EXCLUSIVE_MENTION)) {
- $tag_type = substr($tag, 0, 1);
- //is it already replaced?
- if (strpos($tag, '[url=')) {
- //append tag to str_tags
- if (!stristr($str_tags, $tag)) {
- if (strlen($str_tags)) {
- $str_tags .= ',';
- }
- $str_tags .= $tag;
- }
-
- // Checking for the alias that is used for OStatus
- $pattern = "/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism";
- if (preg_match($pattern, $tag, $matches)) {
- $data = Contact::getDetailsByURL($matches[1]);
-
- if ($data["alias"] != "") {
- $newtag = '@[url=' . $data["alias"] . ']' . $data["nick"] . '[/url]';
-
- if (!stripos($str_tags, '[url=' . $data["alias"] . ']')) {
- if (strlen($str_tags)) {
- $str_tags .= ',';
- }
-
- $str_tags .= $newtag;
- }
- }
- }
-
- return $replaced;
- }
-
- //get the person's name
- $name = substr($tag, 1);
-
- // Sometimes the tag detection doesn't seem to work right
- // This is some workaround
- $nameparts = explode(" ", $name);
- $name = $nameparts[0];
-
- // Try to detect the contact in various ways
- if (strpos($name, 'http://')) {
- // At first we have to ensure that the contact exists
- Contact::getIdForURL($name);
-
- // Now we should have something
- $contact = Contact::getDetailsByURL($name);
- } elseif (strpos($name, '@')) {
- // This function automatically probes when no entry was found
- $contact = Contact::getDetailsByAddr($name);
- } else {
- $contact = false;
- $fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];
-
- if (strrpos($name, '+')) {
- // Is it in format @nick+number?
- $tagcid = intval(substr($name, strrpos($name, '+') + 1));
- $contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
- }
-
- // select someone by nick or attag in the current network
- if (!DBA::isResult($contact) && ($network != "")) {
- $condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
- $name, $name, $network, $profile_uid];
- $contact = DBA::selectFirst('contact', $fields, $condition);
- }
-
- //select someone by name in the current network
- if (!DBA::isResult($contact) && ($network != "")) {
- $condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
- $contact = DBA::selectFirst('contact', $fields, $condition);
- }
-
- // select someone by nick or attag in any network
- if (!DBA::isResult($contact)) {
- $condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
- $contact = DBA::selectFirst('contact', $fields, $condition);
- }
-
- // select someone by name in any network
- if (!DBA::isResult($contact)) {
- $condition = ['name' => $name, 'uid' => $profile_uid];
- $contact = DBA::selectFirst('contact', $fields, $condition);
- }
- }
-
- // Check if $contact has been successfully loaded
- if (DBA::isResult($contact)) {
- if (strlen($inform) && (isset($contact["notify"]) || isset($contact["id"]))) {
- $inform .= ',';
- }
-
- if (isset($contact["id"])) {
- $inform .= 'cid:' . $contact["id"];
- } elseif (isset($contact["notify"])) {
- $inform .= $contact["notify"];
- }
-
- $profile = $contact["url"];
- $alias = $contact["alias"];
- $newname = ($contact["name"] ?? '') ?: $contact["nick"];
- }
-
- //if there is an url for this persons profile
- if (isset($profile) && ($newname != "")) {
- $replaced = true;
- // create profile link
- $profile = str_replace(',', '%2c', $profile);
- $newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
- $body = str_replace($tag_type . $name, $newtag, $body);
- // append tag to str_tags
- if (!stristr($str_tags, $newtag)) {
- if (strlen($str_tags)) {
- $str_tags .= ',';
- }
- $str_tags .= $newtag;
- }
-
- /*
- * Status.Net seems to require the numeric ID URL in a mention if the person isn't
- * subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
- */
- if (!empty($alias)) {
- $newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
- if (!stripos($str_tags, '[url=' . $alias . ']')) {
- if (strlen($str_tags)) {
- $str_tags .= ',';
- }
- $str_tags .= $newtag;
- }
- }
- }
- }
-
- return ['replaced' => $replaced, 'contact' => $contact];
-}
-
-function item_add_implicit_mentions(array $tags, array $thread_parent_contact, $thread_parent_id)
-{
- if (DI::config()->get('system', 'disable_implicit_mentions')) {
- // Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
- if (in_array($thread_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
- $contact = Term::TAG_CHARACTER[Term::MENTION] . '[url=' . $thread_parent_contact['url'] . ']' . $thread_parent_contact['nick'] . '[/url]';
- if (!stripos(implode($tags), '[url=' . $thread_parent_contact['url'] . ']')) {
- $tags[] = $contact;
- }
- }
- } else {
- $implicit_mentions = [
- $thread_parent_contact['url'] => $thread_parent_contact['nick']
- ];
-
- $parent_terms = Term::tagArrayFromItemId($thread_parent_id, [Term::MENTION, Term::IMPLICIT_MENTION]);
-
- foreach ($parent_terms as $parent_term) {
- $implicit_mentions[$parent_term['url']] = $parent_term['term'];
- }
-
- foreach ($implicit_mentions as $url => $label) {
- if ($url != \Friendica\Model\Profile::getMyURL() && !stripos(implode($tags), '[url=' . $url . ']')) {
- $tags[] = Term::TAG_CHARACTER[Term::IMPLICIT_MENTION] . '[url=' . $url . ']' . $label . '[/url]';
- }
- }
- }
-
- return $tags;
-}
projects / friendica.git / blobdiff