Skip to content

fix: avatars in dashboard widgets #13314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madbob wants to merge 1 commit into
base: main
Choose a base branch
from
+82 −11
Open

fix: avatars in dashboard widgets #13314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 36 additions & 11 deletions lib/Dashboard/MailWidget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

namespace OCA\Mail\Dashboard;

use OCA\Mail\Address;
use OCA\Mail\AppInfo\Application;
use OCA\Mail\Contracts\IAvatarService;
use OCA\Mail\Contracts\IMailSearch;
use OCA\Mail\Db\Message;
use OCA\Mail\Exception\ClientException;
Expand Down Expand Up @@ -40,6 +42,7 @@ public function __construct(
IL10N $l10n,
IURLGenerator $urlGenerator,
IUserManager $userManager,
private IAvatarService $avatarService,
protected AccountService $accountService,
protected IMailSearch $mailSearch,
IInitialState $initialState,
Expand Down Expand Up @@ -128,6 +131,37 @@ protected function getMailboxIdsToExclude(string $userId): array {
return array_values(array_filter($mailboxIdsToExclude));
}

protected function getAvatar(string $userId, ?Address $from): string {
if ($from) {
$email = $from->getEmail();
if ($email) {
$avatar = $this->avatarService->getAvatar($email, $userId);
if ($avatar) {
if ($avatar->isExternal()) {
return $this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkToRoute('mail.avatars.image', [
'email' => $email,
])
);
}

return $avatar->getUrl();
}
}
}

return $this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', [
'guestName' => $from
? ($from->getLabel()
? str_replace('/', '-', $from->getLabel())
: $from->getEmail())
: '',
'size' => 44,
])
);
}

/**
* @inheritDoc
*/
Expand All @@ -137,24 +171,15 @@ public function getItems(string $userId, ?string $since = null, int $limit = 7):
$emails = $this->getEmails($userId, $intSince, $limit);

/** @var list<WidgetItem> */
return array_map(function (Message $email) {
return array_map(function (Message $email) use ($userId) {
$firstFrom = $email->getFrom()->first();
return new WidgetItem(
$firstFrom ? $firstFrom->getLabel() : '',
$email->getSubject(),
$this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkToRoute('mail.page.thread', ['mailboxId' => $email->getMailboxId(), 'id' => $email->getId()])
),
$this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', [
'guestName' => $firstFrom
? ($firstFrom->getLabel()
? str_replace('/', '-', $firstFrom->getLabel())
: $firstFrom->getEmail())
: '',
'size' => 44,
])
),
$this->getAvatar($userId, $firstFrom),
(string)$email->getSentAt()
);
}, $emails);
Expand Down
46 changes: 46 additions & 0 deletions tests/Unit/Dashboard/ImportantMailWidgetTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@

use ChristophWurst\Nextcloud\Testing\TestCase;
use OCA\Mail\Account;
use OCA\Mail\AddressList;
use OCA\Mail\Contracts\IAvatarService;
use OCA\Mail\Dashboard\ImportantMailWidget;
use OCA\Mail\Db\MailAccount;
use OCA\Mail\Db\Message;
use OCA\Mail\Service\AccountService;
use OCA\Mail\Service\Avatar\Avatar;
use OCA\Mail\Service\Search\GlobalSearchQuery;
use OCA\Mail\Service\Search\MailSearch;
use OCA\Mail\Service\Search\SearchQuery as MailSearchQuery;
Expand All @@ -30,6 +33,7 @@ class ImportantMailWidgetTest extends TestCase {
private IL10N&MockObject $l10n;
private IURLGenerator&MockObject $urlGenerator;
private IUserManager&MockObject $userManager;
private IAvatarService&MockObject $avatarService;
private AccountService&MockObject $accountService;
private MailSearch&MockObject $mailSearch;
private IInitialState&MockObject $initialState;
Expand All @@ -41,6 +45,7 @@ protected function setUp(): void {
$this->l10n = $this->createMock(IL10N::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->avatarService = $this->createMock(IAvatarService::class);
$this->accountService = $this->createMock(AccountService::class);
$this->mailSearch = $this->createMock(MailSearch::class);
$this->initialState = $this->createMock(IInitialState::class);
Expand All @@ -49,6 +54,7 @@ protected function setUp(): void {
$this->l10n,
$this->urlGenerator,
$this->userManager,
$this->avatarService,
$this->accountService,
$this->mailSearch,
$this->initialState,
Expand Down Expand Up @@ -86,6 +92,46 @@ public function testGetItems(): void {
$this->assertCount(2, $items);
}

public function testGetItemsWithAvatars(): void {
$user = $this->createStub(IUser::class);
$this->userManager->expects($this->once())
->method('get')
->willReturn($user);

$message1 = new Message();
$message1->setSubject('Important');
$message1->setMailboxId(1);
$message1->setFrom(AddressList::fromRow([
'label' => 'John Doe',
'email' => 'john@doe.com',
]));

$this->mailSearch->expects($this->once())
->method('findMessagesGlobally')
->with($user, $this->callback(function (GlobalSearchQuery $query) {
self::assertCount(1, $query->getFlags());
self::assertNull($query->getStart());
return true;
}))
->willReturn([$message1]);

$mailAccount = new MailAccount();
$account = new Account($mailAccount);
$this->accountService->expects($this->once())
->method('findByUserId')
->willReturn([$account]);

$avatar = new Avatar('https://example.com/avatar.png', 'image/png', false);
$this->avatarService->expects($this->once())
->method('getAvatar')
->with('john@doe.com', 'bob')
->willReturn($avatar);

$items = $this->widget->getItems('bob', null, 7);

$this->assertCount(1, $items);
}

public function testGetItemsWithSince(): void {
$user = $this->createStub(IUser::class);
$this->userManager->expects($this->once())
Expand Down
Loading