Simplified contact id handling

diff --git a/src/Module/Api/Twitter/Followers/Ids.php b/src/Module/Api/Twitter/Followers/Ids.php
index d03b547acd68dccd45ce91f0d9e48e55f6882943..df7120ab62ac1529664a10a39393efb114379937 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Ids.php
+++ b/src/Module/Api/Twitter/Followers/Ids.php
@@ -37,9 +37,7 @@ class Ids extends ContactEndpoint
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id
-               $contact_id    = $this->getRequestValue($request, 'user_id', 0);
-               $screen_name   = $this->getRequestValue($request, 'screen_name', '');
-               $profile_url   = $this->getRequestValue($request, 'profile_url', '');
+               $cid           = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
                $cursor        = $this->getRequestValue($request, 'cursor', -1);
                $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
                $count         = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
@@ -49,8 +47,6 @@ class Ids extends ContactEndpoint
                $max_id   = $this->getRequestValue($request, 'max_id', 0, 0);
                $min_id   = $this->getRequestValue($request, 'min_id', 0, 0);
 
-               $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);
-
                $params = ['order' => ['relation-cid' => true], 'limit' => $count];
 
                $condition = ['cid' => $cid, 'follows' => true];

diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php
index 0aca285a193873131ff4fca87550c211ce29b0ca..0e9a2aa82a04a71da775a183ecbb75c4806fd8fc 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Lists.php
+++ b/src/Module/Api/Twitter/Followers/Lists.php
@@ -37,9 +37,7 @@ class Lists extends ContactEndpoint
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id
-               $contact_id            = $this->getRequestValue($request, 'user_id', 0);
-               $screen_name           = $this->getRequestValue($request, 'screen_name', '');
-               $profile_url           = $this->getRequestValue($request, 'profile_url', '');
+               $cid                   = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
                $cursor                = $this->getRequestValue($request, 'cursor', -1);
                $skip_status           = $this->getRequestValue($request, 'skip_status', false);
                $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);
@@ -50,8 +48,6 @@ class Lists extends ContactEndpoint
                $max_id   = $this->getRequestValue($request, 'max_id', 0, 0);
                $min_id   = $this->getRequestValue($request, 'min_id', 0, 0);
 
-               $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);
-
                $params = ['order' => ['relation-cid' => true], 'limit' => $count];
 
                $condition = ['cid' => $cid, 'follows' => true];

diff --git a/src/Module/Api/Twitter/Friends/Ids.php b/src/Module/Api/Twitter/Friends/Ids.php
index c874432e11ed12b40c2b0a69127424e4aeeac5bd..b5b571a9f06b6691b3346aa0ff444592908ca7a9 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Ids.php
+++ b/src/Module/Api/Twitter/Friends/Ids.php
@@ -37,9 +37,7 @@ class Ids extends ContactEndpoint
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id
-               $contact_id    = $this->getRequestValue($request, 'user_id', 0);
-               $screen_name   = $this->getRequestValue($request, 'screen_name', '');
-               $profile_url   = $this->getRequestValue($request, 'profile_url', '');
+               $cid           = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
                $cursor        = $this->getRequestValue($request, 'cursor', -1);
                $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
                $count         = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
@@ -49,8 +47,6 @@ class Ids extends ContactEndpoint
                $max_id   = $this->getRequestValue($request, 'max_id', 0, 0);
                $min_id   = $this->getRequestValue($request, 'min_id', 0, 0);
 
-               $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);
-
                $params = ['order' => ['cid' => true], 'limit' => $count];
 
                $condition = ['relation-cid' => $cid, 'follows' => true];

diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php
index 65dcec8ec62bc055b345b07999d44199ef78008d..750ba6db6128d93b8f8a1429c39fa2b8b537d45b 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Lists.php
+++ b/src/Module/Api/Twitter/Friends/Lists.php
@@ -37,9 +37,7 @@ class Lists extends ContactEndpoint
                $uid = BaseApi::getCurrentUserID();
 
                // Expected value for user_id parameter: public/user contact id
-               $contact_id            = $this->getRequestValue($request, 'user_id', 0);
-               $screen_name           = $this->getRequestValue($request, 'screen_name', '');
-               $profile_url           = $this->getRequestValue($request, 'profile_url', '');
+               $cid                   = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
                $cursor                = $this->getRequestValue($request, 'cursor', -1);
                $skip_status           = $this->getRequestValue($request, 'skip_status', false);
                $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);
@@ -50,8 +48,6 @@ class Lists extends ContactEndpoint
                $max_id   = $this->getRequestValue($request, 'max_id', 0, 0);
                $min_id   = $this->getRequestValue($request, 'min_id', 0, 0);
 
-               $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);
-
                $params = ['order' => ['cid' => true], 'limit' => $count];
 
                $condition = ['relation-cid' => $cid, 'follows' => true];