Group selection: Respect "pubmail" and ignore atchived or blocked contacts

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

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 238223aee03097164ac6d6924257074114b80642..0d9bf598580dee6ffe4f4851bb76ae15fa1a1a9b 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -16,7 +16,7 @@ use Friendica\Util\Proxy as ProxyUtils;
  */
 class AllFriends extends BaseModule
 {
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $app = self::getApp();
 
@@ -71,14 +71,14 @@ class AllFriends extends BaseModule
                        } else {
                                $connlnk = $app->getBaseURL() . '/follow/?url=' . $friend['url'];
                                $photoMenu = [
-                                       'profile' => [L10n::t('View Profile'), Model\Contact::magicLinkbyId($friend['id'])],
+                                       'profile' => [L10n::t('View Profile'), Model\Contact::magicLinkbyId($friend['id'], $friend['url'])],
                                        'follow'  => [L10n::t('Connect/Follow'), $connlnk]
                                ];
                        }
 
                        $entry = [
-                               'url'          => Model\Contact::magicLinkbyId($friend['id']),
-                               'itemurl'      => defaults($contactDetails, 'addr', $friend['url']),
+                               'url'          => Model\Contact::magicLinkbyId($friend['id'], $friend['url']),
+                               'itemurl'      => ($contactDetails['addr'] ?? '') ?: $friend['url'],
                                'name'         => $contactDetails['name'],
                                'thumb'        => ProxyUtils::proxifyUrl($contactDetails['thumb'], false, ProxyUtils::SIZE_THUMB),
                                'img_hover'    => $contactDetails['name'],