Continued:

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

diff --git a/src/Object/Post.php b/src/Object/Post.php
index b45f77ed764115ccc3adb1b7fd2af8a982f76e1f..820730a32b9e01a4942af6b24c3eeca6a82d3eb3 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -8,11 +8,14 @@ use Friendica\BaseObject;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -75,7 +78,7 @@ class Post extends BaseObject
                }
 
                // Prepare the children
-               if (count($data['children'])) {
+               if (!empty($data['children'])) {
                        foreach ($data['children'] as $item) {
                                // Only add will be displayed
                                if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
@@ -85,8 +88,7 @@ class Post extends BaseObject
                                }
 
                                // You can always comment on Diaspora and OStatus items
-                               // The empty network can happen with your local (self) contact
-                               if (in_array($item['network'], ['', NETWORK_OSTATUS, NETWORK_DIASPORA]) && (local_user() == $item['uid'])) {
+                               if (in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]) && (local_user() == $item['uid'])) {
                                        $item['writable'] = true;
                                }
 
@@ -124,8 +126,8 @@ class Post extends BaseObject
                if (strtotime($item['edited']) - strtotime($item['created']) > 1) {
                        $edited = [
                                'label'    => L10n::t('This entry was edited'),
-                               'date'     => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
-                               'relative' => relative_date($item['edited'])
+                               'date'     => DateTimeFormat::local($item['edited'], 'r'),
+                               'relative' => Temporal::getRelativeDate($item['edited'])
                        ];
                }
                $commentww = '';
@@ -297,17 +299,11 @@ class Post extends BaseObject
                        if ($shareable) {
                                $buttons['share'] = [L10n::t('Share this'), L10n::t('share')];
                        }
-
-                       // If a contact isn't writable, we cannot send a like or dislike to it
-                       if (!$item['writable']) {
-                               unset($buttons["like"]);
-                               unset($buttons["dislike"]);
-                       }
                }
 
                $comment = $this->getCommentBox($indent);
 
-               if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) {
+               if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) {
                        $shiny = 'shiny';
                }
 
@@ -320,7 +316,13 @@ class Post extends BaseObject
                $body_e       = $body;
                $text_e       = strip_tags($body);
                $name_e       = $profile_name;
-               $title_e      = $item['title'];
+
+               if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+                       $title_e = ucfirst($item['content-warning']);
+               } else {
+                       $title_e = $item['title'];
+               }
+
                $location_e   = $location;
                $owner_name_e = $this->getOwnerName();
 
@@ -342,6 +344,7 @@ class Post extends BaseObject
                $tmp_item = [
                        'template'        => $this->getTemplate(),
                        'type'            => implode("", array_slice(explode("/", $item['verb']), -1)),
+                       'suppress_tags'   => Config::get('system', 'suppress_tags'),
                        'tags'            => $item['tags'],
                        'hashtags'        => $item['hashtags'],
                        'mentions'        => $item['mentions'],
@@ -370,10 +373,10 @@ class Post extends BaseObject
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
-                       'localtime'       => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
-                       'ago'             => $item['app'] ? L10n::t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
+                       'localtime'       => DateTimeFormat::local($item['created'], 'r'),
+                       'ago'             => $item['app'] ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created']),
                        'app'             => $item['app'],
-                       'created'         => relative_date($item['created']),
+                       'created'         => Temporal::getRelativeDate($item['created']),
                        'lock'            => $lock,
                        'location'        => $location_e,
                        'indent'          => $indent,