1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00

Merge remote-tracking branch 'origin/master' into 2.6.0

This commit is contained in:
Jeremy Benoist 2022-10-18 11:11:02 +02:00
commit c372d68cc1
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
32 changed files with 691 additions and 432 deletions

View file

@ -119,6 +119,7 @@ class EntryRestController extends WallabagRestController
* {"name"="since", "dataType"="integer", "required"=false, "format"="default '0'", "description"="The timestamp since when you want entries updated."},
* {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by entries with a public link"},
* {"name"="detail", "dataType"="string", "required"=false, "format"="metadata or full, metadata by default", "description"="include content field if 'full'. 'full' by default for backward compatibility."},
* {"name"="domain_name", "dataType"="string", "required"=false, "format"="example.com", "description"="filter entries with the given domain name"},
* }
* )
*
@ -138,6 +139,7 @@ class EntryRestController extends WallabagRestController
$tags = \is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', '');
$since = $request->query->get('since', 0);
$detail = strtolower($request->query->get('detail', 'full'));
$domainName = (null === $request->query->get('domain_name')) ? '' : (string) $request->query->get('domain_name');
try {
/** @var Pagerfanta $pager */
@ -150,7 +152,8 @@ class EntryRestController extends WallabagRestController
$order,
$since,
$tags,
$detail
$detail,
$domainName
);
} catch (\Exception $e) {
throw new BadRequestHttpException($e->getMessage());