From 941db04260b32e41a4302b7c7accc2c13c809d4a Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 25 Nov 2020 13:52:27 +0000 Subject: add a uuid version 5 based uuid to imported feeds. if rewrite author for sourced items, also rewrite mid to be fetchable --- include/feedutils.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/feedutils.php') diff --git a/include/feedutils.php b/include/feedutils.php index 0a9af7ee1..5f5f563f8 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -13,6 +13,10 @@ * @param array $params associative array which configures the feed * @return string with an atom feed */ + +use Ramsey\Uuid\Uuid; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + function get_public_feed($channel, $params) { if(! $params) @@ -431,6 +435,13 @@ function get_atom_elements($feed, $item) { $res['plink'] = unxmlify($item->get_link(0)); $res['item_rss'] = 1; + try { + $uuid = Uuid::uuid5(Uuid::NAMESPACE_URL, $res['plink'])->toString(); + } catch (UnsatisfiedDependencyException $e) { + $uuid = md5($res['plink']); + } + + $res['uuid'] = $uuid; $summary = unxmlify($item->get_description(true)); @@ -1516,6 +1527,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { continue; } + } } } -- cgit v1.2.3 From 2a154f8c9a772d61e7dabb5e3fd110ba00cc6007 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Dec 2020 11:02:20 +0000 Subject: merge branch files_ng into dev --- include/feedutils.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'include/feedutils.php') diff --git a/include/feedutils.php b/include/feedutils.php index 5f5f563f8..352b8f038 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -14,9 +14,6 @@ * @return string with an atom feed */ -use Ramsey\Uuid\Uuid; -use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; - function get_public_feed($channel, $params) { if(! $params) @@ -435,13 +432,7 @@ function get_atom_elements($feed, $item) { $res['plink'] = unxmlify($item->get_link(0)); $res['item_rss'] = 1; - try { - $uuid = Uuid::uuid5(Uuid::NAMESPACE_URL, $res['plink'])->toString(); - } catch (UnsatisfiedDependencyException $e) { - $uuid = md5($res['plink']); - } - - $res['uuid'] = $uuid; + $res['uuid'] = uuid_from_url($res['plink']); $summary = unxmlify($item->get_description(true)); -- cgit v1.2.3