use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Event\EntryDeletedEvent;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\CoreBundle\Helper\UrlHasher;
class EntryRestController extends WallabagRestController
{
* {"name"="return_id", "dataType"="string", "required"=false, "format"="1 or 0", "description"="Set 1 if you want to retrieve ID in case entry(ies) exists, 0 by default"},
* {"name"="url", "dataType"="string", "required"=true, "format"="An url", "description"="DEPRECATED, use hashed_url instead"},
* {"name"="urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="DEPRECATED, use hashed_urls instead"},
- * {"name"="hashed_url", "dataType"="string", "required"=true, "format"="An url", "description"="Md5 url to check if it exists"},
- * {"name"="hashed_urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Md5 urls (as an array) to check if it exists"}
+ * {"name"="hashed_url", "dataType"="string", "required"=false, "format"="A hashed url", "description"="Hashed url using SHA1 to check if it exists"},
+ * {"name"="hashed_urls", "dataType"="string", "required"=false, "format"="An array of hashed urls (?hashed_urls[]=xxx...&hashed_urls[]=xxx...)", "description"="An array of hashed urls using SHA1 to check if they exist"}
* }
* )
*
$returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id');
- $urls = $request->query->get('urls', []);
$hashedUrls = $request->query->get('hashed_urls', []);
+ $hashedUrl = $request->query->get('hashed_url', '');
+ if (!empty($hashedUrl)) {
+ $hashedUrls[] = $hashedUrl;
+ }
- // handle multiple urls first
- if (!empty($hashedUrls)) {
- $results = [];
- foreach ($hashedUrls as $hashedUrl) {
- $res = $repo->findByHashedUrlAndUserId($hashedUrl, $this->getUser()->getId());
-
- $results[$hashedUrl] = $this->returnExistInformation($res, $returnId);
- }
+ $urls = $request->query->get('urls', []);
+ $url = $request->query->get('url', '');
+ if (!empty($url)) {
+ $urls[] = $url;
+ }
- return $this->sendResponse($results);
+ $urlHashMap = [];
+ foreach ($urls as $urlToHash) {
+ $urlHash = UrlHasher::hashUrl($urlToHash);
+ $hashedUrls[] = $urlHash;
+ $urlHashMap[$urlHash] = $urlToHash;
}
- // @deprecated, to be remove in 3.0
- if (!empty($urls)) {
- $results = [];
- foreach ($urls as $url) {
- $res = $repo->findByUrlAndUserId($url, $this->getUser()->getId());
+ if (empty($hashedUrls)) {
+ throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
+ }
- $results[$url] = $this->returnExistInformation($res, $returnId);
- }
+ $results = [];
+ foreach ($hashedUrls as $hashedUrlToSearch) {
+ $res = $repo->findByHashedUrlAndUserId($hashedUrlToSearch, $this->getUser()->getId());
- return $this->sendResponse($results);
+ $results[$hashedUrlToSearch] = $this->returnExistInformation($res, $returnId);
}
- // let's see if it is a simple url?
- $url = $request->query->get('url', '');
- $hashedUrl = $request->query->get('hashed_url', '');
+ $results = $this->replaceUrlHashes($results, $urlHashMap);
- if (empty($url) && empty($hashedUrl)) {
- throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
- }
+ if (!empty($url) || !empty($hashedUrl)) {
+ $hu = array_keys($results)[0];
- $method = 'findByUrlAndUserId';
- if (!empty($hashedUrl)) {
- $method = 'findByHashedUrlAndUserId';
- $url = $hashedUrl;
+ return $this->sendResponse(['exists' => $results[$hu]]);
}
- $res = $repo->$method($url, $this->getUser()->getId());
-
- return $this->sendResponse(['exists' => $this->returnExistInformation($res, $returnId)]);
+ return $this->sendResponse($results);
}
/**
* {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
* {"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."},
* }
* )
*
$perPage = (int) $request->query->get('perPage', 30);
$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'));
try {
/** @var \Pagerfanta\Pagerfanta $pager */
$sort,
$order,
$since,
- $tags
+ $tags,
+ $detail
);
} catch (\Exception $e) {
throw new BadRequestHttpException($e->getMessage());
'perPage' => $perPage,
'tags' => $tags,
'since' => $since,
+ 'detail' => $detail,
],
true
)
'language' => !empty($data['language']) ? $data['language'] : $entry->getLanguage(),
'date' => !empty($data['publishedAt']) ? $data['publishedAt'] : $entry->getPublishedAt(),
// faking the open graph preview picture
- 'open_graph' => [
- 'og_image' => !empty($data['picture']) ? $data['picture'] : $entry->getPreviewPicture(),
- ],
+ 'image' => !empty($data['picture']) ? $data['picture'] : $entry->getPreviewPicture(),
'authors' => \is_string($data['authors']) ? explode(',', $data['authors']) : $entry->getPublishedBy(),
]
);
return $this->sendResponse($results);
}
+ /**
+ * Replace the hashedUrl keys in $results with the unhashed URL from the
+ * request, as recorded in $urlHashMap.
+ */
+ private function replaceUrlHashes(array $results, array $urlHashMap)
+ {
+ $newResults = [];
+ foreach ($results as $hash => $res) {
+ if (isset($urlHashMap[$hash])) {
+ $newResults[$urlHashMap[$hash]] = $res;
+ } else {
+ $newResults[$hash] = $res;
+ }
+ }
+
+ return $newResults;
+ }
+
/**
* Retrieve value from the request.
* Used for POST & PATCH on a an entry.
/**
* Return information about the entry if it exist and depending on the id or not.
*
- * @param Entry|null $entry
- * @param bool $returnId
+ * @param Entry|bool|null $entry
+ * @param bool $returnId
*
* @return bool|int
*/
projects / github / wallabag / wallabag.git / blobdiff