From cfd09663e7a9e263650d991c1ff2773f752e4f72 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 12 Dec 2022 02:33:57 +0000 Subject: [PATCH] Don't display pending requests --- src/Module/Api/Twitter/Followers/Ids.php | 2 +- src/Module/Api/Twitter/Followers/Lists.php | 2 +- src/Module/Api/Twitter/Friends/Ids.php | 2 +- src/Module/Api/Twitter/Friends/Lists.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Module/Api/Twitter/Followers/Ids.php b/src/Module/Api/Twitter/Followers/Ids.php index 6f89b9ac1..2a810849b 100644 --- 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 68bc77b98..e969004cb 100644 --- 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 1d15695d9..d12e082cf 100644 --- 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 6a13dbef9..11c9c4fc3 100644 --- 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);