clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13866 from annando/channel-reshare-privat 

Channel relay reshares are now private follwers posts
This commit is contained in:
Hypolite Petovan 2024-02-01 16:48:55 -05:00 committed by GitHub
parent 6a6e2cd2a2 b77a5c3eb4
commit 8ddc71188f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Item.php
View File

@ -1501,7 +1501,11 @@ class Item
]; ];
if (!Post::exists($condition)) { if (!Post::exists($condition)) {
Logger::debug('Reshare post', ['uid' => $uid, 'uri-id' => $uri_id]); Logger::debug('Reshare post', ['uid' => $uid, 'uri-id' => $uri_id]);
self::performActivity($item['id'], 'announce', $uid); $allow_cid = '';
$allow_gid = '<' . Circle::FOLLOWERS . '>';
$deny_cid = '';
$deny_gid = '';
self::performActivity($item['id'], 'announce', $uid, $allow_cid, $allow_gid, $deny_cid, $deny_gid);
} else { } else {
Logger::debug('Reshare already exists', ['uid' => $uid, 'uri-id' => $uri_id]); Logger::debug('Reshare already exists', ['uid' => $uid, 'uri-id' => $uri_id]);
} }

58
view/lang/C/messages.po
View File

@ -1778,7 +1778,7 @@ msgstr ""
msgid "Create new group" msgid "Create new group"
msgstr "" msgstr ""
#: src/Content/Item.php:332 src/Model/Item.php:3246 #: src/Content/Item.php:332 src/Model/Item.php:3250
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -1786,7 +1786,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: src/Content/Item.php:341 src/Model/Item.php:3248 #: src/Content/Item.php:341 src/Model/Item.php:3252
#: src/Module/Post/Tag/Add.php:123 #: src/Module/Post/Tag/Add.php:123
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -2199,8 +2199,8 @@ msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1005 src/Model/Item.php:3979 #: src/Content/Text/BBCode.php:1005 src/Model/Item.php:3983
#: src/Model/Item.php:3985 src/Model/Item.php:3986 #: src/Model/Item.php:3989 src/Model/Item.php:3990
msgid "Link to source" msgid "Link to source"
msgstr "" msgstr ""
@ -2867,7 +2867,7 @@ msgstr ""
msgid "Could not connect to database." msgid "Could not connect to database."
msgstr "" msgstr ""
#: src/Core/L10n.php:444 src/Model/Item.php:2290 #: src/Core/L10n.php:444 src/Model/Item.php:2294
msgid "Undetermined" msgid "Undetermined"
msgstr "" msgstr ""
@ -3429,91 +3429,91 @@ msgstr ""
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
#: src/Model/Item.php:2297 #: src/Model/Item.php:2301
#, php-format #, php-format
msgid "%s (%s - %s): %s" msgid "%s (%s - %s): %s"
msgstr "" msgstr ""
#: src/Model/Item.php:2299 #: src/Model/Item.php:2303
#, php-format #, php-format
msgid "%s (%s): %s" msgid "%s (%s): %s"
msgstr "" msgstr ""
#: src/Model/Item.php:2302 #: src/Model/Item.php:2306
#, php-format #, php-format
msgid "Detected languages in this post:\\n%s" msgid "Detected languages in this post:\\n%s"
msgstr "" msgstr ""
#: src/Model/Item.php:3250 #: src/Model/Item.php:3254
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:3252 #: src/Model/Item.php:3256
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: src/Model/Item.php:3255 src/Module/Post/Tag/Add.php:123 #: src/Model/Item.php:3259 src/Module/Post/Tag/Add.php:123
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3425
#, php-format
msgid "%s is blocked"
msgstr ""
#: src/Model/Item.php:3427
#, php-format
msgid "%s is ignored"
msgstr ""
#: src/Model/Item.php:3429 #: src/Model/Item.php:3429
#, php-format #, php-format
msgid "Content from %s is collapsed" msgid "%s is blocked"
msgstr ""
#: src/Model/Item.php:3431
#, php-format
msgid "%s is ignored"
msgstr "" msgstr ""
#: src/Model/Item.php:3433 #: src/Model/Item.php:3433
#, php-format #, php-format
msgid "Content from %s is collapsed"
msgstr ""
#: src/Model/Item.php:3437
#, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3886 #: src/Model/Item.php:3890
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3917 #: src/Model/Item.php:3921
#, php-format #, php-format
msgid "%2$s (%3$d%%, %1$d vote)" msgid "%2$s (%3$d%%, %1$d vote)"
msgid_plural "%2$s (%3$d%%, %1$d votes)" msgid_plural "%2$s (%3$d%%, %1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3919 #: src/Model/Item.php:3923
#, php-format #, php-format
msgid "%2$s (%1$d vote)" msgid "%2$s (%1$d vote)"
msgid_plural "%2$s (%1$d votes)" msgid_plural "%2$s (%1$d votes)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3924 #: src/Model/Item.php:3928
#, php-format #, php-format
msgid "%d voter. Poll end: %s" msgid "%d voter. Poll end: %s"
msgid_plural "%d voters. Poll end: %s" msgid_plural "%d voters. Poll end: %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3926 #: src/Model/Item.php:3930
#, php-format #, php-format
msgid "%d voter." msgid "%d voter."
msgid_plural "%d voters." msgid_plural "%d voters."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Model/Item.php:3928 #: src/Model/Item.php:3932
#, php-format #, php-format
msgid "Poll end: %s" msgid "Poll end: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3962 src/Model/Item.php:3963 #: src/Model/Item.php:3966 src/Model/Item.php:3967
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""