Merge remote-tracking branch 'upstream/develop' into improved-payload

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 2a365f3da2ec85592e22d4cac0b331462c71af9a..7693b28c6f09df3beddd4ebfbde88931185d7cfd 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -55,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;
@@ -681,7 +680,11 @@ function item_post(App $a) {
                $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
 
                System::jsonExit(['preview' => $o]);
-       } elseif (!empty($_REQUEST['scheduled_at'])) {
+       }
+
+       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']);
@@ -692,16 +695,12 @@ function item_post(App $a) {
                        unset($datarray['edit']);
                        unset($datarray['self']);
                        unset($datarray['api_source']);
-               
-                       Post\Delayed::add($datarray['uri'], $datarray, PRIORITY_HIGH, false, $scheduled_at);
+
+                       Post\Delayed::add($datarray['uri'], $datarray, PRIORITY_HIGH, Post\Delayed::PREPARED_NO_HOOK, $scheduled_at);
                        item_post_return(DI::baseUrl(), $api_source, $return_path);
                }
        }
 
-       $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']);
-
-       Hook::callAll('post_local',$datarray);
-
        if (!empty($datarray['cancel'])) {
                Logger::info('mod_item: post cancelled by addon.');
                if ($return_path) {
@@ -716,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.