refactor: fix error handling in SendMessage function (#704)

openimsdk · Sep 18, 2024 · ba04362 · ba04362
1 parent c8dac40
commit ba04362
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/internal/conversation_msg/api.go b/internal/conversation_msg/api.go
@@ -504,6 +504,7 @@ func (c *Conversation) SendMessage(ctx context.Context, s *sdk_struct.MsgStruct,
 			if err != nil {
 				c.updateMsgStatusAndTriggerConversation(ctx, s.ClientMsgID, "", s.CreateTime, constant.MsgStatusSendFailed, s, lc, isOnlineOnly)
 				putErrs = err
+				return
 			}
 			if res != nil {
 				s.VideoElem.VideoURL = res.URL

diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
@@ -65,6 +65,8 @@ const (
 	CustomMsgNotTriggerConversation = 119
 	CustomMsgOnlineOnly             = 120
 
+	NotificationBegin = 1000
+
 	FriendNotificationBegin = 1200
 
 	FriendApplicationApprovedNotification = 1201 //add_friend_response
@@ -124,6 +126,7 @@ const (
 
 	HasReadReceipt = 2200
 
+	NotificationEnd = 5000
 	////////////////////////////////////////
 
 	//MsgFrom

diff --git a/pkg/db/conversation_model.go b/pkg/db/conversation_model.go
@@ -95,8 +95,7 @@ func (d *DataBase) GetConversationListSplitDB(ctx context.Context, offset, count
 	d.mRWMutex.RLock()
 	defer d.mRWMutex.RUnlock()
 	var conversationList []*model_struct.LocalConversation
-	return conversationList, errs.WrapMsg(d.conn.WithContext(ctx).Where("latest_msg_send_time > ?", 0).Order("case when is_pinned=1 then 0 else 1 end,max(latest_msg_send_time,draft_text_time) DESC").Offset(offset).Limit(count).Find(&conversationList).Error,
-		"GetFriendList failed")
+	return conversationList, errs.Wrap(d.conn.WithContext(ctx).Where("latest_msg_send_time > ?", 0).Order("case when is_pinned=1 then 0 else 1 end,max(latest_msg_send_time,draft_text_time) DESC").Offset(offset).Limit(count).Find(&conversationList).Error)
 }
 
 func (d *DataBase) BatchInsertConversationList(ctx context.Context, conversationList []*model_struct.LocalConversation) error {