Skip to content

Commit 60577c0

Browse files
committed
fixup! feat: Support multiple accounts
1 parent 1baa627 commit 60577c0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/Search/GitlabSearchReposProvider.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
namespace OCA\Gitlab\Search;
2727

2828
use OCA\Gitlab\AppInfo\Application;
29+
use OCA\Gitlab\Db\GitlabAccount;
2930
use OCA\Gitlab\Db\GitlabAccountMapper;
3031
use OCA\Gitlab\Service\ConfigService;
3132
use OCA\Gitlab\Service\GitlabAPIService;
@@ -111,8 +112,8 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
111112
continue;
112113
}
113114

114-
$formattedResults[] = array_map(function (array $entry): SearchResultEntry {
115-
$finalThumbnailUrl = $this->getThumbnailUrl($entry);
115+
$formattedResults[] = array_map(function (array $entry) use ($account): SearchResultEntry {
116+
$finalThumbnailUrl = $this->getThumbnailUrl($account, $entry);
116117
return new SearchResultEntry(
117118
$finalThumbnailUrl,
118119
$this->getMainText($entry),
@@ -159,11 +160,11 @@ protected function getLinkToGitlab(array $entry): string {
159160
* @param array $entry
160161
* @return string
161162
*/
162-
protected function getThumbnailUrl(array $entry): string {
163+
protected function getThumbnailUrl(GitlabAccount $account, array $entry): string {
163164
$projectId = $entry['id'] ?? '';
164165
$avatarUrl = $entry['avatar_url'] ?? '';
165166
return $avatarUrl
166-
? $this->urlGenerator->linkToRoute('integration_gitlab.gitlabAPI.getProjectAvatar', []) . '?projectId=' . urlencode(strval($projectId))
167+
? $this->urlGenerator->linkToRoute('integration_gitlab.gitlabAPI.getProjectAvatar', ['accountId' => $account->getId(), 'projectId' => (string)$projectId])
167168
: '';
168169
}
169170
}

0 commit comments

Comments
 (0)