More parameter handling improved

diff --git a/src/Module/Api/Friendica/Group/Show.php b/src/Module/Api/Friendica/Group/Show.php
index ec0bdd134874e7cb01cf204a363cd814e3bd2f37..1a0e7b6be57e0a7511c9121d0b6f4f9993de2d0f 100644 (file)
--- a/src/Module/Api/Friendica/Group/Show.php
+++ b/src/Module/Api/Friendica/Group/Show.php
@@ -36,7 +36,7 @@ class Show extends BaseApi
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
-               $type = $this->parameters['extension'] ?? '';
+               $type = $this->getRequestValue($this->parameters, 'extension', 'json');         
 
                // params
                $gid = $this->getRequestValue($request, 'gid', 0);

diff --git a/src/Module/Api/Friendica/Photo.php b/src/Module/Api/Friendica/Photo.php
index d0ea25b309cbf5b593d98cf2a99d59610878fd41..ba87081d4525c3b708627fdf73d559fc6b6d715e 100644 (file)
--- a/src/Module/Api/Friendica/Photo.php
+++ b/src/Module/Api/Friendica/Photo.php
@@ -48,7 +48,7 @@ class Photo extends BaseApi
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
-               $type = $this->parameters['extension'] ?? '';
+               $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 
                if (empty($request['photo_id'])) {
                        throw new HTTPException\BadRequestException('No photo id.');

diff --git a/src/Module/Api/Friendica/Photo/Create.php b/src/Module/Api/Friendica/Photo/Create.php
index 0eeb455140ec8cf10f718016deb0fe578f1111dd..c8ea2fbd78406e290fee2d8c5d862b4f06b84176 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Create.php
+++ b/src/Module/Api/Friendica/Photo/Create.php
@@ -52,7 +52,7 @@ class Create extends BaseApi
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid  = BaseApi::getCurrentUserID();
-               $type = $this->parameters['extension'] ?? '';
+               $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 
                // input params 
                $desc      = $this->getRequestValue($request, 'desc');

diff --git a/src/Module/Api/Friendica/Photo/Lists.php b/src/Module/Api/Friendica/Photo/Lists.php
index 6d2eb1716c764c300cc7c2454abb014016a85859..350d98a1d71c974f820e4f78837a5ef59db034be 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Lists.php
+++ b/src/Module/Api/Friendica/Photo/Lists.php
@@ -54,7 +54,7 @@ class Lists extends BaseApi
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid  = BaseApi::getCurrentUserID();
-               $type = $this->parameters['extension'] ?? '';
+               $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 
                $photos = Photo::selectToArray(['resource-id'], ["`uid` = ? AND NOT `photo-type` IN (?, ?)", $uid, Photo::CONTACT_AVATAR, Photo::CONTACT_BANNER],
                        ['order' => ['id'], 'group_by' => ['resource-id']]);

diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php
index ccb9f9150385e3316381d8702c15c12e7eeda167..6723cad5389e5107ab807b98666149eeeb8a0205 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Update.php
+++ b/src/Module/Api/Friendica/Photo/Update.php
@@ -52,7 +52,7 @@ class Update extends BaseApi
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid  = BaseApi::getCurrentUserID();
-               $type = $this->parameters['extension'] ?? '';
+               $type = $this->getRequestValue($this->parameters, 'extension', 'json');
 
                // input params
                $photo_id  = $this->getRequestValue($request, 'photo_id');

diff --git a/src/Module/Api/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
index f21f4c3117ab2762215f82cf4771d76027ae4bc5..08cfe82fb928973b4fc95cb66a43d4ef7adb7850 100644 (file)
--- a/src/Module/Api/GNUSocial/Statusnet/Conversation.php
+++ b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
@@ -40,7 +40,7 @@ class Conversation extends BaseApi
                $uid = BaseApi::getCurrentUserID();
 
                // params
-               $id               = $this->parameters['id'] ?? 0;
+               $id               = $this->getRequestValue($this->parameters, 'id', 0);
                $since_id         = $this->getRequestValue($request, 'since_id', 0, 0);
                $max_id           = $this->getRequestValue($request, 'max_id', 0, 0);
                $count            = $this->getRequestValue($request, 'count', 20, 1, 100);

diff --git a/src/Module/Api/Twitter/DirectMessages/Destroy.php b/src/Module/Api/Twitter/DirectMessages/Destroy.php
index 3100ff345ecaf0dd1eee759e6a812cf7e9857d30..ed0b1ed29e96edfcc8850c8daf507207df617659 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Destroy.php
+++ b/src/Module/Api/Twitter/DirectMessages/Destroy.php
@@ -52,7 +52,12 @@ class Destroy extends BaseApi
                BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();
 
-               $id      = $this->getRequestValue($request, 'id', 0);
+               $id = $this->getRequestValue($request, 'id', 0);
+               $id = $this->getRequestValue($this->parameters, 'id', $id);
+               if (empty($id)) {
+                       throw new BadRequestException('Message id not specified');
+               }
+
                $verbose = $this->getRequestValue($request, 'friendica_verbose', false);
 
                $parenturi = $request['friendica_parenturi'] ?? '';
@@ -64,11 +69,6 @@ class Destroy extends BaseApi
                        return;
                }
 
