Merge pull request #12921 from HankG/add-visibility-data-to-mastodon-status

[friendica.git] / src / Module / Api / Twitter / DirectMessagesEndpoint.php

diff --git a/src/Module/Api/Twitter/DirectMessagesEndpoint.php b/src/Module/Api/Twitter/DirectMessagesEndpoint.php
index ba45e0ab490b810fc3e1cb8d267936839a7726d2..fd5b1c552efc7473b940938f0913d7f070ff16ef 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessagesEndpoint.php
+++ b/src/Module/Api/Twitter/DirectMessagesEndpoint.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
  *
@@ -21,29 +21,51 @@
 
 namespace Friendica\Module\Api\Twitter;
 
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Model\Contact;
+use Friendica\Module\Api\ApiResponse;
 use Friendica\Module\BaseApi;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 abstract class DirectMessagesEndpoint extends BaseApi
 {
+       /** @var Database */
+       private $dba;
+
+       /** @var DirectMessage */
+       private $directMessage;
+
+       public function __construct(DirectMessage $directMessage, Database $dba, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       {
+               parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->dba           = $dba;
+               $this->directMessage = $directMessage;
+       }
+
        /**
         * Handles a direct messages endpoint with the given condition
         *
         * @param array $request
         * @param int   $uid
         * @param array $condition
+        *
+        * @return void
         */
        protected function getMessages(array $request, int $uid, array $condition)
        {
                // params
-               $count    = filter_var($request['count'] ?? 20,                FILTER_VALIDATE_INT, ['options' => ['max_range' => 100]]);
-               $page     = filter_var($request['page'] ?? 1,                  FILTER_VALIDATE_INT, ['options' => ['min_range' => 1]]);
-               $since_id = filter_var($request['since_id'] ?? 0,              FILTER_VALIDATE_INT);
-               $max_id   = filter_var($request['max_id'] ?? 0,                FILTER_VALIDATE_INT);
-               $min_id   = filter_var($request['min_id'] ?? 0,                FILTER_VALIDATE_INT);
-               $verbose  = filter_var($request['friendica_verbose'] ?? false, FILTER_VALIDATE_BOOLEAN);
+               $count    = $this->getRequestValue($request, 'count', 20, 1, 100);
+               $page     = $this->getRequestValue($request, 'page', 1, 1);
+               $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
+               $max_id   = $this->getRequestValue($request, 'max_id', 0, 0);
+               $min_id   = $this->getRequestValue($request, 'min_id', 0, 0);
+               $verbose  = $this->getRequestValue($request, 'friendica_verbose', false);
 
                // pagination
                $start = max(0, ($page - 1) * $count);
@@ -64,7 +86,7 @@ abstract class DirectMessagesEndpoint extends BaseApi
                        $params['order'] = ['id'];
                }
 
-               $cid = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['profileurl'] ?? '', $_REQUEST['user_id'] ?? 0, 0);
+               $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0);
                if (!empty($cid)) {
                        $cdata = Contact::getPublicAndUserContactID($cid, $uid);
                        if (!empty($cdata['user'])) {
@@ -74,11 +96,11 @@ abstract class DirectMessagesEndpoint extends BaseApi
 
                $condition = DBA::mergeConditions($condition, ["`uid` = ?", $uid]);
 
-               $mails = DBA::selectToArray('mail', ['id'], $condition, $params);
+               $mails = $this->dba->selectToArray('mail', ['id'], $condition, $params);
                if ($verbose && !DBA::isResult($mails)) {
                        $answer = ['result' => 'error', 'message' => 'no mails available'];
                        $this->response->exit('direct-messages', ['direct_message' => $answer], $this->parameters['extension'] ?? null);
-                       exit;
+                       return;
                }
 
                $ids = array_column($mails, 'id');
@@ -89,7 +111,7 @@ abstract class DirectMessagesEndpoint extends BaseApi
 
                $ret = [];
                foreach ($ids as $id) {
-                       $ret[] = DI::twitterDirectMessage()->createFromMailId($id, $uid, $request['getText'] ?? '');
+                       $ret[] = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', ''));
                }
 
                self::setLinkHeader();