]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge remote-tracking branch 'upstream/2022.05-rc' into performance
[friendica.git] / mod / item.php
index 00248df4306c40e5b86b2157278bab5eea36b79a..498cf27132a5a70bf5c1ed4f44f58dc1ad2e5bf3 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,7 +29,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Item as ItemHelper;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
@@ -37,10 +36,8 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\APContact;
 use Friendica\Model\Attach;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
@@ -58,7 +55,6 @@ use Friendica\Protocol\Activity;
 use Friendica\Security\Security;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\ParseUrl;
-use Friendica\Worker\Delivery;
 
 function item_post(App $a) {
        if (!Session::isAuthenticated()) {
@@ -177,10 +173,11 @@ function item_post(App $a) {
        }
 
        // Allow commenting if it is an answer to a public post
-       $allow_comment = local_user() && ($profile_uid == 0) && $toplevel_item_id && in_array($toplevel_item['network'], Protocol::FEDERATED);
+       $allow_comment = local_user() && $toplevel_item_id && in_array($toplevel_item['private'], [Item::PUBLIC, Item::UNLISTED]) && in_array($toplevel_item['network'], Protocol::FEDERATED);
 
        // Now check that valid personal details have been provided
        if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
+               Logger::notice('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]);
                notice(DI::l10n()->t('Permission denied.'));
                if ($return_path) {
                        DI::baseUrl()->redirect($return_path);
@@ -351,7 +348,8 @@ function item_post(App $a) {
                $filedas = FileTag::fileToArray($categories);
        }
 
-       $categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category');
+       $list_array = explode(',', trim($_REQUEST['category'] ?? ''));
+       $categories = FileTag::arrayToFile($list_array, 'category');
 
        if (!empty($filedas) && is_array($filedas)) {
                // append the fileas stuff to the new categories list
@@ -382,87 +380,34 @@ function item_post(App $a) {
                $contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]) ?: [];
        }
 
-       // Look for any tags and linkify them
-       $inform   = '';
-       $private_forum = false;
-       $private_id = null;
-       $only_to_forum = false;
-       $forum_contact = [];
-
-       $body = BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], 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 == Tag::TAG_CHARACTER[Tag::HASHTAG]) {
-                               continue;
-                       }
-
-                       /* If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
-                        * Robert Johnson should be first in the $tags array
-                        */
-                       foreach ($tagged as $nextTag) {
-                               if (stristr($nextTag, $tag . ' ')) {
-                                       continue 2;
-                               }
-                       }
-
-                       if ($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 (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) {
-                                       $private_forum = $success['contact']['prv'];
-                                       $only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]);
-                                       $private_id = $success['contact']['id'];
-                                       $forum_contact = $success['contact'];
-                               } 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;
-
-       if (!$toplevel_item_id && !empty($forum_contact) && ($private_forum || $only_to_forum)) {
-               // we tagged a forum in a top level post. Now we change the post
-               $private = $private_forum ? Item::PRIVATE : Item::UNLISTED;
-
-               if ($only_to_forum) {
-                       $postopts = '';
-               }
-
-               if (!$private_forum) {
-                       $str_contact_allow = '';
-                       $str_group_allow   = '';
-                       $str_contact_deny  = '';
-                       $str_group_deny    = '';
-               }
-
-               if ($private_forum || !APContact::getByURL($forum_contact['url'])) {
-                       $str_group_allow = '';
-                       $str_contact_deny = '';
-                       $str_group_deny = '';
-                       if ($private_forum) {
-                               $str_contact_allow = '<' . $private_id . '>';
-                       } else {
-                               $str_contact_allow = '';
-                       }
-                       $contact_id = $private_id;
-                       $contact_record = $forum_contact;
-                       $_REQUEST['origin'] = false;
-                       $wall = 0;
-               }
+       // Personal notes must never be altered to a forum post.
+       if ($posttype != Item::PT_PERSONAL_NOTE) {
+               // Look for any tags and linkify them
+               $item = [
+                       'uid'       => local_user() ? local_user() : $profile_uid,
+                       'gravity'   => $toplevel_item_id ? GRAVITY_COMMENT : GRAVITY_PARENT,
+                       'network'   => $network,
+                       'body'      => $body,
+                       'postopts'  => $postopts,
+                       'private'   => $private,
+                       'allow_cid' => $str_contact_allow,
+                       'allow_gid' => $str_group_allow,
+                       'deny_cid'  => $str_contact_deny,
+                       'deny_gid'  => $str_group_deny,
+               ];
+
+               $item = DI::contentItem()->expandTags($item);
+
+               $body              = $item['body'];
+               $inform            = $item['inform'];
+               $postopts          = $item['postopts'];
+               $private           = $item['private']; 
+               $str_contact_allow = $item['allow_cid'];
+               $str_group_allow   = $item['allow_gid'];
+               $str_contact_deny  = $item['deny_cid'];
+               $str_group_deny    = $item['deny_gid'];
+       } else {
+               $inform   = '';
        }
 
        /*
@@ -477,7 +422,7 @@ function item_post(App $a) {
 
        $match = null;
 
-       if (!$preview && Photo::setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
+       if (!$preview && Photo::setPermissionFromBody($body, $uid, $contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) {
                $objecttype = Activity\ObjectType::IMAGE;
        }
 
@@ -492,7 +437,7 @@ function item_post(App $a) {
                if (count($attaches)) {
                        foreach ($attaches as $attach) {
                                // Ensure to only modify attachments that you own
-                               $srch = '<' . intval($original_contact_id) . '>';
+                               $srch = '<' . intval($contact_id) . '>';
 
                                $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
                                                'id' => $attach];
@@ -596,11 +541,11 @@ function item_post(App $a) {
        $datarray['author-link']   = $author['url'];
        $datarray['author-avatar'] = $author['thumb'];
        $datarray['author-id']     = Contact::getIdForURL($datarray['author-link']);
-       $datarray['created']       = DateTimeFormat::utcNow();
-       $datarray['edited']        = DateTimeFormat::utcNow();
-       $datarray['commented']     = DateTimeFormat::utcNow();
+       $datarray['created']       = empty($_REQUEST['created_at']) ? DateTimeFormat::utcNow() : $_REQUEST['created_at'];
+       $datarray['edited']        = $datarray['created'];
+       $datarray['commented']     = $datarray['created'];
+       $datarray['changed']       = $datarray['created'];
        $datarray['received']      = DateTimeFormat::utcNow();
-       $datarray['changed']       = DateTimeFormat::utcNow();
        $datarray['extid']         = $extid;
        $datarray['guid']          = $guid;
        $datarray['uri']           = $uri;
@@ -676,6 +621,9 @@ function item_post(App $a) {
                $datarray["id"] = -1;
                $datarray["uri-id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
+               $datarray["author-updated"] = '';
+               $datarray["author-gsid"] = 0;
+               $datarray["owner-updated"] = '';
 
                $o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true);
 
@@ -685,7 +633,7 @@ function item_post(App $a) {
        Hook::callAll('post_local',$datarray);
 
        if (!empty($_REQUEST['scheduled_at'])) {
-               $scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimezone());
+               $scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimeZone());
                if ($scheduled_at > DateTimeFormat::utcNow()) {
                        unset($datarray['created']);
                        unset($datarray['edited']);
@@ -776,7 +724,7 @@ function item_post(App $a) {
        // These notifications are sent if someone else is commenting other your wall
        if ($contact_record != $author) {
                if ($toplevel_item_id) {
-                       notification([
+                       DI::notify()->createFromArray([
                                'type'  => Notification\Type::COMMENT,
                                'otype' => Notification\ObjectType::ITEM,
                                'verb'  => Activity::POST,
@@ -786,7 +734,7 @@ function item_post(App $a) {
                                'link'  => DI::baseUrl() . '/display/' . urlencode($datarray['guid']),
                        ]);
                } elseif (empty($forum_contact)) {
-                       notification([
+                       DI::notify()->createFromArray([
                                'type'  => Notification\Type::WALL,
                                'otype' => Notification\ObjectType::ITEM,
                                'verb'  => Activity::POST,
@@ -814,12 +762,6 @@ function item_post(App $a) {
                }
        }
 
-       // When we are doing some forum posting via ! we have to start the notifier manually.
-       // These kind of posts don't initiate the notifier call in the item class.
-       if ($only_to_forum) {
-               Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, (int)$datarray['uri-id'], (int)$datarray['uid']);
-       }
-
        Logger::info('post_complete');
 
        if ($api_source) {
@@ -931,6 +873,7 @@ function drop_item(int $id, string $return = '')
 
                item_redirect_after_action($item, $return);
        } else {
+               Logger::notice('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]);
                notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('display/' . $item['guid']);
                //NOTREACHED