Merge remote-tracking branch 'upstream/develop' into lemmy

diff --cc src/Content/Conversation.php
Simple merge

diff --cc src/Content/Widget.php
index f0236c00c1de637c6c6f80b6c556bec44edc6605,c18a3041b0568c799a35d10c15954e66a7e1b84d..c8c0230c688dd7bafc136127ff05afdf88e92fc4
--- 1/src/Content/Widget.php
--- 2/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@@ -472,8 -472,11 +472,10 @@@ class Widge
                        // Set the start and end date to the beginning of the month
                        $cutoffday = $dthen;
                        $thisday = substr($dnow, 4);
+                       $nextday = date('Y-m-d', strtotime($dnow . ' + 1 day'));
+                       $nextday = substr($nextday, 4);
                        $dnow = substr($dnow, 0, 8) . '01';
                        $dthen = substr($dthen, 0, 8) . '01';
 -                      
  
                        /*
                         * Starting with the current month, get the first and last days of every

diff --cc src/Model/Contact.php
Simple merge

diff --cc src/Module/Magic.php
index 3000e953cdd6d8154652e3b679b6e2fccfd9af11,481a748fcf42b01ff7c8318e890e1a28ae9bcb84..dc0d4f8ad118e5ffaf67069a354eac9f407b4c07
--- 1/src/Module/Magic.php
--- 2/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@@ -129,9 -116,11 +129,9 @@@ class Magic extends BaseModul
                        System::externalRedirect($dest);
                }
  
 -              $basepath = $gserver['url'];
 -
                $header = [
-                       'Accept'          => ['application/x-dfrn+json', 'application/x-zot+json'],
-                       'X-Open-Web-Auth' => [Strings::getRandomHex()],
+                       'Accept'          => 'application/x-dfrn+json, application/x-zot+json',
+                       'X-Open-Web-Auth' => Strings::getRandomHex()
                ];
  
                // Create a header that is signed with the local users private key.

diff --cc src/Object/Post.php
Simple merge

diff --cc view/lang/C/messages.po
index 45bc4148c7d051de7e725643fbf370506773c8fa,d8dd10d6a95bdf9623b7d145bfe7d12f5cba0549..25e64d48111aa7b234628d2df24c0e3650ce5c4a
--- 1/view/lang/C/messages.po
--- 2/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 2023.09-dev\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2023-06-18 17:33+0000\n"
 -"POT-Creation-Date: 2023-06-15 12:51-0400\n"
++"POT-Creation-Date: 2023-06-18 17:38+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"
@@@ -291,10 -291,10 +291,10 @@@ msgstr "
  msgid "Insert web link"
  msgstr ""
  
 -#: mod/message.php:201 mod/message.php:357 mod/photos.php:1289
 -#: src/Content/Conversation.php:391 src/Content/Conversation.php:735
 +#: mod/message.php:201 mod/message.php:357 mod/photos.php:1301
- #: src/Content/Conversation.php:391 src/Content/Conversation.php:741
- #: src/Module/Item/Compose.php:205 src/Module/Post/Edit.php:145
++#: src/Content/Conversation.php:392 src/Content/Conversation.php:742
+ #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145
 -#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:557
 +#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:568
  msgid "Please wait"
  msgstr ""
  
@@@ -475,7 -475,7 +475,7 @@@ msgstr "
  msgid "Do not show a status post for this upload"
  msgstr ""
  
- #: mod/photos.php:736 mod/photos.php:1097 src/Content/Conversation.php:393
 -#: mod/photos.php:731 mod/photos.php:1091 src/Content/Conversation.php:393
++#: mod/photos.php:736 mod/photos.php:1097 src/Content/Conversation.php:394
  #: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:183
  msgid "Permissions"
  msgstr ""
@@@ -488,7 -488,7 +488,7 @@@ msgstr "
  msgid "Delete Album"
  msgstr ""
  
- #: mod/photos.php:803 mod/photos.php:903 src/Content/Conversation.php:409
 -#: mod/photos.php:796 mod/photos.php:897 src/Content/Conversation.php:409
++#: mod/photos.php:803 mod/photos.php:903 src/Content/Conversation.php:410
  #: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109
  #: src/Module/Contact/Unfollow.php:126
  #: src/Module/Media/Attachment/Browser.php:77
@@@ -605,10 -605,10 +605,10 @@@ msgstr "
  msgid "Comment"
  msgstr ""
  
 -#: mod/photos.php:1137 mod/photos.php:1193 mod/photos.php:1267
 -#: src/Content/Conversation.php:406 src/Module/Calendar/Event/Form.php:248
 +#: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279
- #: src/Content/Conversation.php:406 src/Module/Calendar/Event/Form.php:248
- #: src/Module/Item/Compose.php:200 src/Module/Post/Edit.php:165
- #: src/Object/Post.php:1096
++#: src/Content/Conversation.php:407 src/Module/Calendar/Event/Form.php:248
+ #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165
 -#: src/Object/Post.php:1083
++#: src/Object/Post.php:1097
  msgid "Preview"
  msgstr ""
  
@@@ -617,11 -617,11 +617,11 @@@
  msgid "Loading..."
  msgstr ""
  
- #: mod/photos.php:1236 src/Content/Conversation.php:657 src/Object/Post.php:262
 -#: mod/photos.php:1224 src/Content/Conversation.php:651 src/Object/Post.php:258
++#: mod/photos.php:1236 src/Content/Conversation.php:658 src/Object/Post.php:262
  msgid "Select"
  msgstr ""
  
- #: mod/photos.php:1237 src/Content/Conversation.php:658
 -#: mod/photos.php:1225 src/Content/Conversation.php:652
++#: mod/photos.php:1237 src/Content/Conversation.php:659
  #: src/Module/Moderation/Users/Active.php:136
  #: src/Module/Moderation/Users/Blocked.php:136
  #: src/Module/Moderation/Users/Index.php:151
@@@ -1220,8 -1220,8 +1220,8 @@@ msgstr[1] "
  msgid "Visible to <strong>everybody</strong>"
  msgstr ""
  
- #: src/Content/Conversation.php:330 src/Module/Item/Compose.php:199
- #: src/Object/Post.php:1095
 -#: src/Content/Conversation.php:329 src/Module/Item/Compose.php:200
 -#: src/Object/Post.php:1082
++#: src/Content/Conversation.php:330 src/Module/Item/Compose.php:200
++#: src/Object/Post.php:1096
  msgid "Please enter a image/video/audio/webpage URL:"
  msgstr ""
  
@@@ -1280,207 -1280,212 +1280,212 @@@ msgstr "
  msgid "Underline"
  msgstr ""
  
 -#: src/Content/Conversation.php:367 src/Module/Item/Compose.php:193
 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1076
 +#: src/Content/Conversation.php:368 src/Module/Item/Compose.php:193
- #: src/Module/Post/Edit.php:174 src/Object/Post.php:1089
++#: src/Module/Post/Edit.php:174 src/Object/Post.php:1090
  msgid "Quote"
  msgstr ""
  
 -#: src/Content/Conversation.php:368 src/Module/Item/Compose.php:194
 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1077
 +#: src/Content/Conversation.php:369 src/Module/Item/Compose.php:194
- #: src/Module/Post/Edit.php:175 src/Object/Post.php:1090
++#: src/Module/Post/Edit.php:175 src/Object/Post.php:1091
  msgid "Add emojis"
  msgstr ""
  
 -#: src/Content/Conversation.php:369 src/Module/Item/Compose.php:195
 -#: src/Object/Post.php:1075
 +#: src/Content/Conversation.php:370 src/Module/Item/Compose.php:195
- #: src/Module/Post/Edit.php:176 src/Object/Post.php:1091
- msgid "Code"
++#: src/Object/Post.php:1089
+ msgid "Content Warning"
  msgstr ""
  
 -#: src/Content/Conversation.php:370 src/Module/Item/Compose.php:196
 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1078
 +#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:196
- #: src/Object/Post.php:1092
- msgid "Image"
++#: src/Module/Post/Edit.php:176 src/Object/Post.php:1092
+ msgid "Code"
  msgstr ""
  
 -#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:197
 -#: src/Object/Post.php:1079
 +#: src/Content/Conversation.php:372 src/Module/Item/Compose.php:197
- #: src/Module/Post/Edit.php:177 src/Object/Post.php:1093
- msgid "Link"
++#: src/Object/Post.php:1093
+ msgid "Image"
  msgstr ""
  
 -#: src/Content/Conversation.php:372 src/Module/Item/Compose.php:198
 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1080
 +#: src/Content/Conversation.php:373 src/Module/Item/Compose.php:198
- #: src/Module/Post/Edit.php:178 src/Object/Post.php:1094
++#: src/Module/Post/Edit.php:177 src/Object/Post.php:1094
+ msgid "Link"
+ msgstr ""
+ 
 -#: src/Content/Conversation.php:373 src/Module/Item/Compose.php:199
 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1081
++#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:199
++#: src/Module/Post/Edit.php:178 src/Object/Post.php:1095
  msgid "Link or Media"
  msgstr ""
  
--#: src/Content/Conversation.php:374
++#: src/Content/Conversation.php:375
  msgid "Video"
  msgstr ""
  
- #: src/Content/Conversation.php:375 src/Module/Item/Compose.php:201
 -#: src/Content/Conversation.php:375 src/Module/Item/Compose.php:202
++#: src/Content/Conversation.php:376 src/Module/Item/Compose.php:202
  #: src/Module/Post/Edit.php:141
  msgid "Set your location"
  msgstr ""
  
--#: src/Content/Conversation.php:376 src/Module/Post/Edit.php:142
++#: src/Content/Conversation.php:377 src/Module/Post/Edit.php:142
  msgid "set location"
  msgstr ""
  
--#: src/Content/Conversation.php:377 src/Module/Post/Edit.php:143
++#: src/Content/Conversation.php:378 src/Module/Post/Edit.php:143
  msgid "Clear browser location"
  msgstr ""
  
--#: src/Content/Conversation.php:378 src/Module/Post/Edit.php:144
++#: src/Content/Conversation.php:379 src/Module/Post/Edit.php:144
  msgid "clear location"
  msgstr ""
  
- #: src/Content/Conversation.php:380 src/Module/Item/Compose.php:206
 -#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:207
++#: src/Content/Conversation.php:381 src/Module/Item/Compose.php:207
  #: src/Module/Post/Edit.php:157
  msgid "Set title"
  msgstr ""
  
- #: src/Content/Conversation.php:382 src/Module/Item/Compose.php:207
 -#: src/Content/Conversation.php:382 src/Module/Item/Compose.php:208
++#: src/Content/Conversation.php:383 src/Module/Item/Compose.php:208
  #: src/Module/Post/Edit.php:159
  msgid "Categories (comma-separated list)"
  msgstr ""
  
- #: src/Content/Conversation.php:387 src/Module/Item/Compose.php:223
 -#: src/Content/Conversation.php:387 src/Module/Item/Compose.php:224
++#: src/Content/Conversation.php:388 src/Module/Item/Compose.php:224
  msgid "Scheduled at"
  msgstr ""
  
--#: src/Content/Conversation.php:392 src/Module/Post/Edit.php:146
++#: src/Content/Conversation.php:393 src/Module/Post/Edit.php:146
  msgid "Permission settings"
  msgstr ""
  
--#: src/Content/Conversation.php:402 src/Module/Post/Edit.php:155
++#: src/Content/Conversation.php:403 src/Module/Post/Edit.php:155
  msgid "Public post"
  msgstr ""
  
- #: src/Content/Conversation.php:416 src/Content/Widget/VCard.php:120
 -#: src/Content/Conversation.php:416 src/Content/Widget/VCard.php:113
++#: src/Content/Conversation.php:417 src/Content/Widget/VCard.php:120
  #: src/Model/Profile.php:469 src/Module/Admin/Logs/View.php:92
  #: src/Module/Post/Edit.php:181
  msgid "Message"
  msgstr ""
  
--#: src/Content/Conversation.php:417 src/Module/Post/Edit.php:182
++#: src/Content/Conversation.php:418 src/Module/Post/Edit.php:182
  #: src/Module/Settings/TwoFactor/Trusted.php:140
  msgid "Browser"
  msgstr ""
  
--#: src/Content/Conversation.php:419 src/Module/Post/Edit.php:185
++#: src/Content/Conversation.php:420 src/Module/Post/Edit.php:185
  msgid "Open Compose page"
  msgstr ""
  
- #: src/Content/Conversation.php:685 src/Object/Post.php:248
 -#: src/Content/Conversation.php:679 src/Object/Post.php:244
++#: src/Content/Conversation.php:686 src/Object/Post.php:248
  msgid "Pinned item"
  msgstr ""
  
- #: src/Content/Conversation.php:701 src/Object/Post.php:513
 -#: src/Content/Conversation.php:695 src/Object/Post.php:502
 -#: src/Object/Post.php:503
++#: src/Content/Conversation.php:702 src/Object/Post.php:513
 +#: src/Object/Post.php:514
  #, php-format
  msgid "View %s's profile @ %s"
  msgstr ""
  
- #: src/Content/Conversation.php:714 src/Object/Post.php:501
 -#: src/Content/Conversation.php:708 src/Object/Post.php:490
++#: src/Content/Conversation.php:715 src/Object/Post.php:501
  msgid "Categories:"
  msgstr ""
  
- #: src/Content/Conversation.php:715 src/Object/Post.php:502
 -#: src/Content/Conversation.php:709 src/Object/Post.php:491
++#: src/Content/Conversation.php:716 src/Object/Post.php:502
  msgid "Filed under:"
  msgstr ""
  
- #: src/Content/Conversation.php:723 src/Object/Post.php:527
 -#: src/Content/Conversation.php:717 src/Object/Post.php:516
++#: src/Content/Conversation.php:724 src/Object/Post.php:527
  #, php-format
  msgid "%s from %s"
  msgstr ""
  
- #: src/Content/Conversation.php:739
 -#: src/Content/Conversation.php:733
++#: src/Content/Conversation.php:740
  msgid "View in context"
  msgstr ""
  
- #: src/Content/Conversation.php:804
 -#: src/Content/Conversation.php:798
++#: src/Content/Conversation.php:805
  msgid "remove"
  msgstr ""
  
- #: src/Content/Conversation.php:808
 -#: src/Content/Conversation.php:802
++#: src/Content/Conversation.php:809
  msgid "Delete Selected Items"
  msgstr ""
  
- #: src/Content/Conversation.php:874 src/Content/Conversation.php:877
- #: src/Content/Conversation.php:880 src/Content/Conversation.php:883
- #: src/Content/Conversation.php:886
 -#: src/Content/Conversation.php:867 src/Content/Conversation.php:870
 -#: src/Content/Conversation.php:873 src/Content/Conversation.php:876
 -#: src/Content/Conversation.php:879
++#: src/Content/Conversation.php:875 src/Content/Conversation.php:878
++#: src/Content/Conversation.php:881 src/Content/Conversation.php:884
++#: src/Content/Conversation.php:887
  #, php-format
  msgid "You had been addressed (%s)."
  msgstr ""
  
- #: src/Content/Conversation.php:889
 -#: src/Content/Conversation.php:882
++#: src/Content/Conversation.php:890
  #, php-format
  msgid "You are following %s."
  msgstr ""
  
- #: src/Content/Conversation.php:892
 -#: src/Content/Conversation.php:885
++#: src/Content/Conversation.php:893
  msgid "You subscribed to one or more tags in this post."
  msgstr ""
  
- #: src/Content/Conversation.php:911
 -#: src/Content/Conversation.php:898
++#: src/Content/Conversation.php:912
  #, php-format
  msgid "%s reshared this."
  msgstr ""
  
- #: src/Content/Conversation.php:913
 -#: src/Content/Conversation.php:900
++#: src/Content/Conversation.php:914
  msgid "Reshared"
  msgstr ""
  
- #: src/Content/Conversation.php:913
 -#: src/Content/Conversation.php:900
++#: src/Content/Conversation.php:914
  #, php-format
  msgid "Reshared by %s <%s>"
  msgstr ""
  
- #: src/Content/Conversation.php:916
 -#: src/Content/Conversation.php:903
++#: src/Content/Conversation.php:917
  #, php-format
  msgid "%s is participating in this thread."
  msgstr ""
  
- #: src/Content/Conversation.php:919
 -#: src/Content/Conversation.php:906
++#: src/Content/Conversation.php:920
  msgid "Stored for general reasons"
  msgstr ""
  
- #: src/Content/Conversation.php:922
 -#: src/Content/Conversation.php:909
++#: src/Content/Conversation.php:923
  msgid "Global post"
  msgstr ""
  
- #: src/Content/Conversation.php:925
 -#: src/Content/Conversation.php:912
++#: src/Content/Conversation.php:926
  msgid "Sent via an relay server"
  msgstr ""
  
- #: src/Content/Conversation.php:925
 -#: src/Content/Conversation.php:912
++#: src/Content/Conversation.php:926
  #, php-format
  msgid "Sent via the relay server %s <%s>"
  msgstr ""
  
- #: src/Content/Conversation.php:928
 -#: src/Content/Conversation.php:915
++#: src/Content/Conversation.php:929
  msgid "Fetched"
  msgstr ""
  
- #: src/Content/Conversation.php:928
 -#: src/Content/Conversation.php:915
++#: src/Content/Conversation.php:929
  #, php-format
  msgid "Fetched because of %s <%s>"
  msgstr ""
  
- #: src/Content/Conversation.php:931
 -#: src/Content/Conversation.php:918
++#: src/Content/Conversation.php:932
  msgid "Stored because of a child post to complete this thread."
  msgstr ""
  
- #: src/Content/Conversation.php:934
 -#: src/Content/Conversation.php:921
++#: src/Content/Conversation.php:935
  msgid "Local delivery"
  msgstr ""
  
- #: src/Content/Conversation.php:937
 -#: src/Content/Conversation.php:924
++#: src/Content/Conversation.php:938
  msgid "Stored because of your activity (like, comment, star, ...)"
  msgstr ""
  
- #: src/Content/Conversation.php:940
 -#: src/Content/Conversation.php:927
++#: src/Content/Conversation.php:941
  msgid "Distributed"
  msgstr ""
  
- #: src/Content/Conversation.php:943
 -#: src/Content/Conversation.php:930
++#: src/Content/Conversation.php:944
  msgid "Pushed to us"
  msgstr ""
  
@@@ -1596,8 -1601,8 +1601,8 @@@ msgid "
  "Contact birthday events are private to you."
  msgstr ""
  
 -#: src/Content/GroupManager.php:151 src/Content/Nav.php:276
 -#: src/Content/Text/HTML.php:877 src/Content/Widget.php:543
 +#: src/Content/GroupManager.php:152 src/Content/Nav.php:276
- #: src/Content/Text/HTML.php:880 src/Content/Widget.php:538
++#: src/Content/Text/HTML.php:880 src/Content/Widget.php:541
  msgid "Groups"
  msgstr ""
  
@@@ -1605,12 -1610,12 +1610,12 @@@
  msgid "External link to group"
  msgstr ""
  
- #: src/Content/GroupManager.php:158 src/Content/Widget.php:514
 -#: src/Content/GroupManager.php:157 src/Content/Widget.php:518
++#: src/Content/GroupManager.php:158 src/Content/Widget.php:516
  msgid "show less"
  msgstr ""
  
 -#: src/Content/GroupManager.php:158 src/Content/Widget.php:414
 -#: src/Content/Widget.php:519
 +#: src/Content/GroupManager.php:159 src/Content/Widget.php:414
- #: src/Content/Widget.php:515
++#: src/Content/Widget.php:517
  msgid "show more"
  msgstr ""
  
@@@ -2185,23 -2190,23 +2190,23 @@@ msgid_plural "%d contacts in common
  msgstr[0] ""
  msgstr[1] ""
  
- #: src/Content/Widget.php:508
 -#: src/Content/Widget.php:512
++#: src/Content/Widget.php:510
  msgid "Archives"
  msgstr ""
  
- #: src/Content/Widget.php:516
 -#: src/Content/Widget.php:520
++#: src/Content/Widget.php:518
  msgid "On this date"
  msgstr ""
  
- #: src/Content/Widget.php:535
 -#: src/Content/Widget.php:540
++#: src/Content/Widget.php:538
  msgid "Persons"
  msgstr ""
  
- #: src/Content/Widget.php:536
 -#: src/Content/Widget.php:541
++#: src/Content/Widget.php:539
  msgid "Organisations"
  msgstr ""
  
- #: src/Content/Widget.php:537 src/Model/Contact.php:1676
 -#: src/Content/Widget.php:542 src/Model/Contact.php:1651
++#: src/Content/Widget.php:540 src/Model/Contact.php:1676
  msgid "News"
  msgstr ""
  
@@@ -2209,7 -2214,7 +2214,7 @@@
  msgid "Account Types"
  msgstr ""
  
- #: src/Content/Widget.php:545 src/Module/Moderation/BaseUsers.php:69
 -#: src/Content/Widget.php:547 src/Module/Moderation/BaseUsers.php:69
++#: src/Content/Widget.php:548 src/Module/Moderation/BaseUsers.php:69
  msgid "All"
  msgstr ""