perf: reduce number of avatar requests

lib/Db/Message.php

@@ -12,6 +12,7 @@
 use Horde_Mail_Rfc822_Identification;
 use JsonSerializable;
 use OCA\Mail\AddressList;
+use OCA\Mail\Service\Avatar\Avatar;
 use OCP\AppFramework\Db\Entity;
 use ReturnTypeWillChange;
 use function in_array;
@@ -133,6 +134,8 @@
 	/** @var Tag[] */
 	private $tags = [];
 
+	/** @var Avatar|null */
+	private $avatar;
 	public function __construct() {
 		$this->from = new AddressList([]);
 		$this->to = new AddressList([]);
@@ -283,6 +286,20 @@
 			);
 		}
 	}
+	/**
+	 * @param Avatar|null $avatar
+	 * @return void
+	 */
+	public function setAvatar(?Avatar $avatar): void {
+		$this->avatar = $avatar;
+	}
+
+	/**
+	 * @return Avatar
+	 */
+	public function getAvatar(): ?Avatar {
+		return $this->avatar;
+	}
 
 	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
@@ -327,6 +344,7 @@
 			'previewText' => $this->getPreviewText(),
 			'encrypted' => ($this->isEncrypted() === true),
 			'mentionsMe' => $this->getMentionsMe(),
+			'avatar' => $this->avatar ? $this->avatar->jsonSerialize() : null,
 		];
 	}
 }

lib/IMAP/PreviewEnhancer.php

@@ -15,6 +15,7 @@
 use OCA\Mail\Db\Message;
 use OCA\Mail\Db\MessageMapper as DbMapper;
 use OCA\Mail\IMAP\MessageMapper as ImapMapper;
+use OCA\Mail\Service\AvatarService;
 use Psr\Log\LoggerInterface;
 use function array_key_exists;
 use function array_map;
@@ -34,14 +35,24 @@
 	/** @var LoggerInterface */
 	private $logger;
 
+	/** @var AvatarService */
+	private $avatarService;
+
+	/** @var string|null */
+	private $userId;
+
 	public function __construct(IMAPClientFactory $clientFactory,
 		ImapMapper $imapMapper,
 		DbMapper $dbMapper,
-		LoggerInterface $logger) {
+		LoggerInterface $logger,
+		AvatarService $avatarService,
+		string $userId) {
 		$this->clientFactory = $clientFactory;
 		$this->imapMapper = $imapMapper;
 		$this->mapper = $dbMapper;
 		$this->logger = $logger;
+		$this->avatarService = $avatarService;
+		$this->userId = $userId;
 	}
 
 	/**
@@ -50,9 +61,14 @@
 	 * @return Message[]
 	 */
 	public function process(Account $account, Mailbox $mailbox, array $messages): array {
-		$needAnalyze = array_reduce($messages, static function (array $carry, Message $message) {
+		$needAnalyze = array_reduce($messages, function (array $carry, Message $message) {
 			if ($message->getStructureAnalyzed()) {
-				// Nothing to do
+				// Try fetching the avatar if it's not set
+				$from = $message->getFrom()->first() ;
+				if ($message->getAvatar() === null && $from !== null && $from->getEmail() !== null && $this->userId !== null) {
+					$avatar = $this->avatarService->getAvatar($from->getEmail(), $this->userId);
+					$message->setAvatar($avatar);
+				}
 				return $carry;
 			}
 
@@ -83,7 +99,7 @@
 			$client->logout();
 		}
 
-		return $this->mapper->updatePreviewDataBulk(...array_map(static function (Message $message) use ($data) {
+		return $this->mapper->updatePreviewDataBulk(...array_map(function (Message $message) use ($data) {
 			if (!array_key_exists($message->getUid(), $data)) {
 				// Nothing to do
 				return $message;
@@ -97,6 +113,12 @@
 			$message->setEncrypted($structureData->isEncrypted());
 			$message->setMentionsMe($structureData->getMentionsMe());
 
+			$from = $message->getFrom()->first() ;
+			if ($message->getAvatar() === null && $from !== null && $from->getEmail() !== null && $this->userId !== null) {
+				$avatar = $this->avatarService->getAvatar($from->getEmail(), $this->userId);
+				$message->setAvatar($avatar);
+			}
+
 			return $message;
 		}, $messages));
 	}

src/components/Avatar.vue

@@ -17,7 +17,7 @@
 
 <script>
 import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
-import { fetchAvatarUrlMemoized } from '../service/AvatarService.js'
+import { generateUrl } from '@nextcloud/router'
 import logger from '../logger.js'
 
 export default {
@@ -30,6 +30,10 @@ export default {
 			type: String,
 			required: true,
 		},
+		avatar: {
+			type: Object,
+			default: null,
+		},
 		email: {
 			type: String,
 			required: true,
@@ -55,14 +59,14 @@ export default {
 		},
 	},
 	async mounted() {
-		if (this.email !== '') {
-			try {
-				this.avatarUrl = await fetchAvatarUrlMemoized(this.email)
-			} catch {
-				logger.debug('Could not fetch avatar', { email: this.email })
-			}
+		if (this.avatar) {
+			this.avatarUrl = this.avatar.isExternal
+				? generateUrl('/apps/mail/api/avatars/image/{email}', {
+					email: this.email,
+				})
+				: this.avatar.url
 		}
-
+		logger.debug('Could not fetch avatar', { email: this.email })
 		this.loading = false
 	},
 }

src/components/Envelope.vue

@@ -36,7 +36,7 @@
 				:class="{ 'important-one-line': oneLineLayout, 'icon-important': !oneLineLayout }"
 				:data-starred="isImportant ? 'true' : 'false'"
 				@click.prevent="hasWriteAcl ? onToggleImportant() : false"
 				v-html="importantSvg" />
 			<JunkIcon v-if="data.flags.$junk"
 				:size="18"
 				class="app-content-list-item-star junk-icon-style"
@@ -52,7 +52,7 @@
 					<CheckIcon :size="40" class="check-icon" :class="{ 'app-content-list-item-avatar-selected': selected }" />
 				</template>
 				<template v-else>
-					<Avatar :display-name="addresses" :email="avatarEmail" />
+					<Avatar :display-name="addresses" :email="avatarEmail" :avatar="data.avatar" />
 				</template>
 			</div>
 		</template>
@@ -475,7 +475,7 @@
 		this.onWindowResize()
 
 		window.addEventListener('resize', this.onWindowResize)
 	},
 	computed: {
 		...mapGetters([
 			'isSnoozeDisabled',

src/components/OutboxMessageListItem.vue

@@ -10,7 +10,7 @@
 		:details="details"
 		@click="openModal">
 		<template #icon>
-			<Avatar :display-name="avatarDisplayName" :email="avatarEmail" />
+			<Avatar :display-name="avatarDisplayName" :email="avatarEmail" :avatar="message.avatar" />
 		</template>
 		<template #subname>
 			{{ subjectForSubtitle }}

src/components/ThreadEnvelope.vue

@@ -26,6 +26,7 @@
 					:display-name="envelope.from[0].label"
 					:disable-tooltip="true"
 					:size="40"
+					:avatar="envelope.avatar"
 					class="envelope__header__avatar-avatar" />
 				<div v-if="isImportant"
 					class="app-content-list-item-star icon-important"