From 6c767743d1bfdfe44c0df37df10b50ba68cce200 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Jan 2022 17:30:23 +0000
Subject: [PATCH] Improved request value handling

---
 src/Module/Api/Twitter/Search/Tweets.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Module/Api/Twitter/Search/Tweets.php b/src/Module/Api/Twitter/Search/Tweets.php
index 0aad5a4347..0e0b2802e2 100644
--- a/src/Module/Api/Twitter/Search/Tweets.php
+++ b/src/Module/Api/Twitter/Search/Tweets.php
@@ -49,19 +49,13 @@ class Tweets extends BaseApi
 
 		$data['status'] = [];
 
-		$count = 15;
-
-		$exclude_replies = !empty($request['exclude_replies']);
-		if (!empty($request['rpp'])) {
-			$count = $request['rpp'];
-		} elseif (!empty($request['count'])) {
-			$count = $request['count'];
-		}
-
+		$count            = $this->getRequestValue($request, 'count', 15);
+		$count            = $this->getRequestValue($request, 'rpp', $count);
 		$since_id         = $this->getRequestValue($request, 'since_id', 0, 0);
 		$max_id           = $this->getRequestValue($request, 'max_id', 0, 0);
 		$page             = $this->getRequestValue($request, 'page', 1, 1);
 		$include_entities = $this->getRequestValue($request, 'include_entities', false);
+		$exclude_replies  = $this->getRequestValue($request, 'exclude_replies', false);
 
 		$start = max(0, ($page - 1) * $count);