Migrate friend system to status field, fix pending request logic
This commit is contained in:
1 parent
e4495440f0
commit
3594967391
1 file changed
+2
-2
+2
-2
@@ -951,7 +951,7 @@ function loadFriendsRealtime() {
|
|||||||
.filter(([uid, data]) => data.status === 'active')
|
.filter(([uid, data]) => data.status === 'active')
|
||||||
.map(([uid]) => uid);
|
.map(([uid]) => uid);
|
||||||
const pendingUids = Object.entries(friendsData)
|
const pendingUids = Object.entries(friendsData)
|
||||||
.filter(([uid, data]) => data.status === 'pending')
|
.filter(([uid, data]) => data.status === 'pending' && data.initiator !== 'me')
|
||||||
.map(([uid]) => uid);
|
.map(([uid]) => uid);
|
||||||
await loadFriendProfilesAndSteps(approvedUids);
|
await loadFriendProfilesAndSteps(approvedUids);
|
||||||
for (const uid of pendingUids) {
|
for (const uid of pendingUids) {
|
||||||
@@ -988,7 +988,7 @@ function getMutualFriendUids() {
|
|||||||
|
|
||||||
function getPendingFriendUids() {
|
function getPendingFriendUids() {
|
||||||
return Object.entries(friendsData)
|
return Object.entries(friendsData)
|
||||||
.filter(([uid, data]) => data.status === 'pending')
|
.filter(([uid, data]) => data.status === 'pending' && data.initiator !== 'me')
|
||||||
.map(([uid]) => uid);
|
.map(([uid]) => uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user