Fix link previewd

Signed-off-by: Swikriti Tripathi <swikriti808@gmail.com>
nextcloud · Aug 18, 2023 · 2ee0086 · 2ee0086
1 parent 8492120
commit 2ee0086
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
@@ -200,6 +200,10 @@ private function setIntegrationConfig(array $values): array {
 		}
 		$appPassword = null;
 
+		if ($values['openproject_instance_url']) {
+			$values['openproject_instance_url'] = rtrim($values['openproject_instance_url'], '/');
+		}
+
 		if (key_exists('setup_project_folder', $values) && $values['setup_project_folder'] === true) {
 			$isSystemReady = $this->openprojectAPIService->isSystemReadyForProjectFolderSetUp();
 			if ($isSystemReady) {

diff --git a/lib/Reference/WorkPackageReferenceProvider.php b/lib/Reference/WorkPackageReferenceProvider.php
@@ -84,14 +84,19 @@ public function getIconUrl(): string {
 	 * @return int|null
 	 */
 	private function getWorkPackageIdFromUrl(string $referenceText): ?int {
+		$patterns = array('\/projects\/[^\/\?]+\/work_packages(?:\/details)?\/([0-9]+)/',
+			'\/wp\/([0-9]+)/',
+			'\/(?:work_packages|notifications)\/[^\/\?]+\/([0-9]+)/',);
 		// example links
 		// https://community.openproject.org/projects/nextcloud-integration/work_packages/40070
 		$openProjectUrl = $this->config->getAppValue(Application::APP_ID, 'openproject_instance_url');
-		preg_match('/^' . preg_quote($openProjectUrl, '/') . '\/projects\/[^\/\?]+\/work_packages\/([0-9]+)/', $referenceText, $matches);
-		if (count($matches) > 1) {
-			return (int) $matches[1];
+		foreach ($patterns as $pattern) {
+			$string ='/^' . preg_quote($openProjectUrl, '/') . $pattern;
+			preg_match($string, $referenceText, $patternMatches);
+			if (count($patternMatches) > 1) {
+				return (int) $patternMatches[1];
+			}
 		}
-
 		return null;
 	}