refactor: change log and avoid nil array. (#728)

* fix: remove some code to avoid creating group errors.. Signed-off-by: Gordon <[email protected]> * fix: find message add local Ex. Signed-off-by: Gordon <[email protected]> * fix: notification conversation update. Signed-off-by: Gordon <[email protected]> * fix: unread num is negative and optimization of sync conversation when app login or re conn. Signed-off-by: Gordon <[email protected]> * fix: update logs add ex filed and remove set self userinfo with ex. Signed-off-by: Gordon <[email protected]> * refactor: change log and avoid nil array. Signed-off-by: Gordon <[email protected]> --------- Signed-off-by: Gordon <[email protected]>
openimsdk · Sep 29, 2024 · 05b3084 · 05b3084
1 parent 1aa0bee
commit 05b3084
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center" style="border-bottom: none">
  <b>
-  <a href="https://doc.rentsoft.cn/">openim-sdk-core</a><br>
+  <a href="https://doc.rentsoft.cn/sdks/introduction">openim-sdk-core</a><br>
  </b>
 </h1>
 <h3 align="center" style="border-bottom: none">

diff --git a/internal/conversation_msg/api.go b/internal/conversation_msg/api.go
@@ -392,7 +392,6 @@ func (c *Conversation) SendMessage(ctx context.Context, s *sdk_struct.MsgStruct,
  sourcePath = utils.FileTmpPath(s.PictureElem.SourcePath, c.DataDir)
  delFile = append(delFile, sourcePath)
  }
- // log.Info("", "file", sourcePath, delFile)
  log.ZDebug(ctx, "send picture", "path", sourcePath)
 
  res, err := c.file.UploadFile(ctx, &file.UploadFileReq{
@@ -833,6 +832,7 @@ func (c *Conversation) MarkConversationMessageAsRead(ctx context.Context, conver
  return c.markConversationMessageAsRead(ctx, conversationID)
 }
 
+// deprecated
 func (c *Conversation) MarkMessagesAsReadByMsgID(ctx context.Context, conversationID string, clientMsgIDs []string) error {
  return c.markMessagesAsReadByMsgID(ctx, conversationID, clientMsgIDs)
 }

diff --git a/internal/conversation_msg/notification.go b/internal/conversation_msg/notification.go
@@ -196,7 +196,7 @@ func (c *Conversation) doUpdateConversation(c2v common.Cmd2Value) {
  }
  ctx := c2v.Ctx
  node := c2v.Value.(common.UpdateConNode)
- log.ZInfo(ctx, "doUpdateConversation", "node", node)
+ log.ZInfo(ctx, "doUpdateConversation", "node", node, "cmd", c2v.Cmd, "caller", c2v.Caller)
  switch node.Action {
  case constant.AddConOrUpLatMsg:
  var list []*model_struct.LocalConversation

diff --git a/pkg/common/cmd.go b/pkg/common/cmd.go
@@ -3,11 +3,12 @@ package common
 import (
  "context"
  "fmt"
- "github.com/openimsdk/tools/log"
  "runtime"
  "runtime/debug"
  "strings"
  "time"
+
+ "github.com/openimsdk/tools/log"
 )
 
 var packet string
@@ -34,7 +35,6 @@ func sendCmd(ch chan<- Cmd2Value, value Cmd2Value, timeout time.Duration) error
  if value.Caller == "" {
  value.Caller = GetCaller(3)
  }
- log.ZDebug(value.Ctx, "sendCmd chan success", "caller", value.Caller, "cmd", value.Cmd, "value", value.Value)
  if ch == nil {
  log.ZError(value.Ctx, "sendCmd chan is nil", ErrChanNil, "caller", value.Caller, "cmd", value.Cmd, "value", value.Value)
  return ErrChanNil

diff --git a/pkg/datafetcher/datafetcher.go b/pkg/datafetcher/datafetcher.go
@@ -125,6 +125,9 @@ func (ds *DataFetcher[T]) sortByUserIDs(data []T, userIDs []string) []T {
 
 // FetchMissingAndCombineLocal fetches missing data from the server and combines it with local data without inserting it into the local database
 func (ds *DataFetcher[T]) FetchMissingAndCombineLocal(ctx context.Context, uids []string) ([]T, error) {
+ if len(uids) == 0 {
+ return nil, nil
+ }
  localData, needServer, err := ds.FetchFromLocal(ctx, uids)
  if err != nil {
  return nil, err