Merge pull request #12447 from MrPetovan/bug/12441-profile-contacts

Retrieve contact records for the page visitor in several modules

src/Model/Contact.php

@@ -1130,36 +1130,22 @@ class Contact
 	 * Returns the data array for the photo menu of a given contact
 	 *
 	 * @param array $contact contact
-	 * @param int   $uid     optional, default 0
+	 * @param int   $uid     Visitor user id
 	 * @return array
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function photoMenu(array $contact, int $uid = 0): array
+	public static function photoMenu(array $contact, int $uid): array
 	{
+		// Anonymous visitor
+		if (!$uid) {
+			return ['profile' => [DI::l10n()->t('View Profile'), self::magicLinkByContact($contact), true]];
+		}
+
 		$pm_url      = '';
 		$status_link = '';
 		$photos_link = '';
 
-		if ($uid == 0) {
-			$uid = DI::userSession()->getLocalUserId();
-		}
-
-		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
-			if ($uid == 0) {
-				$profile_link = self::magicLinkByContact($contact);
-				$menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
-
-				return $menu;
-			}
-
-			// Look for our own contact if the uid doesn't match and isn't public
-			$contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
-			if (DBA::isResult($contact_own)) {
-				return self::photoMenu($contact_own, $uid);
-			}
-		}
-
 		$sparkle = false;
 		if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
 			$sparkle      = true;
@@ -1183,7 +1169,6 @@ class Contact
 		}
 
 		$contact_url = 'contact/' . $contact['id'];
-
 		$posts_link = 'contact/' . $contact['id'] . '/conversations';
 
 		$follow_link   = '';
@@ -1191,7 +1176,7 @@ class Contact
 		if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
 			if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
 				$unfollow_link = 'contact/unfollow?url=' . urlencode($contact['url']) . '&auto=1';
-			} elseif(!$contact['pending']) {
+			} elseif (!$contact['pending']) {
 				$follow_link = 'contact/follow?url=' . urlencode($contact['url']) . '&auto=1';
 			}
 		}
