Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / Delegation.php

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 279c694b1d6729d4f39828c2726faacd7513728b..2b36fc2a306600bc978647b1b2ce9ee2f3bc5cb1 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -37,7 +37,7 @@ use Friendica\Util\Proxy;
  */
 class Delegation extends BaseModule
 {
-       public static function post(array $parameters = [])
+       public function post()
        {
                if (!local_user()) {
                        return;
@@ -112,7 +112,7 @@ class Delegation extends BaseModule
                // NOTREACHED
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                if (!local_user()) {
                        throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -122,7 +122,7 @@ class Delegation extends BaseModule
 
                //getting additinal information for each identity
                foreach ($identities as $key => $identity) {
-                       $identities[$key]['thumb'] = User::getAvatarUrlForId($identity['uid'], Proxy::SIZE_THUMB);
+                       $identities[$key]['thumb'] = User::getAvatarUrl($identity, Proxy::SIZE_THUMB);
 
                        $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->getLoggedInUserNickname());
 
@@ -133,7 +133,7 @@ class Delegation extends BaseModule
                        $params = ['distinct' => true, 'expression' => 'convid'];
                        $notifications += DBA::count('mail', ['uid' => $identity['uid'], 'seen' => false], $params);
 
-                       $notifications += DBA::count('intro', ['blocked' => false, 'ignore' => false, 'uid' => $identity['uid']]);
+                       $notifications += DI::intro()->countActiveForUser($identity['uid']);
 
                        $identities[$key]['notifications'] = $notifications;
                }