Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index c52acf0c5ea76b8776c390fdbee54b3035025186..352060d7f246f17a88ea8eedc1811a07a4a192a2 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -22,6 +22,7 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
+use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -34,6 +35,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
+use Friendica\Model\User;
 use Friendica\Model\Verb;
 use Friendica\Object\Post as PostObject;
 use Friendica\Object\Thread;
@@ -479,7 +481,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
                                $body_html = Item::prepareBody($item, true, $preview);
 
-                               list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
+                               list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item, local_user());
 
                                if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
                                        $title = ucfirst($item['content-warning']);
@@ -717,10 +719,12 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                $max_comments = DI::config()->get('system', 'max_display_comments', 1000);
        }
 
-       $params = ['order' => ['uri-id' => true]];
+       $params = ['order' => ['uri-id' => true, 'uid' => true]];
 
-       $activities = [];
-       $uriids     = [];
+       $activities      = [];
+       $uriids          = [];
+       $commentcounter  = [];
+       $activitycounter = [];
 
        foreach ($parents AS $parent) {
                if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == GRAVITY_ACTIVITY)) {
@@ -733,10 +737,13 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                                        }
                                }
                        }
-                       $uriids[] = $uriid;
                } else {
-                       $uriids[] = $parent['uri-id'];
+                       $uriid = $parent['uri-id'];
                }
+               $uriids[] = $uriid;
+
+               $commentcounter[$uriid]  = 0;
+               $activitycounter[$uriid] = 0;
        }
 
        $condition = ['parent-uri-id' => $uriids];
@@ -749,20 +756,22 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        $thread_items = Post::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['pinned', 'contact-uid', 'gravity', 'post-type', 'post-reason']), $condition, $params);
 
-       $items           = [];
-       $limitposts      = [];
-       $limitactivities = [];
+       $items = [];
 
        while ($row = Post::fetch($thread_items)) {
+               if (!empty($items[$row['uri-id']]) && ($row['uid'] == 0)) {
+                       continue;
+               }
+
                if ($max_comments > 0) {
-                       if (($row['gravity'] == GRAVITY_COMMENT) && (++$limitposts[$row['parent-uri-id']] > $max_comments)) {
+                       if (($row['gravity'] == GRAVITY_COMMENT) && (++$commentcounter[$row['parent-uri-id']] > $max_comments)) {
                                continue;
                        }
-                       if (($row['gravity'] == GRAVITY_ACTIVITY) && (++$limitactivities[$row['parent-uri-id']] > $max_comments)) {
+                       if (($row['gravity'] == GRAVITY_ACTIVITY) && (++$activitycounter[$row['parent-uri-id']] > $max_comments)) {
                                continue;
                        }
                }
-               $items[] = conversation_add_row_information($row, $activities[$row['uri-id']] ?? []);
+               $items[$row['uri-id']] = conversation_add_row_information($row, $activities[$row['uri-id']] ?? []);
        }
 
        DBA::close($thread_items);
@@ -1057,11 +1066,27 @@ function format_activity(array $links, $verb, $id) {
        return $o;
 }
 
-function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
+function status_editor(App $a, array $x = [], $notes_cid = 0, $popup = false)
 {
+       $user = User::getById($a->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
+       if (empty($user['uid'])) {
+               return '';
+       }
+
        DI::profiler()->startRecording('rendering');
        $o = '';
 
+       $x['allow_location']   = $x['allow_location']   ?? $user['allow_location'];
+       $x['default_location'] = $x['default_location'] ?? $user['default-location'];
+       $x['nickname']         = $x['nickname']         ?? $user['nickname'];
+       $x['lockstate']        = $x['lockstate']        ?? ACL::getLockstateForUserId($user['uid']) ? 'lock' : 'unlock';
+       $x['acl']              = $x['acl']              ?? ACL::getFullSelectorHTML(DI::page(), $user['uid'], true);
+       $x['bang']             = $x['bang']             ?? '';
+       $x['visitor']          = $x['visitor']          ?? 'block';
+       $x['is_owner']         = $x['is_owner']         ?? true;
+       $x['profile_uid']      = $x['profile_uid']      ?? local_user();
+
+
        $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
 
        $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
@@ -1111,6 +1136,13 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                '$placeholdertitle' => DI::l10n()->t('Set title'),
                '$category'     => $x['category'] ?? '',
                '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : '',
+               '$scheduled_at' => Temporal::getDateTimeField(
+                       new DateTime(),
+                       DateTime::createFromFormat(DateTimeFormat::MYSQL, DateTimeFormat::local('now + 6 months')),
+                       null,
+                       DI::l10n()->t('Scheduled at'),
+                       'scheduled_at',
+               ),
                '$wait'         => DI::l10n()->t('Please wait'),
                '$permset'      => DI::l10n()->t('Permission settings'),
                '$shortpermset' => DI::l10n()->t('Permissions'),