Add link headers to Mastodon trending endpoints

diff --git a/src/Module/Api/Mastodon/Trends/Links.php b/src/Module/Api/Mastodon/Trends/Links.php
index e2a160087586b5bc57aadce0ce32b70705a13eb0..bfb35314789c31b0b2af03bc65ddd16675279216 100644 (file)
--- a/src/Module/Api/Mastodon/Trends/Links.php
+++ b/src/Module/Api/Mastodon/Trends/Links.php
@@ -41,7 +41,7 @@ class Links extends BaseApi
        {
                $request = $this->getRequest([
                        'limit' => 10, // Maximum number of results to return. Defaults to 10.
-                       'offset' => 0, // Offset page, Defaults to 0.
+                       'offset' => 0, // Offset in set, Defaults to 0.
                ], $request);
 
                $condition = ["EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-thread-view`.`uri-id` AND `type` = ? AND NOT `name` IS NULL AND NOT `description` IS NULL) AND NOT `private` AND `commented` > ? AND `created` > ?",
@@ -56,6 +56,10 @@ class Links extends BaseApi
                }
                DBA::close($statuses);
 
+               if (!empty($trending)) {
+                       self::setLinkHeaderByOffsetLimit($request['offset'], $request['limit']);
+               }
+
                System::jsonExit($trending);
        }
 }

diff --git a/src/Module/Api/Mastodon/Trends/Statuses.php b/src/Module/Api/Mastodon/Trends/Statuses.php
index 6ae9c83dd53b9ed24d2ce31f0cab4bce5b0e34fb..884319aa48d8f73e8d8c613c2b0d8aafa72dab6c 100644 (file)
--- a/src/Module/Api/Mastodon/Trends/Statuses.php
+++ b/src/Module/Api/Mastodon/Trends/Statuses.php
@@ -44,7 +44,7 @@ class Statuses extends BaseApi
 
                $request = $this->getRequest([
                        'limit' => 10, // Maximum number of results to return. Defaults to 10.
-                       'offset' => 0, // Offset page, Defaults to 0.
+                       'offset' => 0, // Offset in set, Defaults to 0.
                ], $request);
 
                $condition = ["NOT `private` AND `commented` > ? AND `created` > ?", DateTimeFormat::utc('now -1 day'), DateTimeFormat::utc('now -1 week')];
@@ -63,6 +63,10 @@ class Statuses extends BaseApi
                }
                DBA::close($statuses);
 
+               if (!empty($trending)) {
+                       self::setLinkHeaderByOffsetLimit($request['offset'], $request['limit']);
+               }
+
                System::jsonExit($trending);
        }
 }

diff --git a/src/Module/Api/Mastodon/Trends/Tags.php b/src/Module/Api/Mastodon/Trends/Tags.php
index 21e078b2375428b6a0ded24869149f969e70ad71..2190a2e3c93a4b9bafbd7e6a619e4d89656b4424 100644 (file)
--- a/src/Module/Api/Mastodon/Trends/Tags.php
+++ b/src/Module/Api/Mastodon/Trends/Tags.php
@@ -38,7 +38,7 @@ class Tags extends BaseApi
        {
                $request = $this->getRequest([
                        'limit' => 20, // Maximum number of results to return. Defaults to 20.
-                       'offset' => 0, // Offset page. Defaults to 0.
+                       'offset' => 0, // Offset in set. Defaults to 0.
                        'friendica_local' => false, // Whether to return local tag trends instead of global, defaults to false
                ], $request);
 
@@ -56,6 +56,10 @@ class Tags extends BaseApi
                        $trending[] = $hashtag->toArray();
                }
 
-               System::jsonExit(array_slice($trending, 0, $request['limit']));
+               if (!empty($trending)) {
+                       self::setLinkHeaderByOffsetLimit($request['offset'], $request['limit']);
+               }
+
+               System::jsonExit($trending);
        }
 }