X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FPost.php;h=4e0d8d238923d37b77d0cf1e2dab14191d441060;hb=2438eb78dd0f8014a947c1df1cf5b862e4ac285e;hp=7a8e67404a33e91b1135cb1b34330a19190c68e9;hpb=96055cafffe3939d3ede573e54bfa05eb178fdb6;p=friendica.git diff --git a/src/Object/Post.php b/src/Object/Post.php index 7a8e67404a..4e0d8d2389 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -1,6 +1,6 @@ t('Private Message'); + break; + case Item::PUBLIC: + $output = DI::l10n()->t('Public Message'); + break; + case Item::UNLISTED: + $output = DI::l10n()->t('Unlisted Message'); + break; + } + + return $output; + } + /** * Get data in a form usable by a conversation template * @@ -135,8 +158,6 @@ class Post */ public function getTemplateData(array $conv_responses, string $formSecurityToken, $thread_level = 1) { - $a = DI::app(); - $item = $this->getData(); $edited = false; // If the time between "created" and "edited" differs we add @@ -172,10 +193,9 @@ class Post $conv = $this->getThread(); - $lock = ((($item['private'] == Item::PRIVATE) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) - ? DI::l10n()->t('Private Message') - : false); + $privacy = $this->fetchPrivacy($item); + $lock = ($item['private'] == Item::PRIVATE) ? $privacy : false; + $connector = !in_array($item['network'], Protocol::NATIVE_SUPPORT) ? DI::l10n()->t('Connector Message') : false; $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != Item::PRIVATE; $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]); @@ -369,10 +389,12 @@ class Post list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item, local_user()); - if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) { + if (!empty($item['title'])) { + $title = $item['title']; + } elseif (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) { $title = ucfirst($item['content-warning']); } else { - $title = $item['title']; + $title = ''; } if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) { @@ -416,12 +438,6 @@ class Post $direction = []; if (!empty($item['direction'])) { $direction = $item['direction']; - } elseif (DI::config()->get('debug', 'show_direction')) { - $conversation = DBA::selectFirst('conversation', ['direction'], ['item-uri' => $item['uri']]); - if (!empty($conversation['direction']) && in_array($conversation['direction'], [1, 2])) { - $direction_title = [1 => DI::l10n()->t('Pushed'), 2 => DI::l10n()->t('Pulled')]; - $direction = ['direction' => $conversation['direction'], 'title' => $direction_title[$conversation['direction']]]; - } } $languages = []; @@ -469,6 +485,9 @@ class Post 'app' => $item['app'], 'created' => $ago, 'lock' => $lock, + 'private' => $item['private'], + 'privacy' => $privacy, + 'connector' => $connector, 'location_html' => $location_html, 'indent' => $indent, 'shiny' => $shiny, @@ -477,6 +496,7 @@ class Post 'owner_photo' => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)), 'owner_name' => $this->getOwnerName(), 'plink' => Item::getPlink($item), + 'browsershare' => DI::l10n()->t('Share'), 'edpost' => $edpost, 'ispinned' => $ispinned, 'pin' => $pin, @@ -594,10 +614,10 @@ class Post { $item_id = $item->getId(); if (!$item_id) { - Logger::log('[ERROR] Post::addChild : Item has no ID!!', Logger::DEBUG); + Logger::info('[ERROR] Post::addChild : Item has no ID!!'); return false; } elseif ($this->getChild($item->getId())) { - Logger::log('[WARN] Post::addChild : Item already exists (' . $item->getId() . ').', Logger::DEBUG); + Logger::info('[WARN] Post::addChild : Item already exists (' . $item->getId() . ').'); return false; } @@ -696,7 +716,7 @@ class Post return true; } } - Logger::log('[WARN] Item::removeChild : Item is not a child (' . $id . ').', Logger::DEBUG); + Logger::info('[WARN] Item::removeChild : Item is not a child (' . $id . ').'); return false; } @@ -760,7 +780,7 @@ class Post public function getDataValue($name) { if (!isset($this->data[$name])) { - // Logger::log('[ERROR] Item::getDataValue : Item has no value name "'. $name .'".', Logger::DEBUG); + // Logger::info('[ERROR] Item::getDataValue : Item has no value name "'. $name .'".'); return false; } @@ -777,7 +797,7 @@ class Post private function setTemplate($name) { if (empty($this->available_templates[$name])) { - Logger::log('[ERROR] Item::setTemplate : Template not available ("' . $name . '").', Logger::DEBUG); + Logger::info('[ERROR] Item::setTemplate : Template not available ("' . $name . '").'); return false; } @@ -873,22 +893,26 @@ class Post $owner = User::getOwnerDataById($a->getLoggedInUserId()); - if (!Feature::isEnabled(local_user(), 'explicit_mentions')) { - return ''; - } - - $item = PostModel::selectFirst(['author-addr', 'uri-id', 'network', 'gravity'], ['id' => $this->getId()]); + $item = PostModel::selectFirst(['author-addr', 'uri-id', 'network', 'gravity', 'content-warning'], ['id' => $this->getId()]); if (!DBA::isResult($item) || empty($item['author-addr'])) { // Should not happen return ''; } - if (($item['author-addr'] != $owner['addr']) && (($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], [Protocol::DIASPORA]))) { - $text = '@' . $item['author-addr'] . ' '; + if (!empty($item['content-warning']) && Feature::isEnabled(local_user(), 'add_abstract')) { + $text = '[abstract=' . Protocol::ACTIVITYPUB . ']' . $item['content-warning'] . "[/abstract]\n"; } else { $text = ''; } + if (!Feature::isEnabled(local_user(), 'explicit_mentions')) { + return $text; + } + + if (($item['author-addr'] != $owner['addr']) && (($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], [Protocol::DIASPORA]))) { + $text .= '@' . $item['author-addr'] . ' '; + } + $terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]); foreach ($terms as $term) { if (!$term['url']) {