[advancedcontentfilter] Update HTTPException handling

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index c92858135c4865794fa657c4ac3b10445acbcdef..7ecfda4e43034a3f5283ee03af70587bdac62302 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -330,7 +330,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
        try {
                $fields = advancedcontentfilter_build_fields($data);
        } catch (Exception $e) {
-               throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
+               throw new HTTPException\BadRequestException($e->getMessage(), $e);
        }
 
        if (empty($fields['name']) || empty($fields['expression'])) {
@@ -368,7 +368,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
        try {
                $fields = advancedcontentfilter_build_fields($data);
        } catch (Exception $e) {
-               throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
+               throw new HTTPException\BadRequestException($e->getMessage(), $e);
        }
 
        if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {

diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index 53026204cd7fa4e1ca41e29b23b0347869c7615e..dffb93632beb246a068b3abc70e60f35da970f3c 100644 (file)
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -30,7 +30,7 @@ $container['errorHandler'] = function () {
                $responseCode = 500;
 
                if (is_a($exception, 'Friendica\Network\HTTPException')) {
-                       $responseCode = $exception->httpcode;
+                       $responseCode = $exception->getCode();
                }
 
                $errors['message'] = $exception->getMessage();