@@ -1202,22 +1187,22 @@ class Contact
 		 */
 		if (empty($contact['uid'])) {
 			$menu = [
-				'profile' => [DI::l10n()->t('View Profile')  , $profile_link , true],
+				'profile'  => [DI::l10n()->t('View Profile')  , $profile_link , true ],
 				'network'  => [DI::l10n()->t('Network Posts') , $posts_link   , false],
 				'edit'     => [DI::l10n()->t('View Contact')  , $contact_url  , false],
-				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link  , true],
+				'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link  , true ],
-				'unfollow'=> [DI::l10n()->t('Unfollow')      , $unfollow_link, true],
+				'unfollow' => [DI::l10n()->t('Unfollow')      , $unfollow_link, true ],
 			];
 		} else {
 			$menu = [
-				'status'  => [DI::l10n()->t('View Status')   , $status_link      , true],
+				'status'   => [DI::l10n()->t('View Status')   , $status_link  , true ],
-				'profile' => [DI::l10n()->t('View Profile')  , $profile_link     , true],
+				'profile'  => [DI::l10n()->t('View Profile')  , $profile_link , true ],
-				'photos'  => [DI::l10n()->t('View Photos')   , $photos_link      , true],
+				'photos'   => [DI::l10n()->t('View Photos')   , $photos_link  , true ],
 				'network'  => [DI::l10n()->t('Network Posts') , $posts_link   , false],
 				'edit'     => [DI::l10n()->t('View Contact')  , $contact_url  , false],
 				'pm'       => [DI::l10n()->t('Send PM')       , $pm_url       , false],
-				'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],
+				'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link  , true ],
-				'unfollow'=> [DI::l10n()->t('Unfollow')      , $unfollow_link    , true],
+				'unfollow' => [DI::l10n()->t('Unfollow')      , $unfollow_link, true ],
 			];
 
 			if (!empty($contact['pending'])) {

src/Module/Contact.php

@@ -35,6 +35,7 @@ use Friendica\DI;
 use Friendica\Model;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\NotFoundException;
 
 /**
@@ -494,8 +495,10 @@ class Contact extends BaseModule
 	 *
 	 * @param array $contact Contact array
 	 * @return array Template fields
+	 * @throws InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function getContactTemplateVars(array $contact)
+	public static function getContactTemplateVars(array $contact): array
 	{
 		$alt_text = '';
 
@@ -553,7 +556,7 @@ class Contact extends BaseModule
 			'id'           => $contact['id'],
 			'url'          => $url,
 			'img_hover'    => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
-			'photo_menu'   => Model\Contact::photoMenu($contact),
+			'photo_menu'   => Model\Contact::photoMenu($contact, DI::userSession()->getLocalUserId()),
 			'thumb'        => Model\Contact::getThumb($contact, true),
 			'alt_text'     => $alt_text,
 			'name'         => $contact['name'],

src/Module/Contact/Contacts.php

@@ -21,41 +21,59 @@
 
 namespace Friendica\Module\Contact;
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Model;
 use Friendica\Model\User;
 use Friendica\Module;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Contacts extends BaseModule
 {
+	/** @var IHandleUserSessions */
+	private $userSession;
+	/** @var App\Page */
+	private $page;
+
+	public function __construct(App\Page $page, IHandleUserSessions $userSession, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->userSession = $userSession;
+		$this->page = $page;
+	}
+
 	protected function content(array $request = []): string
 	{
-		if (!DI::userSession()->getLocalUserId()) {
+		if (!$this->userSession->getLocalUserId()) {
 			throw new HTTPException\ForbiddenException();
 		}
 
 		$cid = $this->parameters['id'];
 		$type = $this->parameters['type'] ?? 'all';
-		$accounttype = $_GET['accounttype'] ?? '';
+		$accounttype = $request['accounttype'] ?? '';
 		$accounttypeid = User::getAccountTypeByString($accounttype);
 
 		if (!$cid) {
-			throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
+			throw new HTTPException\BadRequestException($this->t('Invalid contact.'));
 		}
 
 		$contact = Model\Contact::getById($cid, []);
 		if (empty($contact)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('Contact not found.'));
+			throw new HTTPException\NotFoundException($this->t('Contact not found.'));
 		}
 
-		$localContactId = Model\Contact::getPublicIdByUserId(DI::userSession()->getLocalUserId());
+		$localContactId = Model\Contact::getPublicIdByUserId($this->userSession->getLocalUserId());
 
-		DI::page()['aside'] = Widget\VCard::getHTML($contact);
+		$this->page['aside'] = Widget\VCard::getHTML($contact);
 
 		$condition = [
 			'blocked' => false,
@@ -68,7 +86,7 @@ class Contacts extends BaseModule
 			$condition['contact-type'] = $accounttypeid;
 		}
 
-		$noresult_label = DI::l10n()->t('No known contacts.');
+		$noresult_label = $this->t('No known contacts.');
 
 		switch ($type) {
 			case 'followers':
@@ -82,50 +100,61 @@ class Contacts extends BaseModule
 				break;
 			case 'common':
 				$total = Model\Contact\Relation::countCommon($localContactId, $cid, $condition);
-				$noresult_label = DI::l10n()->t('No common contacts.');
+				$noresult_label = $this->t('No common contacts.');
 				break;
 			default:
 				$total = Model\Contact\Relation::countAll($cid, $condition);
 		}
 
-		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 30);
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 30);
 		$desc = '';
 
 		switch ($type) {
 			case 'followers':
 				$friends = Model\Contact\Relation::listFollowers($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
-				$title = DI::l10n()->tt('Follower (%s)', 'Followers (%s)', $total);
+				$title = $this->tt('Follower (%s)', 'Followers (%s)', $total);
 				break;
 			case 'following':
 				$friends = Model\Contact\Relation::listFollows($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
-				$title = DI::l10n()->tt('Following (%s)', 'Following (%s)', $total);
+				$title = $this->tt('Following (%s)', 'Following (%s)', $total);
 				break;
 			case 'mutuals':
 				$friends = Model\Contact\Relation::listMutuals($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
-				$title = DI::l10n()->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
+				$title = $this->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
-				$desc = DI::l10n()->t(
+				$desc = $this->t(
 					'These contacts both follow and are followed by <strong>%s</strong>.',
 					htmlentities($contact['name'], ENT_COMPAT, 'UTF-8')
 				);
 				break;
 			case 'common':
 				$friends = Model\Contact\Relation::listCommon($localContactId, $cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
-				$title = DI::l10n()->tt('Common contact (%s)', 'Common contacts (%s)', $total);
+				$title = $this->tt('Common contact (%s)', 'Common contacts (%s)', $total);
-				$desc = DI::l10n()->t(
+				$desc = $this->t(
 					'Both <strong>%s</strong> and yourself have publicly interacted with these contacts (follow, comment or likes on public posts).',
 					htmlentities($contact['name'], ENT_COMPAT, 'UTF-8')
 				);
 				break;
 			default:
 				$friends = Model\Contact\Relation::listAll($cid, $condition, $pager->getItemsPerPage(), $pager->getStart());
-				$title = DI::l10n()->tt('Contact (%s)', 'Contacts (%s)', $total);
+				$title = $this->tt('Contact (%s)', 'Contacts (%s)', $total);
 		}
 
 		$o = Module\Contact::getTabsHTML($contact, Module\Contact::TAB_CONTACTS);
 
 		$tabs = self::getContactFilterTabs('contact/' . $cid, $type, true);
 
-		$contacts = array_map([Module\Contact::class, 'getContactTemplateVars'], $friends);
+		// Contact list is obtained from the visited contact, but the contact display is visitor dependent
+		$contacts = array_map(
+			function ($contact) {
+				$contact = Model\Contact::selectFirst(
+					[],
+					['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]],
+					['order' => ['uid' => 'DESC']]
+				);
+				return Module\Contact::getContactTemplateVars($contact);
+			},
+			$friends
+		);
 
 		$tpl = Renderer::getMarkupTemplate('profile/contacts.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
@@ -139,7 +168,7 @@ class Contacts extends BaseModule
 			'$paginate' => $pager->renderFull($total),
 		]);
 
-		DI::page()['aside'] .= Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype);
+		$this->page['aside'] .= Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype);
 
 		return $o;
 	}

src/Module/Contact/Hovercard.php

@@ -21,26 +21,45 @@
 
 namespace Friendica\Module\Contact;
 
+use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
+use Psr\Log\LoggerInterface;
 
 /**
  * Asynchronous HTML fragment provider for frio contact hovercards
  */
 class Hovercard extends BaseModule
 {
+	/** @var IManageConfigValues */
+	private $config;
+	/** @var IHandleUserSessions */
+	private $userSession;
+
+	public function __construct(IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->config      = $config;
+		$this->userSession = $userSession;
+	}
+
 	protected function rawContent(array $request = [])
 	{
-		$contact_url = $_REQUEST['url'] ?? '';
+		$contact_url = $request['url'] ?? '';
 
 		// Get out if the system doesn't have public access allowed
-		if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
+		if ($this->config->get('system', 'block_public') && !$this->userSession->isAuthenticated()) {
 			throw new HTTPException\ForbiddenException();
 		}
 
@@ -59,8 +78,8 @@ class Hovercard extends BaseModule
 
 		// Search for contact data
 		// Look if the local user has got the contact
-		if (DI::userSession()->isAuthenticated()) {
+		if ($this->userSession->isAuthenticated()) {
-			$contact = Contact::getByURLForUser($contact_url, DI::userSession()->getLocalUserId());
+			$contact = Contact::getByURLForUser($contact_url, $this->userSession->getLocalUserId());
 		} else {
 			$contact = Contact::getByURL($contact_url, false);
 		}
@@ -70,8 +89,8 @@ class Hovercard extends BaseModule
 		}
 
 		// Get the photo_menu - the menu if possible contact actions
-		if (DI::userSession()->isAuthenticated()) {
+		if ($this->userSession->isAuthenticated()) {
-			$actions = Contact::photoMenu($contact);
+			$actions = Contact::photoMenu($contact, $this->userSession->getLocalUserId());
 		} else {
 			$actions = [];
 		}
@@ -96,7 +115,6 @@ class Hovercard extends BaseModule
 			],
 		]);
 
-		echo $o;
+		System::httpExit($o);
-		System::exit();
 	}
 }

src/Module/Profile/Common.php

@@ -21,51 +21,71 @@
 
 namespace Friendica\Module\Profile;
 
+use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Module;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Module\BaseProfile;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Common extends BaseProfile
 {
-	protected function content(array $request = []): string
+	/** @var IManageConfigValues */
+	private $config;
+	/** @var IHandleUserSessions */
+	private $userSession;
+	/** @var App */
+	private $app;
+
+	public function __construct(App $app, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
-			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->app = $app;
 	}
 
-		$a = DI::app();
+	protected function content(array $request = []): string
+	{
+		if ($this->config->get('system', 'block_public') && !$this->userSession->isAuthenticated()) {
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
+		}
 
 		Nav::setSelected('home');
 
 		$nickname = $this->parameters['nickname'];
 
-		$profile = Profile::load($a, $nickname);
+		$profile = Profile::load($this->app, $nickname);
 		if (empty($profile)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
 		}
 
 		if (!empty($profile['hide-friends'])) {
-			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
+			throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
 		}
 
-		$displayCommonTab = DI::userSession()->isAuthenticated() && $profile['uid'] != DI::userSession()->getLocalUserId();
+		$displayCommonTab = $this->userSession->isAuthenticated() && $profile['uid'] != $this->userSession->getLocalUserId();
 
 		if (!$displayCommonTab) {
-			$a->redirect('profile/' . $nickname . '/contacts');
+			$this->baseUrl->redirect('profile/' . $nickname . '/contacts');
 		};
 
 		$o = self::getTabsHTML('contacts', false, $profile['nickname'], $profile['hide-friends']);
 
 		$tabs = self::getContactFilterTabs('profile/' . $nickname, 'common', $displayCommonTab);
 
-		$sourceId = Contact::getIdForURL(Profile::getMyURL());
+		$sourceId = Contact::getIdForURL($this->userSession->getMyUrl());
 		$targetId = Contact::getPublicIdByUserId($profile['uid']);
 
 		$condition = [
@@ -76,14 +96,25 @@ class Common extends BaseProfile
 
 		$total = Contact\Relation::countCommon($sourceId, $targetId, $condition);
 
-		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 30);
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 30);
 
 		$commonFollows = Contact\Relation::listCommon($sourceId, $targetId, $condition, $pager->getItemsPerPage(), $pager->getStart());
 
-		$contacts = array_map([Module\Contact::class, 'getContactTemplateVars'], $commonFollows);
+		// Contact list is obtained from the visited profile user, but the contact display is visitor dependent
+		$contacts = array_map(
+			function ($contact) {
+				$contact = Contact::selectFirst(
+					[],
+					['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]],
+					['order' => ['uid' => 'DESC']]
+				);
+				return Module\Contact::getContactTemplateVars($contact);
+			},
+			$commonFollows
+		);
 
-		$title = DI::l10n()->tt('Common contact (%s)', 'Common contacts (%s)', $total);
+		$title = $this->tt('Common contact (%s)', 'Common contacts (%s)', $total);
-		$desc = DI::l10n()->t(
+		$desc = $this->t(
 			'Both <strong>%s</strong> and yourself have publicly interacted with these contacts (follow, comment or likes on public posts).',
 			htmlentities($profile['name'], ENT_COMPAT, 'UTF-8')
 		);
@@ -94,7 +125,7 @@ class Common extends BaseProfile
 			'$desc'     => $desc,
 			'$tabs'     => $tabs,
 
-			'$noresult_label'  => DI::l10n()->t('No common contacts.'),
+			'$noresult_label'  => $this->t('No common contacts.'),
 
 			'$contacts' => $contacts,
 			'$paginate' => $pager->renderFull($total),

src/Module/Profile/Contacts.php

@@ -21,45 +21,68 @@
 
 namespace Friendica\Module\Profile;
 
+use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\DI;
+use Friendica\Database\Database;
 use Friendica\Model;
 use Friendica\Module;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 class Contacts extends Module\BaseProfile
 {
-	protected function content(array $request = []): string
+	/** @var IManageConfigValues */
+	private $config;
+	/** @var IHandleUserSessions */
+	private $userSession;
+	/** @var App */
+	private $app;
+	/** @var Database */
+	private $database;
+
+	public function __construct(Database $database, App $app, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
-			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+
+		$this->config      = $config;
+		$this->userSession = $userSession;
+		$this->app         = $app;
+		$this->database    = $database;
 	}
 
-		$a = DI::app();
+	protected function content(array $request = []): string
+	{
+		if ($this->config->get('system', 'block_public') && !$this->userSession->isAuthenticated()) {
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
+		}
 
 		$nickname = $this->parameters['nickname'];
 		$type     = $this->parameters['type'] ?? 'all';
 
-		$profile = Model\Profile::load($a, $nickname);
+		$profile = Model\Profile::load($this->app, $nickname);
 		if (empty($profile)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
 		}
 
-		$is_owner = $profile['uid'] == DI::userSession()->getLocalUserId();
+		$is_owner = $profile['uid'] == $this->userSession->getLocalUserId();
 
 		if ($profile['hide-friends'] && !$is_owner) {
-			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
+			throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
 		}
 
 		Nav::setSelected('home');
 
 		$o = self::getTabsHTML('contacts', $is_owner, $profile['nickname'], $profile['hide-friends']);
 
-		$tabs = self::getContactFilterTabs('profile/' . $nickname, $type, DI::userSession()->isAuthenticated() && $profile['uid'] != DI::userSession()->getLocalUserId());
+		$tabs = self::getContactFilterTabs('profile/' . $nickname, $type, $this->userSession->isAuthenticated() && $profile['uid'] != $this->userSession->getLocalUserId());
 
 		$condition = [
 			'uid'     => $profile['uid'],
@@ -73,40 +96,54 @@ class Contacts extends Module\BaseProfile
 		];
 
 		switch ($type) {
-			case 'followers': $condition['rel'] = [Model\Contact::FOLLOWER, Model\Contact::FRIEND]; break;
+			case 'followers':
-			case 'following': $condition['rel'] = [Model\Contact::SHARING,  Model\Contact::FRIEND]; break;
+				$condition['rel'] = [Model\Contact::FOLLOWER, Model\Contact::FRIEND];
-			case 'mutuals':   $condition['rel'] = Model\Contact::FRIEND; break;
+				break;
+			case 'following':
+				$condition['rel'] = [Model\Contact::SHARING, Model\Contact::FRIEND];
+				break;
+			case 'mutuals':
+				$condition['rel'] = Model\Contact::FRIEND;
+				break;
 		}
 
-		$total = DBA::count('contact', $condition);
+		$total = $this->database->count('contact', $condition);
 
-		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 30);
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 30);
 
 		$params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
+		// Contact list is obtained from the visited profile user, but the contact display is visitor dependent
 		$contacts = array_map(
-			[Module\Contact::class, 'getContactTemplateVars'],
+			function ($contact) {
-			Model\Contact::selectToArray([], $condition, $params)
+				$contact = Model\Contact::selectFirst(
+					[],
+					['uri-id' => $contact['uri-id'], 'uid' => [0, $this->userSession->getLocalUserId()]],
+					['order' => ['uid' => 'DESC']]
+				);
+				return Module\Contact::getContactTemplateVars($contact);
+			},
+			Model\Contact::selectToArray(['uri-id'], $condition, $params)
 		);
 
 		$desc = '';
 		switch ($type) {
 			case 'followers':
-				$title = DI::l10n()->tt('Follower (%s)', 'Followers (%s)', $total);
+				$title = $this->tt('Follower (%s)', 'Followers (%s)', $total);
 				break;
 			case 'following':
-				$title = DI::l10n()->tt('Following (%s)', 'Following (%s)', $total);
+				$title = $this->tt('Following (%s)', 'Following (%s)', $total);
 				break;
 			case 'mutuals':
-				$title = DI::l10n()->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
+				$title = $this->tt('Mutual friend (%s)', 'Mutual friends (%s)', $total);
-				$desc = DI::l10n()->t(
+				$desc  = $this->t(
 					'These contacts both follow and are followed by <strong>%s</strong>.',
 					htmlentities($profile['name'], ENT_COMPAT, 'UTF-8')
 				);
 				break;
 			case 'all':
 			default:
-				$title = DI::l10n()->tt('Contact (%s)', 'Contacts (%s)', $total);
+				$title = $this->tt('Contact (%s)', 'Contacts (%s)', $total);
 				break;
 		}
 
@@ -116,7 +153,7 @@ class Contacts extends Module\BaseProfile
 			'$desc'  => $desc,
 			'$tabs'  => $tabs,
 
-			'$noresult_label'  => DI::l10n()->t('No contacts.'),
+			'$noresult_label' => $this->t('No contacts.'),
 
 			'$contacts' => $contacts,
 			'$paginate' => $pager->renderFull($total),