Merge pull request #10362 from tobiasd/2021.06-CHANGELOG

[friendica.git] / src / Module / Api / Mastodon / Conversations.php

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index 3b4496a01234cee08696c393a59b0a469eecc321..22774b57ce03661a29db0ea85e2098b4b3c9bd55 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -33,7 +33,7 @@ class Conversations extends BaseApi
 {
        public static function delete(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($parameters['id'])) {
@@ -52,7 +52,7 @@ class Conversations extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([
@@ -85,6 +85,7 @@ class Conversations extends BaseApi
                $conversations = [];
 
                while ($conv = DBA::fetch($convs)) {
+                       self::setBoundaries($conv['id']);
                        $conversations[] = DI::mstdnConversation()->CreateFromConvId($conv['id']);
                }
 
@@ -94,6 +95,7 @@ class Conversations extends BaseApi
                        array_reverse($conversations);
                }
 
+               self::setLinkHeader();
                System::jsonExit($conversations);
        }
 }