-               // BadRequestException if no id specified (for clients using Twitter API)
-               if ($id == 0) {
-                       throw new BadRequestException('Message id not specified');
-               }
-
                // add parent-uri to sql command if specified by calling app
                $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . DBA::escape($parenturi) . "'" : "");
 

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index e88922af7d18d5dac523cf9661f5ec736149bad9..828741a195a7193034879a5b00cceba38837041c 100644 (file)
--- a/src/Module/Api/Twitter/Favorites.php
+++ b/src/Module/Api/Twitter/Favorites.php
@@ -45,10 +45,11 @@ class Favorites extends BaseApi
                Logger::info(BaseApi::LOG_PREFIX . 'for {self}', ['module' => 'api', 'action' => 'favorites']);
 
                // params
-               $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);
+               $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);
+               $include_entities = $this->getRequestValue($request, 'include_entities', false);
 
                $start = max(0, ($page - 1) * $count);
 
@@ -64,8 +65,6 @@ class Favorites extends BaseApi
 
                $statuses = Post::selectForUser($uid, [], $condition, $params);
 
-               $include_entities = strtolower(($request['include_entities'] ?? 'false') == 'true');
-
                $ret = [];
                while ($status = DBA::fetch($statuses)) {
                        $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray();

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index 7f4a6c6dc7e4ca9ea98680aeff0a9d725a4c0aa1..be08483532887534edd1d8409075edd126f8e641 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -39,11 +39,9 @@ class Destroy extends BaseApi
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
-               if (!empty($this->parameters['id'])) {
-                       $id = (int)$this->parameters['id'];
-               } elseif (!empty($request['id'])) {
-                       $id = (int)$request['id'];
-               } else {
+               $id = $this->getRequestValue($request, 'id', 0);
+               $id = $this->getRequestValue($this->parameters, 'id', $id);
+               if (empty($id)) {
                        throw new BadRequestException('An id is missing.');
                }
 

diff --git a/src/Module/Api/Twitter/Statuses/Retweet.php b/src/Module/Api/Twitter/Statuses/Retweet.php
index 0c2401cf31781abcef8fc595a3ab2ce32d5dcc4f..1d67443b1c27d0d5b0c06c836b0260071f3ed1ba 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Retweet.php
+++ b/src/Module/Api/Twitter/Statuses/Retweet.php
@@ -44,11 +44,9 @@ class Retweet extends BaseApi
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               if (!empty($this->parameters['id'])) {
-                       $id = (int)$this->parameters['id'];
-               } elseif (!empty($request['id'])) {
-                       $id = (int)$request['id'];
-               } else {
+               $id = $this->getRequestValue($request, 'id', 0);
+               $id = $this->getRequestValue($this->parameters, 'id', $id);
+               if (empty($id)) {
                        throw new BadRequestException('An id is missing.');
                }
 

diff --git a/src/Module/Api/Twitter/Statuses/Show.php b/src/Module/Api/Twitter/Statuses/Show.php
index a85483790576498056fba24ba22a98a944fac169..64533d0bc9c89c52dda91e990f8bbdbe04ca363b 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Show.php
+++ b/src/Module/Api/Twitter/Statuses/Show.php
@@ -41,10 +41,10 @@ class Show extends BaseApi
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
-               if (empty($this->parameters['id'])) {
-                       $id = intval($request['id'] ?? 0);
-               } else {
-                       $id = (int)$this->parameters['id'];
+               $id = $this->getRequestValue($request, 'id', 0);
+               $id = $this->getRequestValue($this->parameters, 'id', $id);
+               if (empty($id)) {
+                       throw new BadRequestException('An id is missing.');
                }
 
                Logger::notice('API: api_statuses_show: ' . $id);