]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge remote-tracking branch 'upstream/develop' into improved-payload
[friendica.git] / mod / item.php
index 7c11d7311a125c393b19530aa1d5a83124084d8a..7693b28c6f09df3beddd4ebfbde88931185d7cfd 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,11 +40,13 @@ 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;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
+use Friendica\Model\ItemURI;
 use Friendica\Model\Notification;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
@@ -53,9 +55,9 @@ 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;
 use Friendica\Worker\Delivery;
 
 function item_post(App $a) {
@@ -217,12 +219,16 @@ function item_post(App $a) {
 
                $attachment_img_width  = $_REQUEST['attachment_img_width'] ??  0;
                $attachment_img_height = $_REQUEST['attachment_img_height'] ?? 0;
-               $attachment = [
-                       'type'   => $attachment_type,
-                       'title'  => $attachment_title,
-                       'text'   => $attachment_text,
-                       'url'    => $attachment_url,
-               ];
+
+               // Fetch the basic attachment data
+               $attachment = ParseUrl::getSiteinfoCached($attachment_url);
+               unset($attachment['keywords']);
+
+               // Overwrite the basic data with possible changes from the frontend
+               $attachment['type'] = $attachment_type;
+               $attachment['title'] = $attachment_title;
+               $attachment['text'] = $attachment_text;
+               $attachment['url'] = $attachment_url;
 
                if (!empty($attachment_img_src)) {
                        $attachment['images'] = [
@@ -232,6 +238,8 @@ function item_post(App $a) {
                                        'height' => $attachment_img_height
                                ]
                        ];
+               } else {
+                       unset($attachment['images']);
                }
 
                $att_bbcode = "\n" . PageInfo::getFooterFromData($attachment);
@@ -402,21 +410,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'];
+                               }
                        }
                }
 
@@ -427,20 +436,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;
        }
 
        /*
@@ -606,6 +628,8 @@ function item_post(App $a) {
        $datarray['origin']        = $origin;
        $datarray['object']        = $object;
 
+       $datarray['attachments']   = $_REQUEST['attachments'] ?? [];
+
        /*
         * These fields are for the convenience of addons...
         * 'self' if true indicates the owner is posting on their own wall
@@ -660,6 +684,23 @@ 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());
+               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) {
@@ -674,6 +715,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.
@@ -702,13 +745,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) {