Don't display pending requests

diff --git a/src/Module/Api/Twitter/Followers/Ids.php b/src/Module/Api/Twitter/Followers/Ids.php
index 6f89b9ac1f0855ac4b19330f38736054bfc5000f..2a810849befe7890e781907e79149d1ce15e57ea 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Ids.php
+++ b/src/Module/Api/Twitter/Followers/Ids.php
@@ -51,7 +51,7 @@ class Ids extends ContactEndpoint
                if ($cid == Contact::getPublicIdByUserId($uid)) {
                        $params = ['order' => ['pid' => true], 'limit' => $count];
 
-                       $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+                       $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
        
                        $total_count = (int)DBA::count('contact', $condition);
 

diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php
index 68bc77b98726cd19ea79aa24ebe6c4aae55ac288..e969004cb77bb9d88a81a09523f0ef5b57c4a62b 100644 (file)
--- a/src/Module/Api/Twitter/Followers/Lists.php
+++ b/src/Module/Api/Twitter/Followers/Lists.php
@@ -51,7 +51,7 @@ class Lists extends ContactEndpoint
                if ($cid == Contact::getPublicIdByUserId($uid)) {
                        $params = ['order' => ['pid' => true], 'limit' => $count];
 
-                       $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+                       $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
        
                        $total_count = (int)DBA::count('contact', $condition);
 

diff --git a/src/Module/Api/Twitter/Friends/Ids.php b/src/Module/Api/Twitter/Friends/Ids.php
index 1d15695d9d0947410c70acdd06c36ce8ca5c5f83..d12e082cfa38bc9d2ab3fab758484461014be982 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Ids.php
+++ b/src/Module/Api/Twitter/Friends/Ids.php
@@ -51,7 +51,7 @@ class Ids extends ContactEndpoint
                if ($cid == Contact::getPublicIdByUserId($uid)) {
                        $params = ['order' => ['pid' => true], 'limit' => $count];
 
-                       $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]];
+                       $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]];
        
                        $total_count = (int)DBA::count('contact', $condition);
 

diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php
index 6a13dbef995f4da3436098e401d53d36132d9cdf..11c9c4fc39b14d1f09538c4c0901671b1206895c 100644 (file)
--- a/src/Module/Api/Twitter/Friends/Lists.php
+++ b/src/Module/Api/Twitter/Friends/Lists.php
@@ -51,7 +51,7 @@ class Lists extends ContactEndpoint
                if ($cid == Contact::getPublicIdByUserId($uid)) {
                        $params = ['order' => ['pid' => true], 'limit' => $count];
 
-                       $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]];
+                       $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]];
        
                        $total_count = (int)DBA::count('contact', $condition);