Compare commits

..

No commits in common. "482284a0fb74e9024f6e1f484aa4ce3c96748a50" and "f950dbc5e76e2b8e6dfe8514256998f64fcdfd04" have entirely different histories.

3 changed files with 3 additions and 6 deletions

View File

@ -266,9 +266,7 @@ func (x *JSSdk) checkMessagesAndGetLastMessage(ctx context.Context, userID strin
break
}
}
// when the conversation has been deleted by the user, the length of message.Msgs is empty
if allInValid && len(message.Msgs) > 0 {
if allInValid {
conversationIDs = append(conversationIDs, conversationID)
}
}

View File

@ -23,8 +23,6 @@ import (
"github.com/openimsdk/tools/s3/aws"
"github.com/openimsdk/tools/s3/disable"
"google.golang.org/grpc"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/redis"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
@ -39,6 +37,7 @@ import (
"github.com/openimsdk/tools/s3/kodo"
"github.com/openimsdk/tools/s3/minio"
"github.com/openimsdk/tools/s3/oss"
"google.golang.org/grpc"
)
type thirdServer struct {

View File

@ -358,7 +358,7 @@ type Redis struct {
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
ClusterMode bool `mapstructure:"clusterMode"`
DB int `mapstructure:"db"`
DB int `mapstructure:"storage"`
MaxRetry int `mapstructure:"maxRetry"`
PoolSize int `mapstructure:"poolSize"`
}