Diaspora: Photos are now transmitted separately

[friendica.git] / src / Module / BaseApi.php

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 1ed0b9033a57c57cd5795ba4fc58094cd1a434ce..29ca755e05f949522189a5ee91111de259748dcd 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,9 +29,11 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Module\Api\ApiResponse;
+use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Security\BasicAuth;
 use Friendica\Security\OAuth;
@@ -79,7 +81,7 @@ class BaseApi extends BaseModule
         *
         * @throws HTTPException\ForbiddenException
         */
-       public function run(array $request = [], bool $scopecheck = true): ResponseInterface
+       public function run(ModuleHTTPException $httpException, array $request = [], bool $scopecheck = true): ResponseInterface
        {
                if ($scopecheck) {
                        switch ($this->args->getMethod()) {
@@ -88,15 +90,15 @@ class BaseApi extends BaseModule
                                case Router::POST:
                                case Router::PUT:
                                        self::checkAllowedScope(self::SCOPE_WRITE);
-       
+
                                        if (!self::getCurrentUserID()) {
                                                throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
                                        }
                                        break;
-                       }       
+                       }
                }
 
-               return parent::run($request);
+               return parent::run($httpException, $request);
        }
 
        /**
@@ -138,13 +140,13 @@ class BaseApi extends BaseModule
        }
 
        /**
-        * Set the "link" header with "next" and "prev" links
-        * @return void
+        * Get the "link" header with "next" and "prev" links
+        * @return string
         */
-       protected static function setLinkHeader()
+       protected static function getLinkHeader(): string
        {
                if (empty(self::$boundaries)) {
-                       return;
+                       return '';
                }
 
                $request = self::$request;
@@ -163,7 +165,19 @@ class BaseApi extends BaseModule
                $prev = $command . '?' . http_build_query($prev_request);
                $next = $command . '?' . http_build_query($next_request);
 
-               header('Link: <' . $next . '>; rel="next", <' . $prev . '>; rel="prev"');
+               return 'Link: <' . $next . '>; rel="next", <' . $prev . '>; rel="prev"';
+       }
+
+       /**
+        * Set the "link" header with "next" and "prev" links
+        * @return void
+        */
+       protected static function setLinkHeader()
+       {
+               $header = self::getLinkHeader();
+               if (!empty($header)) {
+                       header($header);
+               }
        }
 
        /**
@@ -233,7 +247,7 @@ class BaseApi extends BaseModule
                if ($throttle_day > 0) {
                        $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
+                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", Item::GRAVITY_PARENT, $uid, $datefrom];
                        $posts_day = Post::countThread($condition);
 
                        if ($posts_day > $throttle_day) {
@@ -249,7 +263,7 @@ class BaseApi extends BaseModule
                if ($throttle_week > 0) {
                        $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
+                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", Item::GRAVITY_PARENT, $uid, $datefrom];
                        $posts_week = Post::countThread($condition);
 
                        if ($posts_week > $throttle_week) {
@@ -265,7 +279,7 @@ class BaseApi extends BaseModule
                if ($throttle_month > 0) {
                        $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
+                       $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", Item::GRAVITY_PARENT, $uid, $datefrom];
                        $posts_month = Post::countThread($condition);
 
                        if ($posts_month > $throttle_month) {