Merge pull request #8134 from nupplaphil/task/di_l10n

[friendica.git] / src / Content / Widget / ContactBlock.php

diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index bc33b9c9c928672a24de0d9712bf0a52562a0c73..bce4b617f96e243d3e58177e75d8b92e851d18de 100644 (file)
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -8,11 +8,10 @@ namespace Friendica\Content\Widget;
 
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 
@@ -34,7 +33,7 @@ class ContactBlock
        {
                $o = '';
 
-               $shown = PConfig::get($profile['uid'], 'system', 'display_friend_count', 24);
+               $shown = DI::pConfig()->get($profile['uid'], 'system', 'display_friend_count', 24);
                if ($shown == 0) {
                        return $o;
                }
@@ -55,13 +54,13 @@ class ContactBlock
                        'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::FEED],
                ]);
 
-               $contacts_title = L10n::t('No contacts');
+               $contacts_title = DI::l10n()->t('No contacts');
 
                $micropro = [];
 
                if ($total) {
                        // Only show followed for personal accounts, followers for pages
-                       if (defaults($profile, 'account-type', User::ACCOUNT_TYPE_PERSON) == User::ACCOUNT_TYPE_PERSON) {
+                       if ((($profile['account-type'] ?? '') ?: User::ACCOUNT_TYPE_PERSON) == User::ACCOUNT_TYPE_PERSON) {
                                $rel = [Contact::SHARING, Contact::FRIEND];
                        } else {
                                $rel = [Contact::FOLLOWER, Contact::FRIEND];
@@ -75,7 +74,7 @@ class ContactBlock
                                'hidden' => false,
                                'archive' => false,
                                'rel' => $rel,
-                               'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA],
+                               'network' => Protocol::FEDERATED,
                        ], ['limit' => $shown]);
 
                        if (DBA::isResult($contact_ids_stmt)) {
@@ -87,7 +86,7 @@ class ContactBlock
                                $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'network'], ['id' => $contact_ids]);
 
                                if (DBA::isResult($contacts_stmt)) {
-                                       $contacts_title = L10n::tt('%d Contact', '%d Contacts', $total);
+                                       $contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total);
                                        $micropro = [];
 
                                        while ($contact = DBA::fetch($contacts_stmt)) {
@@ -106,7 +105,7 @@ class ContactBlock
                $o = Renderer::replaceMacros($tpl, [
                        '$contacts' => $contacts_title,
                        '$nickname' => $profile['nickname'],
-                       '$viewcontacts' => L10n::t('View Contacts'),
+                       '$viewcontacts' => DI::l10n()->t('View Contacts'),
                        '$micropro' => $micropro,
                ]);