Move API Response methods into an own class to make them mockable

[friendica.git] / src / Module / Api / Mastodon / Lists / Accounts.php

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 21f85f316006838bcdb7391ec2820b12f33df4f6..e1de45b64d837e3598caaf3b18ecda2fc3f2c184 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -21,9 +21,11 @@
 
 namespace Friendica\Module\Api\Mastodon\Lists;
 
+use Friendica\App\Router;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Module\Api\ApiResponse;
 use Friendica\Module\BaseApi;
 
 /**
@@ -35,12 +37,12 @@ class Accounts extends BaseApi
 {
        public static function delete(array $parameters = [])
        {
-               self::unsupported('delete');
+               ApiResponse::unsupported(Router::DELETE);
        }
 
        public static function post(array $parameters = [])
        {
-               self::unsupported('post');
+               ApiResponse::unsupported(Router::POST);
        }
 
        /**
@@ -61,8 +63,6 @@ class Accounts extends BaseApi
                        DI::mstdnError()->RecordNotFound();
                }
 
-               // @todo provide HTTP link header
-
                $request = self::getRequest([
                        'max_id'   => 0,  // Return results older than this id
                        'since_id' => 0,  // Return results newer than this id
@@ -74,7 +74,7 @@ class Accounts extends BaseApi
                if ($request['limit'] != 0) {
                        $params['limit'] = min($request['limit'], 40);
                }
-       
+
                $condition = ['gid' => $id];
 
                if (!empty($request['max_id'])) {
@@ -95,6 +95,7 @@ class Accounts extends BaseApi
 
                $members = DBA::select('group_member', ['contact-id'], $condition, $params);
                while ($member = DBA::fetch($members)) {
+                       self::setBoundaries($member['contact-id']);
                        $accounts[] = DI::mstdnAccount()->createFromContactId($member['contact-id'], $uid);
                }
                DBA::close($members);
@@ -103,6 +104,7 @@ class Accounts extends BaseApi
                        array_reverse($accounts);
                }
 
+               self::setLinkHeader();
                System::jsonExit($accounts);
        }
 }