New post class in the rest of the classes

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

diff --git a/src/Object/Post.php b/src/Object/Post.php
index b1cef57db3132c9e4290dbb81bf263e8df87d511..4c838f771458462498318fd26728fcfb5376820e 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -33,6 +33,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post as ModelPost;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
@@ -212,7 +213,7 @@ class Post
                if (!$origin) {
                        /// @todo This shouldn't be done as query here, but better during the data creation.
                        // it is now done here, since during the RC phase we shouldn't make to intense changes.
-                       $parent = Item::selectFirst(['origin'], ['id' => $item['parent']]);
+                       $parent = ModelPost::selectFirst(['origin'], ['id' => $item['parent']]);
                        if (DBA::isResult($parent)) {
                                $origin = $parent['origin'];
                        }
@@ -280,8 +281,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']) : '',
                        ];
                }
 
@@ -351,10 +352,11 @@ 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('Quote and share this'), DI::l10n()->t('Quoted Share')];
+                               $buttons['share'] = [DI::l10n()->t('Quote share this'), DI::l10n()->t('Quote Share')];
                        }
                        if ($announceable) {
-                               $buttons['announce'] = [DI::l10n()->t('Share this'), DI::l10n()->t('Share')];
+                               $buttons['announce'] = [DI::l10n()->t('Reshare this'), DI::l10n()->t('Reshare')];
+                               $buttons['unannounce'] = [DI::l10n()->t('Cancel your Reshare'), DI::l10n()->t('Unshare')];
                        }
                }
 
@@ -874,7 +876,7 @@ class Post
                        return '';
                }
 
-               $item = Item::selectFirst(['author-addr', 'uri-id'], ['id' => $this->getId()]);
+               $item = ModelPost::selectFirst(['author-addr', 'uri-id'], ['id' => $this->getId()]);
                if (!DBA::isResult($item) || empty($item['author-addr'])) {
                        // Should not happen
                        return '';