From ddcca8297941f3013f14315dca16858413f5b632 Mon Sep 17 00:00:00 2001 From: Michel Roux Date: Sat, 3 Feb 2024 10:18:37 +0100 Subject: [PATCH] fix: Cannot use Nextcloud Search with app enabled (close #57) --- CHANGELOG.md | 5 +++ appinfo/info.xml | 2 +- composer.json | 6 ++-- composer.lock | 16 +++++----- lib/Service/SearchProvider.php | 2 +- package-lock.json | 57 ++++++++++++++++++---------------- package.json | 2 +- 7 files changed, 50 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a14e153..08d3009 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.5.4 - 2024-02-03 + +### Fixed +- Nextcloud search engine didn't work on Nextcloud 26 and 27 + ## 1.5.3 - 2024-02-01 ### Changed diff --git a/appinfo/info.xml b/appinfo/info.xml index 8af8d58..d0e7faa 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,7 +11,7 @@ ## Requirements You need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!]]> - 1.5.3 + 1.5.4 agpl Michel Roux RePod diff --git a/composer.json b/composer.json index 581e40a..b804a2e 100644 --- a/composer.json +++ b/composer.json @@ -3,11 +3,11 @@ "description": "🔊 Browse, manage and listen to podcasts", "type": "project", "license": "AGPL-3.0-or-later", - "version": "1.5.3", + "version": "1.5.4", "require-dev": { - "nextcloud/ocp": "^28.0.1", + "nextcloud/ocp": "^28.0.2", "psalm/phar": "^5.21.1", - "nextcloud/coding-standard": "^v1.2.1" + "nextcloud/coding-standard": "^1.2.1" }, "scripts": { "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l", diff --git a/composer.lock b/composer.lock index 4cf9e22..9871919 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "54881c80082621027e4dee007dd01c4f", + "content-hash": "24b25bff61f30cdac13ab8ab1f354e2e", "packages": [], "packages-dev": [ { @@ -94,16 +94,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.48.0", + "version": "v3.49.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "bf0c65f1b2d943306b3574d42ae806578ce9cc3e" + "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/bf0c65f1b2d943306b3574d42ae806578ce9cc3e", - "reference": "bf0c65f1b2d943306b3574d42ae806578ce9cc3e", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", + "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", "shasum": "" }, "require": { @@ -140,9 +140,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.48.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.49.0" }, - "time": "2024-01-19T21:45:09+00:00" + "time": "2024-02-02T00:42:09+00:00" }, { "name": "psalm/phar", @@ -391,5 +391,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/lib/Service/SearchProvider.php b/lib/Service/SearchProvider.php index 9718aad..4e201b9 100644 --- a/lib/Service/SearchProvider.php +++ b/lib/Service/SearchProvider.php @@ -29,7 +29,7 @@ class SearchProvider implements IProvider return $this->l10n->t('Podcast'); } - public function getOrder(string $route, array $routeParameters): ?int { + public function getOrder(string $route, array $routeParameters): int { if (0 === strpos($route, Application::APP_ID.'.')) { // Active app, prefer my results return -1; diff --git a/package-lock.json b/package-lock.json index 1904e36..8113069 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "repod", - "version": "1.5.3", + "version": "1.5.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "repod", - "version": "1.5.3", + "version": "1.5.4", "license": "agpl", "dependencies": { "@nextcloud/axios": "^2.4.0", @@ -3795,9 +3795,9 @@ "peer": true }, "node_modules/@types/react": { - "version": "18.2.51", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz", - "integrity": "sha512-XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg==", + "version": "18.2.52", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.52.tgz", + "integrity": "sha512-E/YjWh3tH+qsLKaUzgpZb5AY0ChVa+ZJzF7ogehVILrFpdQk6nC/WXOv0bfFEABbXbgNxLBGU7IIZByPKb6eBw==", "peer": true, "dependencies": { "@types/prop-types": "*", @@ -6041,9 +6041,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001582", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001582.tgz", - "integrity": "sha512-vsJG3V5vgfduaQGVxL53uSX/HUzxyr2eA8xCo36OLal7sRcSZbibJtLeh0qja4sFOr/QQGt4opB4tOy+eOgAxg==", + "version": "1.0.30001583", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz", + "integrity": "sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==", "funding": [ { "type": "opencollective", @@ -7242,9 +7242,9 @@ "peer": true }, "node_modules/electron-to-chromium": { - "version": "1.4.653", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz", - "integrity": "sha512-wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA==" + "version": "1.4.656", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.656.tgz", + "integrity": "sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q==" }, "node_modules/elliptic": { "version": "6.5.4", @@ -7345,9 +7345,9 @@ } }, "node_modules/envinfo": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz", - "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.1.tgz", + "integrity": "sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg==", "dev": true, "peer": true, "bin": { @@ -9387,11 +9387,14 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.1.tgz", - "integrity": "sha512-6J4rC9ROz0UkOpjn0BRtSSqlewDTDYJNQvy8N8RSrPCduUWId1o9BQPEVII/KKBqRk/ZIQff1YbRkUDCH2N5Sg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "peer": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, "engines": { "node": ">= 0.4" }, @@ -10021,15 +10024,17 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "peer": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10384,13 +10389,13 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "peer": true, "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" diff --git a/package.json b/package.json index f0b04c5..1c93700 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "repod", "description": "🔊 Browse, manage and listen to podcasts", - "version": "1.5.3", + "version": "1.5.4", "bugs": { "url": "https://git.crystalyx.net/Xefir/repod/issues" },