Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix family Locker usage in user details

Yugif33786c711eb
diff --git a/server/pkg/controller/user/user_details.go b/server/pkg/controller/user/user_details.go
index 6a6d89367d..2955efd29b 100644
--- a/server/pkg/controller/user/user_details.go
+++ b/server/pkg/controller/user/user_details.go
@@ -49,7 +49,9 @@ func (c *UserController) GetDetailsV2(ctx *gin.Context, userID int64, fetchMemor
}
familyData = &familyDataResp
for _, familyMember := range familyData.Members {
- subscriptionUserIDs = append(subscriptionUserIDs, familyMember.MemberUserID)
+ if familyMember.Status == ente.ACCEPTED || familyMember.Status == ente.SELF {
+ subscriptionUserIDs = append(subscriptionUserIDs, familyMember.MemberUserID)
+ }
}
} else {
subscriptionUserIDs = []int64{userID}
@@ -155,16 +157,6 @@ func (c *UserController) GetDetailsV2(ctx *gin.Context, userID int64, fetchMemor
result.Usage -= userLockerUsage.Usage
}
}
- if familyData != nil {
- for _, member := range familyData.Members {
- for _, userLockerUsage := range lockerUsage.Users {
- if userLockerUsage.UserID == member.MemberUserID {
- result.Usage -= userLockerUsage.Usage
- }
- }
- }
- result.FamilyData = familyData
- }
if app == ente.Locker {
result.LockerFamilyUsage = &details.LockerFamilyUsage{
FamilyFileCount: lockerUsage.TotalFileCount,