X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=7693b28c6f09df3beddd4ebfbde88931185d7cfd;hb=9b78d872879bafaa8c3260d9e869734e9d9b3a2a;hp=a8870d6865ed54cfacc7b33fc2a8a5d3eaf3495c;hpb=8a9f633ce26d4fcb74557891282572b372d5d223;p=friendica.git diff --git a/mod/item.php b/mod/item.php index a8870d6865..7693b28c6f 100644 --- 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; @@ -437,12 +436,19 @@ 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; 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 = ''; @@ -622,7 +628,6 @@ function item_post(App $a) { $datarray['origin'] = $origin; $datarray['object'] = $object; - $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']); $datarray['attachments'] = $_REQUEST['attachments'] ?? []; /* @@ -679,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) { @@ -693,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.