]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge pull request #8742 from MrPetovan/task/blocklist-safelist
[friendica.git] / mod / item.php
index 30b5f5aefa472541d9ffa6d108eb50dc990ae9b9..b023b97d19ef5a014edf9192dfc5494def96a27b 100644 (file)
@@ -100,14 +100,9 @@ function item_post(App $a) {
        $toplevel_item_id = intval($_REQUEST['parent'] ?? 0);
        $thr_parent_uri = trim($_REQUEST['parent_uri'] ?? '');
 
-       $thread_parent_uriid = 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;
@@ -122,11 +117,9 @@ function item_post(App $a) {
                // 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_uriid = $toplevel_item['uri-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']]);
                        }
                }
@@ -252,7 +245,7 @@ function item_post(App $a) {
                $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'];
@@ -375,15 +368,10 @@ function item_post(App $a) {
        }
 
        // Look for any tags and linkify them
-       $str_tags = '';
        $inform   = '';
 
        $tags = BBCode::getTags($body);
 
-       if ($thread_parent_uriid && !\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions')) {
-               $tags = item_add_implicit_mentions($tags, $thread_parent_contact, $thread_parent_uriid);
-       }
-
        $tagged = [];
 
        $private_forum = false;
@@ -414,7 +402,7 @@ function item_post(App $a) {
                                continue;
                        }
 
-                       $success = handle_tag($body, $inform, $str_tags, local_user() ? local_user() : $profile_uid, $tag, $network);
+                       $success = handle_tag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network);
                        if ($success['replaced']) {
                                $tagged[] = $tag;
                        }
@@ -598,7 +586,6 @@ function item_post(App $a) {
        $datarray['app']           = $app;
        $datarray['location']      = $location;
        $datarray['coord']         = $coord;
-       $datarray['tag']           = $str_tags;
        $datarray['file']          = $categories;
        $datarray['inform']        = $inform;
        $datarray['verb']          = $verb;
@@ -663,6 +650,7 @@ function item_post(App $a) {
                // 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;
 
@@ -695,7 +683,6 @@ function item_post(App $a) {
                $fields = [
                        'title' => $datarray['title'],
                        'body' => $datarray['body'],
-                       'tag' => $datarray['tag'],
                        'attach' => $datarray['attach'],
                        'file' => $datarray['file'],
                        'rendered-html' => $datarray['rendered-html'],
@@ -751,6 +738,10 @@ function item_post(App $a) {
 
        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');
 
@@ -890,7 +881,6 @@ function item_content(App $a)
  * @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
@@ -899,24 +889,15 @@ function item_content(App $a)
  * @throws ImagickException
  * @throws HTTPException\InternalServerErrorException
  */
-function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "")
+function handle_tag(&$body, &$inform, $profile_uid, $tag, $network = "")
 {
        $replaced = false;
-       $r = null;
 
        //is it a person tag?
        if (Tag::isType($tag, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::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)) {
@@ -924,14 +905,6 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
 
                                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;
-                                       }
                                }
                        }
 
@@ -1005,7 +978,6 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
                        }
 
                        $profile = $contact["url"];
-                       $alias   = $contact["alias"];
                        $newname = ($contact["name"] ?? '') ?: $contact["nick"];
                }
 
@@ -1016,60 +988,8 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
                        $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_uriid)
-{
-       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 = Tag::TAG_CHARACTER[Tag::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 = Tag::getByURIId($thread_parent_uriid, [Tag::MENTION, Tag::IMPLICIT_MENTION]);
-
-               foreach ($parent_terms as $parent_term) {
-                       $implicit_mentions[$parent_term['url']] = $parent_term['name'];
-               }
-
-               foreach ($implicit_mentions as $url => $label) {
-                       if ($url != \Friendica\Model\Profile::getMyURL() && !stripos(implode($tags), '[url=' . $url . ']')) {
-                               $tags[] = Tag::TAG_CHARACTER[Tag::IMPLICIT_MENTION] . '[url=' . $url . ']' . $label . '[/url]';
-                       }
-               }
-       }
-
-       return $tags;
-}