From 563ed58544912288cf1b5ed1238af3ea7faef9cc Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Wed, 10 May 2023 11:09:15 +0800 Subject: [PATCH] fix bug --- pkg/common/db/controller/black.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index 62c95ac6b..ff81ad405 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -3,7 +3,6 @@ package controller import ( "context" "errors" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" @@ -53,22 +52,16 @@ func (b *blackDatabase) CheckIn(ctx context.Context, userID1, userID2 string) (i if errors.Unwrap(err) != gorm.ErrRecordNotFound { return } - inUser1Blacks = false - } else { - inUser1Blacks = true } - - inUser2Blacks = true + inUser1Blacks = err == nil _, err = b.black.Take(ctx, userID2, userID1) if err != nil { if utils.Unwrap(err) != gorm.ErrRecordNotFound { return } - inUser2Blacks = false - } else { - inUser2Blacks = true } - return + inUser2Blacks = err == nil + return inUser1Blacks, inUser2Blacks, nil } func (b *blackDatabase) FindBlackIDs(ctx context.Context, ownerUserID string) (blackIDs []string, err error) {