Support unlisted public posts

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 3edf49f86c4e3127c768816cf51325d223e65e56..4e14a047f5577f45e6ac2b04a518d04c0c8dd460 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1,9 +1,22 @@
 <?php
 /**
- * @file mod/item.php
- */
-
-/*
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status,
  * local comments, and remote coments that are posted on this site
@@ -27,10 +40,12 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Attach;
+use Friendica\Model\Config\PConfig;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\Photo;
 use Friendica\Model\Term;
 use Friendica\Network\HTTPException;
@@ -286,7 +301,13 @@ function item_post(App $a) {
 
                $postopts = $_REQUEST['postopts'] ?? '';
 
-               $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
+               if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
+                       $private = Item::PRIVATE;
+               } elseif (PConfig::get($profile_uid, 'system', 'unlisted')) {
+                       $private == Item::UNLISTED;
+               } else {
+                       $private == Item::PUBLIC;
+               }
 
                // If this is a comment, set the permissions from the parent.
 
@@ -661,7 +682,7 @@ function item_post(App $a) {
                $datarray["item_id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
-               $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager(DI::args()->getQueryString()), 'search', false, true);
+               $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
 
                System::jsonExit(['preview' => $o]);
        }
@@ -751,7 +772,7 @@ function item_post(App $a) {
        if ($toplevel_item_id) {
                if ($contact_record != $author) {
                        notification([
-                               'type'         => NOTIFY_COMMENT,
+                               'type'         => Type::COMMENT,
                                'notify_flags' => $user['notify-flags'],
                                'language'     => $user['language'],
                                'to_name'      => $user['username'],
@@ -771,7 +792,7 @@ function item_post(App $a) {
        } else {
                if (($contact_record != $author) && !count($forum_contact)) {
                        notification([
-                               'type'         => NOTIFY_WALL,
+                               'type'         => Type::WALL,
                                'notify_flags' => $user['notify-flags'],
                                'language'     => $user['language'],
                                'to_name'      => $user['username'],