[advancedcontentfilter] Improve error handling

- Add Logger to Slim application to log to Friendica log file
- Show more specific error message when rule syntax check fails
- Align editorconfig with Composer style
- Add minimum PHP version to composer.json

diff --git a/.editorconfig b/.editorconfig
index 8565b274d9d15a4ad463952f46004034540d9f44..ef6e90b215932602a816efc99e1c6b7aaa5793f2 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,3 +27,6 @@ indent_size = 2
 [*.json]
 indent_style = space
 indent_size = 2
+
+[composer.json]
+indent_size = 4

diff --git a/advancedcontentfilter/advancedcontentfilter.js b/advancedcontentfilter/advancedcontentfilter.js
index fcf7b09622c321ea4906310ed645d62b1e9758b2..a8fc1c650468ab883a0e9cad2b64a613a153d672 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.js
+++ b/advancedcontentfilter/advancedcontentfilter.js
@@ -54,7 +54,7 @@ new Vue({
                                        self.rules.push(responseJSON.rule);
                                        self.resetForm();
                                }, function (response) {
-                                       self.errorMessage = response.responseJSON.message;
+                                       self.errorMessage = response.responseJSON.exception[0].message;
                                });
                        }
                },
@@ -74,7 +74,7 @@ new Vue({
                                self.rules[self.editedIndex] = rule;
                                self.resetForm();
                        }, function (response) {
-                               self.errorMessage = response.responseJSON.message;
+                               self.errorMessage = response.responseJSON.exception[0].message;
                        });
                },
 

diff --git a/advancedcontentfilter/composer.json b/advancedcontentfilter/composer.json
index ceb152e79285ad2707bf7f8df7afe839b73a52c5..b9ab1900f42b890cc2be8e677ab1f3013785a214 100644 (file)
--- a/advancedcontentfilter/composer.json
+++ b/advancedcontentfilter/composer.json
@@ -1,24 +1,27 @@
 {
-       "name": "friendica-addons/advancedcontentfilter",
-       "description": "Advanced Content Filter addon for Friendica",
-       "type": "friendica-addon",
-       "authors": [
-               {
-                       "name": "Hypolite Petovan",
-                       "email": "hypolite@mrpetovan.com",
-                       "homepage": "https://friendica.mrpetovan.com/profile/hypolite",
-                       "role": "Developer"
-               }
-       ],
-       "require": {
-               "slim/slim": "^4",
-               "symfony/expression-language": "^3.4"
-       },
-       "license": "3-clause BSD license",
-       "minimum-stability": "stable",
-       "config": {
-               "optimize-autoloader": true,
-               "autoloader-suffix": "AdvancedContentFilterAddon",
-               "preferred-install": "dist"
-       }
+    "name": "friendica-addons/advancedcontentfilter",
+    "description": "Advanced Content Filter addon for Friendica",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Hypolite Petovan",
+            "email": "hypolite@mrpetovan.com",
+            "homepage": "https://friendica.mrpetovan.com/profile/hypolite",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "slim/slim": "^4",
+        "symfony/expression-language": "^3.4"
+    },
+    "license": "3-clause BSD license",
+    "minimum-stability": "stable",
+    "config": {
+        "platform": {
+            "php": "7.4"
+        },
+        "optimize-autoloader": true,
+        "autoloader-suffix": "AdvancedContentFilterAddon",
+        "preferred-install": "dist"
+    }
 }

diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index 84dd6ed8e9f29050197978f27c9d9f92eb0dabe5..2b831473deccd38539d43c29156ae8619d36c892 100644 (file)
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -29,4 +29,4 @@ use Friendica\DI;
  */
 $slim->addRoutingMiddleware();
 
-$errorMiddleware = $slim->addErrorMiddleware(true, true, true);
+$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());