Added option to define a schedule date when posting items

diff --git a/include/conversation.php b/include/conversation.php
index c52acf0c5ea76b8776c390fdbee54b3035025186..6a6eff28dc2c2d0dded37fafa7de0eb5f3e43079 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -719,8 +719,10 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        $params = ['order' => ['uri-id' => 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 +735,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,16 +754,14 @@ 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 ($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;
                        }
                }
@@ -1111,6 +1114,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'),

diff --git a/mod/item.php b/mod/item.php
index b62841e47dbcc3ccc960afc569a86dc62ebd621b..2a365f3da2ec85592e22d4cac0b331462c71af9a 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -436,7 +436,7 @@ function item_post(App $a) {
        $original_contact_id = $contact_id;
 
        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                
+               // we tagged a forum in a top level post. Now we change the post
                $private = $private_forum ? Item::PRIVATE : Item::UNLISTED;
 
                if ($only_to_forum) {
@@ -629,7 +629,6 @@ function item_post(App $a) {
        $datarray['origin']        = $origin;
        $datarray['object']        = $object;
 
-       $datarray['uri-id']        = ItemURI::getIdByURI($datarray['uri']);
        $datarray['attachments']   = $_REQUEST['attachments'] ?? [];
 
        /*
@@ -682,8 +681,25 @@ 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'])) {
+               $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, false, $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'])) {

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 798886ad480831bcb2ef2e14d498263821b42a28..a8105f78c3fb80ae5866e1782cb4f56cb2e5bdbd 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1143,6 +1143,9 @@ class Item
 
                if (!$dontcache) {
                        if ($notify) {
+                               if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) {
+                                       Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']);
+                               }
                                Hook::callAll('post_local_end', $posted_item);
                        } else {
                                Hook::callAll('post_remote_end', $posted_item);

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index e06c4ba0c1513b8957eb4d8c3542b26b41a43c5f..db59bfb480097ac4aaaef457aa81a39b30308caa 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Item;
 
+use DateTime;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\ACL;
@@ -34,6 +35,8 @@ use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 class Compose extends BaseModule
 {
@@ -162,6 +165,14 @@ class Compose extends BaseModule
                        '$wait'         => DI::l10n()->t('Please wait'),
                        '$placeholdertitle' => DI::l10n()->t('Set title'),
                        '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t('Categories (comma-separated list)') : ''),
+                       '$scheduled_at' => Temporal::getDateTimeField(
+                               new DateTime(),
+                               DateTime::createFromFormat(DateTimeFormat::MYSQL, DateTimeFormat::local('now + 6 months')),
+                               null,
+                               DI::l10n()->t('Scheduled at'),
+                               'scheduled_at',
+                       ),
+
 
                        '$title'        => $title,
                        '$category'     => $category,

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index af82df4becbfffa926552e347549255068ef5af0..b5619cf49cbce0a273d61b608e6ff1e722fdf48e 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -225,7 +225,7 @@ class Temporal
        public static function getDateTimeField(
                DateTime $minDate,
                DateTime $maxDate,
-               DateTime $defaultDate,
+               DateTime $defaultDate = null,
                $label,
                $id       = 'datetimepicker',
                $pickdate = true,

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 4c772fa03ea001e4d5a4aae40cc8a8549768eee0..e40f7918c2eadf36f93447cb55f7d5cdffd6e4d7 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 04:51+0000\n"
+"POT-Creation-Date: 2021-08-01 12:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: include/conversation.php:140 src/Model/Item.php:2610
+#: include/conversation.php:140 src/Model/Item.php:2613
 msgid "event"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: include/conversation.php:148 mod/tagger.php:90 src/Model/Item.php:2612
+#: include/conversation.php:148 mod/tagger.php:90 src/Model/Item.php:2615
 msgid "photo"
 msgstr ""
 
@@ -104,9 +104,9 @@ msgstr ""
 msgid "View in context"
 msgstr ""
 
-#: include/conversation.php:539 include/conversation.php:1134
+#: include/conversation.php:539 include/conversation.php:1124
 #: mod/editpost.php:104 mod/message.php:203 mod/message.php:368
-#: mod/photos.php:1523 mod/wallmessage.php:155 src/Module/Item/Compose.php:162
+#: mod/photos.php:1523 mod/wallmessage.php:155 src/Module/Item/Compose.php:165
 #: src/Object/Post.php:501
 msgid "Please wait"
 msgstr ""
@@ -119,108 +119,108 @@ msgstr ""
 msgid "Delete Selected Items"
 msgstr ""
 
-#: include/conversation.php:644 include/conversation.php:647
-#: include/conversation.php:650 include/conversation.php:653
+#: include/conversation.php:645 include/conversation.php:648
+#: include/conversation.php:651 include/conversation.php:654
 #, php-format
 msgid "You had been addressed (%s)."
 msgstr ""
 
-#: include/conversation.php:656
+#: include/conversation.php:657
 #, php-format
 msgid "You are following %s."
 msgstr ""
 
-#: include/conversation.php:659
+#: include/conversation.php:660
 msgid "Tagged"
 msgstr ""
 
-#: include/conversation.php:672 include/conversation.php:1024
-#: include/conversation.php:1062
+#: include/conversation.php:673 include/conversation.php:1007
+#: include/conversation.php:1045
 #, php-format
 msgid "%s reshared this."
 msgstr ""
 
-#: include/conversation.php:674
+#: include/conversation.php:675
 msgid "Reshared"
 msgstr ""
 
-#: include/conversation.php:674
+#: include/conversation.php:675
 #, php-format
 msgid "Reshared by %s <%s>"
 msgstr ""
 
-#: include/conversation.php:677
+#: include/conversation.php:678
 #, php-format
 msgid "%s is participating in this thread."
 msgstr ""
 
-#: include/conversation.php:680
+#: include/conversation.php:681
 msgid "Stored"
 msgstr ""
 
-#: include/conversation.php:683
+#: include/conversation.php:684
 msgid "Global"
 msgstr ""
 
-#: include/conversation.php:686
+#: include/conversation.php:687
 msgid "Relayed"
 msgstr ""
 
-#: include/conversation.php:686
+#: include/conversation.php:687
 #, php-format
 msgid "Relayed by %s <%s>"
 msgstr ""
 
-#: include/conversation.php:689
+#: include/conversation.php:690
 msgid "Fetched"
 msgstr ""
 
-#: include/conversation.php:689
+#: include/conversation.php:690
 #, php-format
 msgid "Fetched because of %s <%s>"
 msgstr ""
 
-#: include/conversation.php:855 view/theme/frio/theme.php:323
+#: include/conversation.php:838 view/theme/frio/theme.php:323
 msgid "Follow Thread"
 msgstr ""
 
-#: include/conversation.php:856 src/Model/Contact.php:1047
+#: include/conversation.php:839 src/Model/Contact.php:1047
 msgid "View Status"
 msgstr ""
 
-#: include/conversation.php:857 include/conversation.php:879
+#: include/conversation.php:840 include/conversation.php:862
 #: src/Model/Contact.php:973 src/Model/Contact.php:1039
 #: src/Model/Contact.php:1048 src/Module/Directory.php:160
 #: src/Module/Settings/Profile/Index.php:224
 msgid "View Profile"
 msgstr ""
 
-#: include/conversation.php:858 src/Model/Contact.php:1049
+#: include/conversation.php:841 src/Model/Contact.php:1049
 msgid "View Photos"
 msgstr ""
 
-#: include/conversation.php:859 src/Model/Contact.php:1040
+#: include/conversation.php:842 src/Model/Contact.php:1040
 #: src/Model/Contact.php:1050
 msgid "Network Posts"
 msgstr ""
 
-#: include/conversation.php:860 src/Model/Contact.php:1041
+#: include/conversation.php:843 src/Model/Contact.php:1041
 #: src/Model/Contact.php:1051
 msgid "View Contact"
 msgstr ""
 
-#: include/conversation.php:861 src/Model/Contact.php:1053
+#: include/conversation.php:844 src/Model/Contact.php:1053
 msgid "Send PM"
 msgstr ""
 
-#: include/conversation.php:862 src/Module/Admin/Blocklist/Contact.php:84
+#: include/conversation.php:845 src/Module/Admin/Blocklist/Contact.php:84
 #: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154
 #: src/Module/Contact.php:588 src/Module/Contact.php:846
 #: src/Module/Contact.php:1126
 msgid "Block"
 msgstr ""
 
-#: include/conversation.php:863 src/Module/Contact.php:589
+#: include/conversation.php:846 src/Module/Contact.php:589
 #: src/Module/Contact.php:847 src/Module/Contact.php:1134
 #: src/Module/Notifications/Introductions.php:113
 #: src/Module/Notifications/Introductions.php:185
@@ -228,272 +228,276 @@ msgstr ""
 msgid "Ignore"
 msgstr ""
 
-#: include/conversation.php:867 src/Object/Post.php:428
+#: include/conversation.php:850 src/Object/Post.php:428
 msgid "Languages"
 msgstr ""
 
-#: include/conversation.php:871 src/Model/Contact.php:1054
+#: include/conversation.php:854 src/Model/Contact.php:1054
 msgid "Poke"
 msgstr ""
 
-#: include/conversation.php:876 mod/follow.php:139 src/Content/Widget.php:76
+#: include/conversation.php:859 mod/follow.php:139 src/Content/Widget.php:76
 #: src/Model/Contact.php:1042 src/Model/Contact.php:1055
 #: view/theme/vier/theme.php:172
 msgid "Connect/Follow"
 msgstr ""
 
-#: include/conversation.php:1009
+#: include/conversation.php:992
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: include/conversation.php:1012
+#: include/conversation.php:995
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: include/conversation.php:1015
+#: include/conversation.php:998
 #, php-format
 msgid "%s attends."
 msgstr ""
 
-#: include/conversation.php:1018
+#: include/conversation.php:1001
 #, php-format
 msgid "%s doesn't attend."
 msgstr ""
 
-#: include/conversation.php:1021
+#: include/conversation.php:1004
 #, php-format
 msgid "%s attends maybe."
 msgstr ""
 
-#: include/conversation.php:1030
+#: include/conversation.php:1013
 msgid "and"
 msgstr ""
 
-#: include/conversation.php:1033
+#: include/conversation.php:1016
 #, php-format
 msgid "and %d other people"
 msgstr ""
 
-#: include/conversation.php:1041
+#: include/conversation.php:1024
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: include/conversation.php:1042
+#: include/conversation.php:1025
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: include/conversation.php:1045
+#: include/conversation.php:1028
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: include/conversation.php:1046
+#: include/conversation.php:1029
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: include/conversation.php:1049
+#: include/conversation.php:1032
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr ""
 
-#: include/conversation.php:1050
+#: include/conversation.php:1033
 #, php-format
 msgid "%s attend."
 msgstr ""
 
-#: include/conversation.php:1053
+#: include/conversation.php:1036
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr ""
 
-#: include/conversation.php:1054
+#: include/conversation.php:1037
 #, php-format
 msgid "%s don't attend."
 msgstr ""
 
-#: include/conversation.php:1057
+#: include/conversation.php:1040
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr ""
 
-#: include/conversation.php:1058
+#: include/conversation.php:1041
 #, php-format
 msgid "%s attend maybe."
 msgstr ""
 
-#: include/conversation.php:1061
+#: include/conversation.php:1044
 #, php-format
 msgid "<span  %1$s>%2$d people</span> reshared this"
 msgstr ""
 
-#: include/conversation.php:1093
+#: include/conversation.php:1076
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/conversation.php:1094 src/Module/Item/Compose.php:156
+#: include/conversation.php:1077 src/Module/Item/Compose.php:159
 #: src/Object/Post.php:972
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
-#: include/conversation.php:1095
+#: include/conversation.php:1078
 msgid "Tag term:"
 msgstr ""
 
-#: include/conversation.php:1096 src/Module/Filer/SaveTag.php:68
+#: include/conversation.php:1079 src/Module/Filer/SaveTag.php:68
 msgid "Save to Folder:"
 msgstr ""
 
-#: include/conversation.php:1097
+#: include/conversation.php:1080
 msgid "Where are you right now?"
 msgstr ""
 
-#: include/conversation.php:1098
+#: include/conversation.php:1081
 msgid "Delete item(s)?"
 msgstr ""
 
-#: include/conversation.php:1108
+#: include/conversation.php:1091
 msgid "New Post"
 msgstr ""
 
-#: include/conversation.php:1111
+#: include/conversation.php:1094
 msgid "Share"
 msgstr ""
 
-#: include/conversation.php:1112 mod/editpost.php:89 mod/photos.php:1372
+#: include/conversation.php:1095 mod/editpost.php:89 mod/photos.php:1372
 #: src/Module/Contact/Poke.php:156 src/Object/Post.php:963
 msgid "Loading..."
 msgstr ""
 
-#: include/conversation.php:1113 mod/editpost.php:90 mod/message.php:201
+#: include/conversation.php:1096 mod/editpost.php:90 mod/message.php:201
 #: mod/message.php:365 mod/wallmessage.php:153
 msgid "Upload photo"
 msgstr ""
 
-#: include/conversation.php:1114 mod/editpost.php:91
+#: include/conversation.php:1097 mod/editpost.php:91
 msgid "upload photo"
 msgstr ""
 
-#: include/conversation.php:1115 mod/editpost.php:92
+#: include/conversation.php:1098 mod/editpost.php:92
 msgid "Attach file"
 msgstr ""
 
-#: include/conversation.php:1116 mod/editpost.php:93
+#: include/conversation.php:1099 mod/editpost.php:93
 msgid "attach file"
 msgstr ""
 
-#: include/conversation.php:1117 src/Module/Item/Compose.php:148
+#: include/conversation.php:1100 src/Module/Item/Compose.php:151
 #: src/Object/Post.php:964
 msgid "Bold"
 msgstr ""
 
-#: include/conversation.php:1118 src/Module/Item/Compose.php:149
+#: include/conversation.php:1101 src/Module/Item/Compose.php:152
 #: src/Object/Post.php:965
 msgid "Italic"
 msgstr ""
 
-#: include/conversation.php:1119 src/Module/Item/Compose.php:150
+#: include/conversation.php:1102 src/Module/Item/Compose.php:153
 #: src/Object/Post.php:966
 msgid "Underline"
 msgstr ""
 
-#: include/conversation.php:1120 src/Module/Item/Compose.php:151
+#: include/conversation.php:1103 src/Module/Item/Compose.php:154
 #: src/Object/Post.php:967
 msgid "Quote"
 msgstr ""
 
-#: include/conversation.php:1121 src/Module/Item/Compose.php:152
+#: include/conversation.php:1104 src/Module/Item/Compose.php:155
 #: src/Object/Post.php:968
 msgid "Code"
 msgstr ""
 
-#: include/conversation.php:1122 src/Module/Item/Compose.php:153
+#: include/conversation.php:1105 src/Module/Item/Compose.php:156
 #: src/Object/Post.php:969
 msgid "Image"
 msgstr ""
 
-#: include/conversation.php:1123 src/Module/Item/Compose.php:154
+#: include/conversation.php:1106 src/Module/Item/Compose.php:157
 #: src/Object/Post.php:970
 msgid "Link"
 msgstr ""
 
-#: include/conversation.php:1124 src/Module/Item/Compose.php:155
+#: include/conversation.php:1107 src/Module/Item/Compose.php:158
 #: src/Object/Post.php:971
 msgid "Link or Media"
 msgstr ""
 
-#: include/conversation.php:1125
+#: include/conversation.php:1108
 msgid "Video"
 msgstr ""
 
-#: include/conversation.php:1126 mod/editpost.php:100
-#: src/Module/Item/Compose.php:158
+#: include/conversation.php:1109 mod/editpost.php:100
+#: src/Module/Item/Compose.php:161
 msgid "Set your location"
 msgstr ""
 
-#: include/conversation.php:1127 mod/editpost.php:101
+#: include/conversation.php:1110 mod/editpost.php:101
 msgid "set location"
 msgstr ""
 
-#: include/conversation.php:1128 mod/editpost.php:102
+#: include/conversation.php:1111 mod/editpost.php:102
 msgid "Clear browser location"
 msgstr ""
 
-#: include/conversation.php:1129 mod/editpost.php:103
+#: include/conversation.php:1112 mod/editpost.php:103
 msgid "clear location"
 msgstr ""
 
-#: include/conversation.php:1131 mod/editpost.php:117
-#: src/Module/Item/Compose.php:163
+#: include/conversation.php:1114 mod/editpost.php:117
+#: src/Module/Item/Compose.php:166
 msgid "Set title"
 msgstr ""
 
-#: include/conversation.php:1133 mod/editpost.php:119
-#: src/Module/Item/Compose.php:164
+#: include/conversation.php:1116 mod/editpost.php:119
+#: src/Module/Item/Compose.php:167
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: include/conversation.php:1135 mod/editpost.php:105
+#: include/conversation.php:1121 src/Module/Item/Compose.php:172
+msgid "Scheduled at"
+msgstr ""
+
+#: include/conversation.php:1125 mod/editpost.php:105
 msgid "Permission settings"
 msgstr ""
 
-#: include/conversation.php:1136 mod/editpost.php:133 mod/events.php:583
+#: include/conversation.php:1126 mod/editpost.php:133 mod/events.php:583
 #: mod/photos.php:959 mod/photos.php:1325
 msgid "Permissions"
 msgstr ""
 
-#: include/conversation.php:1145 mod/editpost.php:114
+#: include/conversation.php:1135 mod/editpost.php:114
 msgid "Public post"
 msgstr ""
 
-#: include/conversation.php:1149 mod/editpost.php:125 mod/events.php:578
+#: include/conversation.php:1139 mod/editpost.php:125 mod/events.php:578
 #: mod/photos.php:1371 mod/photos.php:1427 mod/photos.php:1501
-#: src/Module/Item/Compose.php:157 src/Object/Post.php:973
+#: src/Module/Item/Compose.php:160 src/Object/Post.php:973
 msgid "Preview"
 msgstr ""
 
-#: include/conversation.php:1152 mod/editpost.php:127 mod/fbrowser.php:105
+#: include/conversation.php:1142 mod/editpost.php:127 mod/fbrowser.php:105
 #: mod/fbrowser.php:134 mod/follow.php:145 mod/photos.php:1027
 #: mod/photos.php:1133 mod/tagrm.php:37 mod/tagrm.php:129 mod/unfollow.php:97
 #: src/Module/Contact.php:424 src/Module/RemoteFollow.php:112
 msgid "Cancel"
 msgstr ""
 
-#: include/conversation.php:1159 mod/editpost.php:131
+#: include/conversation.php:1149 mod/editpost.php:131
 #: src/Content/Widget/VCard.php:106 src/Model/Profile.php:448
 msgid "Message"
 msgstr ""
 
-#: include/conversation.php:1160 mod/editpost.php:132
+#: include/conversation.php:1150 mod/editpost.php:132
 #: src/Module/Settings/TwoFactor/Trusted.php:101
 msgid "Browser"
 msgstr ""
 
-#: include/conversation.php:1162 mod/editpost.php:135
+#: include/conversation.php:1152 mod/editpost.php:135
 msgid "Open Compose page"
 msgstr ""
 
@@ -824,7 +828,7 @@ msgstr ""
 
 #: mod/api.php:30 mod/api.php:35 mod/editpost.php:37 mod/events.php:236
 #: mod/follow.php:56 mod/follow.php:131 mod/item.php:185 mod/item.php:190
-#: mod/item.php:917 mod/message.php:69 mod/message.php:111 mod/notes.php:44
+#: mod/item.php:933 mod/message.php:69 mod/message.php:111 mod/notes.php:44
 #: mod/ostatus_subscribe.php:32 mod/photos.php:159 mod/photos.php:911
 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:65
 #: mod/settings.php:417 mod/suggest.php:34 mod/uimport.php:32
@@ -873,8 +877,8 @@ msgstr ""
 msgid "User not found."
 msgstr ""
 
-#: mod/cal.php:120 mod/display.php:271 src/Module/Profile/Profile.php:94
-#: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:109
+#: mod/cal.php:120 mod/display.php:271 src/Module/Profile/Profile.php:95
+#: src/Module/Profile/Profile.php:110 src/Module/Profile/Status.php:109
 #: src/Module/Update/Profile.php:56
 msgid "Access to this profile has been restricted."
 msgstr ""
@@ -1055,7 +1059,7 @@ msgstr ""
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: mod/events.php:566 src/Module/Profile/Profile.php:172
+#: mod/events.php:566 src/Module/Profile/Profile.php:173
 #: src/Module/Settings/Profile/Index.php:237
 msgid "Description:"
 msgstr ""
@@ -1064,7 +1068,7 @@ msgstr ""
 #: src/Model/Event.php:113 src/Model/Event.php:459 src/Model/Event.php:945
 #: src/Model/Profile.php:358 src/Module/Contact.php:609
 #: src/Module/Directory.php:150 src/Module/Notifications/Introductions.php:166
-#: src/Module/Profile/Profile.php:190
+#: src/Module/Profile/Profile.php:191
 msgid "Location:"
 msgstr ""
 
@@ -1087,19 +1091,19 @@ msgstr ""
 #: src/Module/Delegation.php:152 src/Module/FriendSuggest.php:129
 #: src/Module/Install.php:245 src/Module/Install.php:287
 #: src/Module/Install.php:324 src/Module/Invite.php:174
-#: src/Module/Item/Compose.php:147 src/Module/Profile/Profile.php:243
+#: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:244
 #: src/Module/Settings/Profile/Index.php:221 src/Object/Post.php:962
 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
 msgid "Submit"
 msgstr ""
 
-#: mod/events.php:581 src/Module/Profile/Profile.php:244
+#: mod/events.php:581 src/Module/Profile/Profile.php:245
 msgid "Basic"
 msgstr ""
 
 #: mod/events.php:582 src/Module/Admin/Site.php:506 src/Module/Contact.php:916
-#: src/Module/Profile/Profile.php:245
+#: src/Module/Profile/Profile.php:246
 msgid "Advanced"
 msgstr ""
 
@@ -1158,7 +1162,7 @@ msgstr ""
 
 #: mod/follow.php:143 src/Module/Contact.php:615
 #: src/Module/Notifications/Introductions.php:170
-#: src/Module/Profile/Profile.php:203
+#: src/Module/Profile/Profile.php:204
 msgid "Tags:"
 msgstr ""
 
@@ -1188,19 +1192,19 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: mod/item.php:724
+#: mod/item.php:740
 msgid "Post updated."
 msgstr ""
 
-#: mod/item.php:734 mod/item.php:739
+#: mod/item.php:750 mod/item.php:755
 msgid "Item wasn't stored."
 msgstr ""
 
-#: mod/item.php:750
+#: mod/item.php:766
 msgid "Item couldn't be fetched."
 msgstr ""
 
-#: mod/item.php:896 src/Module/Admin/Themes/Details.php:39
+#: mod/item.php:912 src/Module/Admin/Themes/Details.php:39
 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:41
 #: src/Module/Debug/ItemBody.php:56
 msgid "Item not found."
@@ -1735,7 +1739,7 @@ msgid "Rotate CCW (left)"
 msgstr ""
 
 #: mod/photos.php:1367 mod/photos.php:1423 mod/photos.php:1497
-#: src/Module/Contact.php:1057 src/Module/Item/Compose.php:145
+#: src/Module/Contact.php:1057 src/Module/Item/Compose.php:148
 #: src/Object/Post.php:959
 msgid "This is you"
 msgstr ""
@@ -2288,7 +2292,7 @@ msgstr ""
 msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:729 src/Module/Profile/Profile.php:144
+#: mod/settings.php:729 src/Module/Profile/Profile.php:145
 msgid "Full Name:"
 msgstr ""
 
@@ -2711,7 +2715,7 @@ msgstr ""
 msgid "File upload failed."
 msgstr ""
 
-#: mod/wall_upload.php:233 src/Model/Photo.php:987
+#: mod/wall_upload.php:233 src/Model/Photo.php:1002
 msgid "Wall Photos"
 msgstr ""
 
@@ -3155,7 +3159,7 @@ msgstr ""
 
 #: src/Content/Nav.php:192 src/Module/BaseProfile.php:50
 #: src/Module/BaseSettings.php:57 src/Module/Contact.php:620
-#: src/Module/Contact.php:899 src/Module/Profile/Profile.php:237
+#: src/Module/Contact.php:899 src/Module/Profile/Profile.php:238
 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:227
 msgid "Profile"
 msgstr ""
@@ -3389,39 +3393,39 @@ msgstr ""
 msgid "last"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:979 src/Content/Text/BBCode.php:1730
-#: src/Content/Text/BBCode.php:1731
+#: src/Content/Text/BBCode.php:979 src/Content/Text/BBCode.php:1767
+#: src/Content/Text/BBCode.php:1768
 msgid "Image/photo"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1115
+#: src/Content/Text/BBCode.php:1152
 #, php-format
 msgid ""
 "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1140 src/Model/Item.php:3138
-#: src/Model/Item.php:3144 src/Model/Item.php:3145
+#: src/Content/Text/BBCode.php:1177 src/Model/Item.php:3141
+#: src/Model/Item.php:3147 src/Model/Item.php:3148
 msgid "Link to source"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1648 src/Content/Text/HTML.php:943
+#: src/Content/Text/BBCode.php:1685 src/Content/Text/HTML.php:943
 msgid "Click to open/close"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1679
+#: src/Content/Text/BBCode.php:1716
 msgid "$1 wrote:"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1733 src/Content/Text/BBCode.php:1734
+#: src/Content/Text/BBCode.php:1772 src/Content/Text/BBCode.php:1773
 msgid "Encrypted content"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1950
+#: src/Content/Text/BBCode.php:1989
 msgid "Invalid source protocol"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1965
+#: src/Content/Text/BBCode.php:2004
 msgid "Invalid link protocol"
 msgstr ""
 
@@ -3611,7 +3615,7 @@ msgid "More Trending Tags"
 msgstr ""
 
 #: src/Content/Widget/VCard.php:96 src/Model/Profile.php:363
-#: src/Module/Contact.php:611 src/Module/Profile/Profile.php:176
+#: src/Module/Contact.php:611 src/Module/Profile/Profile.php:177
 msgid "XMPP:"
 msgstr ""
 
@@ -3624,7 +3628,7 @@ msgstr ""
 msgid "Unfollow"
 msgstr ""
 
-#: src/Core/ACL.php:154 src/Module/Profile/Profile.php:238
+#: src/Core/ACL.php:154 src/Module/Profile/Profile.php:239
 msgid "Yourself"
 msgstr ""
 
@@ -4417,7 +4421,7 @@ msgstr ""
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: src/Model/Contact.php:2336 src/Module/Friendica.php:80
+#: src/Model/Contact.php:2336 src/Module/Friendica.php:81
 msgid "Blocked domain"
 msgstr ""
 
@@ -4586,33 +4590,33 @@ msgstr ""
 msgid "Edit groups"
 msgstr ""
 
-#: src/Model/Item.php:1664
+#: src/Model/Item.php:1667
 #, php-format
 msgid "Detected languages in this post:\\n%s"
 msgstr ""
 
-#: src/Model/Item.php:2614
+#: src/Model/Item.php:2617
 msgid "activity"
 msgstr ""
 
-#: src/Model/Item.php:2616
+#: src/Model/Item.php:2619
 msgid "comment"
 msgstr ""
 
-#: src/Model/Item.php:2619
+#: src/Model/Item.php:2622
 msgid "post"
 msgstr ""
 
-#: src/Model/Item.php:2733
+#: src/Model/Item.php:2759
 #, php-format
 msgid "Content warning: %s"
 msgstr ""
 
-#: src/Model/Item.php:3103
+#: src/Model/Item.php:3106
 msgid "bytes"
 msgstr ""
 
-#: src/Model/Item.php:3132 src/Model/Item.php:3133
+#: src/Model/Item.php:3135 src/Model/Item.php:3136
 msgid "View on separate page"
 msgstr ""
 
@@ -4620,8 +4624,8 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: src/Model/Profile.php:346 src/Module/Profile/Profile.php:252
-#: src/Module/Profile/Profile.php:254
+#: src/Model/Profile.php:346 src/Module/Profile/Profile.php:253
+#: src/Module/Profile/Profile.php:255
 msgid "Edit profile"
 msgstr ""
 
@@ -4630,7 +4634,7 @@ msgid "Change profile photo"
 msgstr ""
 
 #: src/Model/Profile.php:361 src/Module/Directory.php:155
-#: src/Module/Profile/Profile.php:180
+#: src/Module/Profile/Profile.php:181
 msgid "Homepage:"
 msgstr ""
 
@@ -5174,7 +5178,7 @@ msgid "Blocked server domain pattern"
 msgstr ""
 
 #: src/Module/Admin/Blocklist/Server.php:80
-#: src/Module/Admin/Blocklist/Server.php:105 src/Module/Friendica.php:81
+#: src/Module/Admin/Blocklist/Server.php:105 src/Module/Friendica.php:82
 msgid "Reason for the block"
 msgstr ""
 
@@ -8086,45 +8090,45 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: src/Module/Friendica.php:61
+#: src/Module/Friendica.php:62
 msgid "Installed addons/apps:"
 msgstr ""
 
-#: src/Module/Friendica.php:66
+#: src/Module/Friendica.php:67
 msgid "No installed addons/apps"
 msgstr ""
 
-#: src/Module/Friendica.php:71
+#: src/Module/Friendica.php:72
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr ""
 
-#: src/Module/Friendica.php:78
+#: src/Module/Friendica.php:79
 msgid "On this server the following remote servers are blocked."
 msgstr ""
 
-#: src/Module/Friendica.php:96
+#: src/Module/Friendica.php:97
 #, php-format
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
 msgstr ""
 
-#: src/Module/Friendica.php:101
+#: src/Module/Friendica.php:102
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
 msgstr ""
 
-#: src/Module/Friendica.php:102
+#: src/Module/Friendica.php:103
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: src/Module/Friendica.php:102
+#: src/Module/Friendica.php:103
 msgid "the bugtracker at github"
 msgstr ""
 
-#: src/Module/Friendica.php:103
+#: src/Module/Friendica.php:104
 msgid ""
 "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr ""
@@ -8494,35 +8498,35 @@ msgid ""
 "important, please visit http://friendi.ca"
 msgstr ""
 
-#: src/Module/Item/Compose.php:47
+#: src/Module/Item/Compose.php:50
 msgid "Please enter a post body."
 msgstr ""
 
-#: src/Module/Item/Compose.php:60
+#: src/Module/Item/Compose.php:63
 msgid "This feature is only available with the frio theme."
 msgstr ""
 
-#: src/Module/Item/Compose.php:87
+#: src/Module/Item/Compose.php:90
 msgid "Compose new personal note"
 msgstr ""
 
-#: src/Module/Item/Compose.php:96
+#: src/Module/Item/Compose.php:99
 msgid "Compose new post"
 msgstr ""
 
-#: src/Module/Item/Compose.php:138
+#: src/Module/Item/Compose.php:141
 msgid "Visibility"
 msgstr ""
 
-#: src/Module/Item/Compose.php:159
+#: src/Module/Item/Compose.php:162
 msgid "Clear the location"
 msgstr ""
 
-#: src/Module/Item/Compose.php:160
+#: src/Module/Item/Compose.php:163
 msgid "Location services are unavailable on your device"
 msgstr ""
 
-#: src/Module/Item/Compose.php:161
+#: src/Module/Item/Compose.php:164
 msgid ""
 "Location services are disabled. Please check the website's permissions on "
 "your device"
@@ -8697,39 +8701,39 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: src/Module/Profile/Profile.php:82
+#: src/Module/Profile/Profile.php:83
 msgid "Profile not found."
 msgstr ""
 
-#: src/Module/Profile/Profile.php:135
+#: src/Module/Profile/Profile.php:136
 #, php-format
 msgid ""
 "You're currently viewing your profile as <b>%s</b> <a href=\"%s\" class="
 "\"btn btn-sm pull-right\">Cancel</a>"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:149
+#: src/Module/Profile/Profile.php:150
 msgid "Member since:"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:155
+#: src/Module/Profile/Profile.php:156
 msgid "j F, Y"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:156
+#: src/Module/Profile/Profile.php:157
 msgid "j F"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:164 src/Util/Temporal.php:163
+#: src/Module/Profile/Profile.php:165 src/Util/Temporal.php:163
 msgid "Birthday:"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:244
+#: src/Module/Profile/Profile.php:168 src/Module/Settings/Profile/Index.php:244
 #: src/Util/Temporal.php:165
 msgid "Age: "
 msgstr ""
 
-#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:244
+#: src/Module/Profile/Profile.php:168 src/Module/Settings/Profile/Index.php:244
 #: src/Util/Temporal.php:165
 #, php-format
 msgid "%d year old"
@@ -8737,32 +8741,32 @@ msgid_plural "%d years old"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Module/Profile/Profile.php:230
+#: src/Module/Profile/Profile.php:231
 msgid "Forums:"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:242
+#: src/Module/Profile/Profile.php:243
 msgid "View profile as:"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:259
+#: src/Module/Profile/Profile.php:260
 msgid "View as"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:322 src/Module/Profile/Profile.php:325
+#: src/Module/Profile/Profile.php:323 src/Module/Profile/Profile.php:326
 #: src/Module/Profile/Status.php:65 src/Module/Profile/Status.php:68
 #: src/Protocol/Feed.php:944 src/Protocol/OStatus.php:1256
 #, php-format
 msgid "%s's timeline"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:323 src/Module/Profile/Status.php:66
+#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:66
 #: src/Protocol/Feed.php:948 src/Protocol/OStatus.php:1260
 #, php-format
 msgid "%s's posts"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:324 src/Module/Profile/Status.php:67
+#: src/Module/Profile/Profile.php:325 src/Module/Profile/Status.php:67
 #: src/Protocol/Feed.php:951 src/Protocol/OStatus.php:1263
 #, php-format
 msgid "%s's comments"

diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index df48a1323e08613f2f396db2239d4ca5e7139974..7837036b4e0a2a7e8ff4eab8034e1152b7015b6e 100644 (file)
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -81,6 +81,8 @@
                        <div class="jotplugins">
                                {{$jotplugins nofilter}}
                        </div>
+
+                       {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
 {{else}}
                        <input type="hidden" name="group_allow" value="{{$group_allow}}"/>
                        <input type="hidden" name="contact_allow" value="{{$contact_allow}}"/>

diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
index 73d341aae724610c92bc0c8904c0a894202ecac8..71939e0eba0f59e250768e27d0ad66e35d96ebb8 100644 (file)
--- a/view/templates/jot.tpl
+++ b/view/templates/jot.tpl
@@ -76,6 +76,7 @@
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
                        {{$acl nofilter}}
+                       {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
                </div>
        </div>
 

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index a7f63f2db66e7373371234e75de842e258d9f312..d8372f3aed70426fdabbc573721d6c72bf7a0b0c 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -133,6 +133,7 @@
 
                                <div id="profile-jot-acl-wrapper" class="minimize" aria-labelledby="jot-perms-lnk" role="tabpanel" aria-hidden="true">
                                        {{$acl nofilter}}
+                                       {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
                                </div>
 
                                <div id="jot-preview-content" class="minimize" aria-labelledby="jot-preview-lnk" role="tabpanel" aria-hidden="true"></div>

diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
index 2edd821b8fe480170c8eb6739d4f54b4a5ceaf2f..ba6bf52686cc003f6fe8daf7f2f32914a888b3d5 100644 (file)
--- a/view/theme/quattro/templates/jot.tpl
+++ b/view/theme/quattro/templates/jot.tpl
@@ -47,6 +47,7 @@
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
                        {{$acl nofilter}}
+                       {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
                </div>
        </div>
 

diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
index f2e4f2f0d0d3a94ee5e8fa4a78ddca2d5589233c..319faeaa0dc8e52bce05425a5ecd2804c8f749d1 100644 (file)
--- a/view/theme/smoothly/templates/jot.tpl
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -71,6 +71,7 @@
             <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
                 {{$acl nofilter}}
                 {{$jotnets nofilter}}
+                               {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
             </div>
         </div>