Reenable Twitter/Destroy tests

[friendica.git] / src / Module / Api / Twitter / Statuses / Destroy.php

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index 193e6fa7e7e6fe35a9ed48d635c1ddd81dbb1b9e..8c2a8bf3eb6e4d3f841c2123ba4189595602d188 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -26,6 +26,7 @@ use Friendica\Module\BaseApi;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Network\HTTPException\BadRequestException;
 
 /**
  * Destroys a specific status.
@@ -34,25 +35,27 @@ use Friendica\Model\Item;
  */
 class Destroy extends BaseApi
 {
-       public function rawContent()
+       protected function post(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
-               if (empty($this->parameters['id'])) {
-                       $id = intval($_REQUEST['id'] ?? 0);
-               } else {
+               if (empty($this->parameters['id']) && !empty($request['id'])) {
+                       $id = intval($request['id']);
+               } elseif (!empty($this->parameters['id'])) {
                        $id = (int)$this->parameters['id'];
+               } else {
+                       throw new BadRequestException('An id is missing.');
                }
 
-               logger::notice('API: api_statuses_destroy: ' . $id);
+               $this->logger->notice('API: api_statuses_destroy: ' . $id);
 
-               $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
+               $include_entities = strtolower(($request['include_entities'] ?? 'false') == 'true');
 
-               $ret = DI::twitterStatus()->createFromItemId($$id, $uid, $include_entities)->toArray();
+               $ret = DI::twitterStatus()->createFromItemId($id, $uid, $include_entities)->toArray();
 
                Item::deleteForUser(['id' => $id], $uid);
 
-               DI::apiResponse()->exit('status', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
+               $this->response->exit('status', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }