Merge pull request #13176 from MrPetovan/bug/warnings

[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 5ff51deb14766234bc8bd4209c325683fe9d7eed..fa8804f54290912f13616272f4542a0563bee56a 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Conversations extends BaseApi
 {
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
@@ -54,7 +54,7 @@ class Conversations extends BaseApi
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
-               $request = self::getRequest([
+               $request = $this->getRequest([
                        'limit'    => 20, // Maximum number of results. Defaults to 20. Max 40.
                        'max_id'   => 0,  // Return results older than this ID. Use HTTP Link header to paginate.
                        'since_id' => 0,  // Return results newer than this ID. Use HTTP Link header to paginate.
@@ -85,13 +85,13 @@ class Conversations extends BaseApi
 
                while ($conv = DBA::fetch($convs)) {
                        self::setBoundaries($conv['id']);
-                       $conversations[] = DI::mstdnConversation()->CreateFromConvId($conv['id']);
+                       $conversations[] = DI::mstdnConversation()->createFromConvId($conv['id']);
                }
 
                DBA::close($convs);
 
                if (!empty($request['min_id'])) {
-                       array_reverse($conversations);
+                       $conversations = array_reverse($conversations);
                }
 
                self::setLinkHeader();