Merge pull request #32635 from andyxheli/patch-3

Fix User profile picture when performing the search

Author: blizzz

lib/private/Contacts/ContactsMenu/ContactsStore.php

@@ -284,8 +284,11 @@ public function findOne(IUser $user, int $shareType, string $shareWith): ?IEntry
 	private function contactArrayToEntry(array $contact): Entry {
 		$entry = new Entry();
 
-		if (isset($contact['id'])) {
-			$entry->setId($contact['id']);
+		if (isset($contact['UID'])) {
+			$uid = $contact['UID'];
+			$entry->setId($uid);
+			$avatar = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $uid, 'size' => 64]);
+			$entry->setAvatar($avatar);
 		}
 
 		if (isset($contact['FN'])) {

tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php

@@ -140,6 +140,10 @@ public function testGetContactsHidesOwnEntry() {
 	public function testGetContactsWithoutBinaryImage() {
 		/** @var IUser|MockObject $user */
 		$user = $this->createMock(IUser::class);
+		$this->urlGenerator->expects($this->any())
+			->method('linkToRouteAbsolute')
+			->with('core.avatar.getAvatar', $this->anything())
+			->willReturn('https://urlToNcAvatar.test');
 		$this->contactsManager->expects($this->once())
 			->method('search')
 			->with($this->equalTo(''), $this->equalTo(['FN', 'EMAIL']))
@@ -163,7 +167,7 @@ public function testGetContactsWithoutBinaryImage() {
 		$entries = $this->contactsStore->getContacts($user, '');
 
 		$this->assertCount(2, $entries);
-		$this->assertNull($entries[1]->getAvatar());
+		$this->assertSame('https://urlToNcAvatar.test', $entries[1]->getAvatar());
 	}
 
 	public function testGetContactsWithoutAvatarURI() {