Add BBCode versioning

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index b89a54a874b6239b76b175bb98007d82f47b05e3..12d8067423c14948062a9ce64058af27d01b8f98 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -176,7 +176,12 @@ class Post
                        : false);
 
                $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != Item::PRIVATE;
-               $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::TWITTER]);
+               $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]);
+
+               // On Diaspora only toplevel posts can be reshared
+               if ($announceable && ($item['network'] == Protocol::DIASPORA) && ($item['gravity'] != GRAVITY_PARENT)) {
+                       $announceable = false;
+               }
 
                $edpost = false;
 
@@ -275,8 +280,8 @@ class Post
                $responses = [];
                foreach ($response_verbs as $value => $verb) {
                        $responses[$verb] = [
-                               'self'   => $conv_responses[$verb][$item['uri'] . '-self'] ?? 0,
-                               'output' => !empty($conv_responses[$verb][$item['uri']]) ? format_like($conv_responses[$verb][$item['uri']], $conv_responses[$verb][$item['uri'] . '-l'], $verb, $item['uri']) : '',
+                               'self'   => $conv_responses[$verb][$item['uri']]['self'] ?? 0,
+                               'output' => !empty($conv_responses[$verb][$item['uri']]) ? format_activity($conv_responses[$verb][$item['uri']]['links'], $verb, $item['uri']) : '',
                        ];
                }
 
@@ -346,10 +351,10 @@ class Post
                        $buttons['like']    = [DI::l10n()->t("I like this \x28toggle\x29")      , DI::l10n()->t("like")];
                        $buttons['dislike'] = [DI::l10n()->t("I don't like this \x28toggle\x29"), DI::l10n()->t("dislike")];
                        if ($shareable) {
-                               $buttons['share'] = [DI::l10n()->t('Share this'), DI::l10n()->t('Share')];
+                               $buttons['share'] = [DI::l10n()->t('Quote and share this'), DI::l10n()->t('Quote Share')];
                        }
                        if ($announceable) {
-                               $buttons['announce'] = [DI::l10n()->t('Announce this'), DI::l10n()->t('Announce')];
+                               $buttons['announce'] = [DI::l10n()->t('Share this'), DI::l10n()->t('Share')];
                        }
                }