]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge pull request #11005 from nupplaphil/feat/module_di
[friendica.git] / mod / item.php
index 71793f14dc44a6bdc389b6fd1d052d921811a18a..da3eb16c3087b9e0982a6dc238865de3b60bc3df 100644 (file)
@@ -40,6 +40,7 @@ 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;
@@ -54,7 +55,6 @@ use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Object\EMail\ItemCCEMail;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
 use Friendica\Security\Security;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\ParseUrl;
@@ -177,10 +177,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 +352,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
@@ -410,21 +412,22 @@ function item_post(App $a) {
                                }
                        }
 
-                       $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'];
+                       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'];
+                               }
                        }
                }
 
@@ -435,20 +438,33 @@ function item_post(App $a) {
 
        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;
+               $private = $private_forum ? Item::PRIVATE : Item::UNLISTED;
 
-               $str_group_allow = '';
-               $str_contact_deny = '';
-               $str_group_deny = '';
-               if ($private_forum) {
-                       $str_contact_allow = '<' . $private_id . '>';
-               } else {
+               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;
                }
-               $contact_id = $private_id;
-               $contact_record = $forum_contact;
-               $_REQUEST['origin'] = false;
-               $wall = 0;
        }
 
        /*
@@ -614,7 +630,6 @@ function item_post(App $a) {
        $datarray['origin']        = $origin;
        $datarray['object']        = $object;
 
-       $datarray['uri-id']        = ItemURI::getIdByURI($datarray['uri']);
        $datarray['attachments']   = $_REQUEST['attachments'] ?? [];
 
        /*
@@ -664,13 +679,30 @@ function item_post(App $a) {
                $datarray["uri-id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
-               $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
+               $o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true);
 
                System::jsonExit(['preview' => $o]);
        }
 
        Hook::callAll('post_local',$datarray);
 
+       if (!empty($_REQUEST['scheduled_at'])) {
+               $scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimeZone());
+               if ($scheduled_at > DateTimeFormat::utcNow()) {
+                       unset($datarray['created']);
+                       unset($datarray['edited']);
+                       unset($datarray['commented']);
+                       unset($datarray['received']);
+                       unset($datarray['changed']);
+                       unset($datarray['edit']);
+                       unset($datarray['self']);
+                       unset($datarray['api_source']);
+
+                       Post\Delayed::add($datarray['uri'], $datarray, PRIORITY_HIGH, Post\Delayed::PREPARED_NO_HOOK, $scheduled_at);
+                       item_post_return(DI::baseUrl(), $api_source, $return_path);
+               }
+       }
+
        if (!empty($datarray['cancel'])) {
                Logger::info('mod_item: post cancelled by addon.');
                if ($return_path) {
@@ -685,6 +717,8 @@ function item_post(App $a) {
                System::jsonExit($json);
        }
 
+       $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']);
+
        if ($orig_post) {
                // Fill the cache field
                // This could be done in Item::update as well - but we have to check for the existance of some fields.
@@ -713,13 +747,6 @@ function item_post(App $a) {
        unset($datarray['self']);
        unset($datarray['api_source']);
 
-       if ($origin) {
-               $signed = Diaspora::createCommentSignature($uid, $datarray);
-               if (!empty($signed)) {
-                       $datarray['diaspora_signed_text'] = json_encode($signed);
-               }
-       }
-
        $post_id = Item::insert($datarray);
 
        if (!$post_id) {
@@ -751,7 +778,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,
@@ -761,7 +788,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,
@@ -906,6 +933,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