Use IExternalProvider in search provider

.github/workflows/lint-php.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.2', '8.3', '8.4']
 
     name: php-lint
 

.github/workflows/phpunit-mysql.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         server-versions: ['master']
 
     services:

.github/workflows/phpunit-pgsql.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         server-versions: ['master']
 
     services:

.github/workflows/phpunit-sqlite.yml

@@ -38,8 +38,8 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
-        server-versions: ['master', 'stable30']
+        php-versions: ['8.2']
+        server-versions: ['master', 'stable32']
 
     steps:
       - name: Set app env
@@ -89,6 +89,7 @@ jobs:
           mkdir data
           ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
           ./occ app:enable --force ${{ env.APP_NAME }}
+          ./occ app:disable files_external
 
       - name: Check PHPUnit script is defined
         id: check_phpunit

.github/workflows/psalm.yml

@@ -38,8 +38,8 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: ['^29', '^30', '^31', 'dev-master']
-        php-version: ['8.1', '8.2', '8.3']
+        ocp-version: ['^32', 'dev-master']
+        php-version: ['8.2', '8.3', '8.4']
 
 
     name: Psalm check on PHP ${{ matrix.php-version }} and OCP ${{ matrix.ocp-version }}

appinfo/info.xml

@@ -23,7 +23,7 @@
     <bugs>https://github.com/nextcloud/integration_github/issues</bugs>
     <screenshot>https://github.com/nextcloud/integration_github/raw/main/img/screenshot1.jpg</screenshot>
     <dependencies>
-        <nextcloud min-version="29" max-version="32"/>
+        <nextcloud min-version="32" max-version="33"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Github\BackgroundJob\CheckGithubNotificationsJob</job>

lib/Controller/ConfigController.php

@@ -197,17 +197,17 @@ public function oauthRedirect(string $code, string $state): RedirectResponse {
 					$this->config->deleteUserValue($this->userId, Application::APP_ID, 'oauth_origin');
 					if ($oauthOrigin === 'settings') {
 						return new RedirectResponse(
-							$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
-							'?githubToken=success'
+							$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+							. '?githubToken=success'
 						);
 					} elseif ($oauthOrigin === 'dashboard') {
 						return new RedirectResponse(
 							$this->urlGenerator->linkToRoute('dashboard.dashboard.index')
 						);
 					}
 					return new RedirectResponse(
-						$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
-						'?githubToken=success'
+						$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+						. '?githubToken=success'
 					);
 				}
 			}
@@ -217,8 +217,8 @@ public function oauthRedirect(string $code, string $state): RedirectResponse {
 			$result = $this->l->t('Error during OAuth exchanges');
 		}
 		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']) .
-			'?githubToken=error&message=' . urlencode($result)
+			$this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts'])
+			. '?githubToken=error&message=' . urlencode($result)
 		);
 	}
 

lib/Search/GithubSearchIssuesProvider.php

@@ -16,12 +16,13 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Search\IExternalProvider;
 use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
 
-class GithubSearchIssuesProvider implements IProvider {
+class GithubSearchIssuesProvider implements IProvider, IExternalProvider {
 
 	public function __construct(
 		private IAppManager $appManager,
@@ -157,4 +158,8 @@ protected function getThumbnailUrl(array $entry): string {
 		$userName = $entry['project_owner_login'] ?? '';
 		return $this->urlGenerator->linkToRoute('integration_github.githubAPI.getAvatar', ['githubLogin' => $userName]);
 	}
+
+	public function isExternalProvider(): bool {
+		return true;
+	}
 }

lib/Search/GithubSearchReposProvider.php

@@ -16,12 +16,13 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Search\IExternalProvider;
 use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
 use OCP\Search\SearchResultEntry;
 
-class GithubSearchReposProvider implements IProvider {
+class GithubSearchReposProvider implements IProvider, IExternalProvider {
 
 	public function __construct(
 		private IAppManager $appManager,
@@ -142,4 +143,8 @@ protected function getThumbnailUrl(array $entry): string {
 		$userName = $entry['owner']['login'] ?? '';
 		return $this->urlGenerator->linkToRoute('integration_github.githubAPI.getAvatar', ['githubLogin' => $userName]);
 	}
+
+	public function isExternalProvider(): bool {
+		return true;
+	}
 }

lib/Service/GithubAPIService.php

@@ -140,12 +140,16 @@ private function getItemLink(array $notification): string {
 			$url = $notification['subject']['url'] ?? '';
 			$url = str_replace('api.github.com', 'github.com', $url);
 			$url = str_replace('/repos/', '/', $url);
-			return preg_replace('/\/[0-9]+/', '', $url);
+			/** @var string $result */
+			$result = preg_replace('/\/[0-9]+/', '', $url);
+			return $result;
 		} elseif ($subjectType !== 'Discussion') {
 			$url = $notification['subject']['url'] ?? '';
 			$url = str_replace('api.github.com', 'github.com', $url);
 			$url = str_replace('/repos/', '/', $url);
-			return str_replace('/pulls/', '/pull/', $url);
+			/** @var string $result */
+			$result = str_replace('/pulls/', '/pull/', $url);
+			return $result;
 		}
 		// this is a discussion
 		$repoFullName = $notification['repository']['full_name'] ?? '';