Merge pull request #8227 from annando/daemon-checks

[friendica.git] / src / Model / ItemContent.php

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index 6d03ae3253b28c8e51ae6de236b9b5803756c248..8805f5b2556a2e0e94a2940ab35881b83291889b 100644 (file)
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -6,15 +6,14 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\DI;
 
-class ItemContent extends BaseObject
+class ItemContent
 {
        /**
-        * @brief Convert a message into plaintext for connectors to other networks
+        * Convert a message into plaintext for connectors to other networks
         *
         * @param array  $item           The message array that is about to be posted
         * @param int    $limit          The maximum number of characters when posting to that network
@@ -90,7 +89,7 @@ class ItemContent extends BaseObject
                        }
                }
 
-               $html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode);
+               $html = Text\BBCode::convert($post['text'] . ($post['after'] ?? ''), false, $htmlmode);
                $msg = Text\HTML::toPlaintext($html, 0, true);
                $msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8'));
 
@@ -99,7 +98,7 @@ class ItemContent extends BaseObject
                        if ($post['type'] == 'link') {
                                $link = $post['url'];
                        } elseif ($post['type'] == 'text') {
-                               $link = defaults($post, 'url', '');
+                               $link = $post['url'] ?? '';
                        } elseif ($post['type'] == 'video') {
                                $link = $post['url'];
                        } elseif ($post['type'] == 'photo') {
@@ -159,7 +158,7 @@ class ItemContent extends BaseObject
                                        $post['url'] = $item['plink'];
                                } elseif (strpos($item['body'], '[share') !== false) {
                                        $post['url'] = $item['plink'];
-                               } elseif (PConfig::get($item['uid'], 'system', 'no_intelligent_shortening')) {
+                               } elseif (DI::pConfig()->get($item['uid'], 'system', 'no_intelligent_shortening')) {
                                        $post['url'] = $item['plink'];
                                }
                                $msg = Text\Plaintext::shorten($msg, $limit);