blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
withchao 2023-05-10 11:09:15 +08:00
parent d0c2def5f6
commit 563ed58544
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/common/db/controller/black.go
View File

@ -3,7 +3,6 @@ package controller
import ( import (
"context" "context"
"errors" "errors"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" "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/common/db/table/relation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "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 { if errors.Unwrap(err) != gorm.ErrRecordNotFound {
return return
} }
inUser1Blacks = false
} else {
inUser1Blacks = true
} }
inUser1Blacks = err == nil
inUser2Blacks = true
_, err = b.black.Take(ctx, userID2, userID1) _, err = b.black.Take(ctx, userID2, userID1)
if err != nil { if err != nil {
if utils.Unwrap(err) != gorm.ErrRecordNotFound { if utils.Unwrap(err) != gorm.ErrRecordNotFound {
return 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) { func (b *blackDatabase) FindBlackIDs(ctx context.Context, ownerUserID string) (blackIDs []string, err error) {