diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index 5d568cac5..05d963a17 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -16,12 +16,14 @@ package tools import ( "context" + "math/rand" + "time" + "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "math/rand" - "time" ) //func (c *MsgTool) ConversationsDestructMsgs() { @@ -54,7 +56,8 @@ import ( // continue // } // if len(seqs) > 0 { -// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err != nil { +// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err +// != nil { // log.ZError(ctx, "updateUsersConversationFiled failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID) // continue // } @@ -104,7 +107,8 @@ func (c *MsgTool) ConversationsDestructMsgs() { } temp := make([]*relation.ConversationModel, 0, len(conversations)) for i, conversation := range conversations { - if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || conversation.LatestMsgDestructTime.IsZero() { + if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || + conversation.LatestMsgDestructTime.IsZero() { temp = append(temp, conversations[i]) } } diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 7e06fda4a..f13938eba 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -17,11 +17,15 @@ package tools import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + "math" + "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "math" + + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + + "math/rand" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" @@ -29,7 +33,6 @@ import ( "github.com/OpenIMSDK/tools/mw" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "math/rand" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" diff --git a/pkg/common/db/cache/meta_cache.go b/pkg/common/db/cache/meta_cache.go index 45888ed8f..ccac88d68 100644 --- a/pkg/common/db/cache/meta_cache.go +++ b/pkg/common/db/cache/meta_cache.go @@ -18,9 +18,10 @@ import ( "context" "encoding/json" "errors" - "github.com/OpenIMSDK/tools/mw/specialerror" "time" + "github.com/OpenIMSDK/tools/mw/specialerror" + "github.com/dtm-labs/rockscache" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/cache/s3.go b/pkg/common/db/cache/s3.go index a63496d05..3520ba2ec 100644 --- a/pkg/common/db/cache/s3.go +++ b/pkg/common/db/cache/s3.go @@ -2,12 +2,14 @@ package cache import ( "context" - "github.com/dtm-labs/rockscache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" - relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" "strconv" "time" + + "github.com/dtm-labs/rockscache" + "github.com/redis/go-redis/v9" + + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" + relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) type ObjectCache interface { diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go index ffe9ff508..ddbd5d27f 100644 --- a/pkg/common/db/controller/s3.go +++ b/pkg/common/db/controller/s3.go @@ -16,13 +16,15 @@ package controller import ( "context" + "path/filepath" + "time" + + "github.com/redis/go-redis/v9" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" - "path/filepath" - "time" ) type S3Database interface { diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index 5df14ad4a..f39047bf6 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -16,6 +16,7 @@ package relation import ( "context" + "github.com/OpenIMSDK/tools/errs" "gorm.io/gorm" diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index 2db1b800f..09025e130 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -20,11 +20,12 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "path" "strings" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/google/uuid" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 01101e893..be49e2faa 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "io" "net/http" "net/url" @@ -30,6 +29,8 @@ import ( "time" "unsafe" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/OpenIMSDK/tools/log" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/pkg/common/db/s3/minio/thumbnail.go b/pkg/common/db/s3/minio/thumbnail.go index fa3581572..01b14541b 100644 --- a/pkg/common/db/s3/minio/thumbnail.go +++ b/pkg/common/db/s3/minio/thumbnail.go @@ -5,11 +5,6 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/minio/minio-go/v7" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "image" "image/gif" "image/jpeg" @@ -18,6 +13,13 @@ import ( "path/filepath" "strings" "time" + + "github.com/OpenIMSDK/tools/errs" + "github.com/OpenIMSDK/tools/log" + "github.com/minio/minio-go/v7" + + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) func (m *Minio) getImageThumbnailURL(ctx context.Context, name string, expire time.Duration, opt *s3.Image) (string, error) {