Merge pull request #791 from openimsdk/cherry-pick-97f3e6d

deps: Merge  #782 #784 #788 #789 PRs into pre-release-v3.8.2

Author: mo3et

.github/workflows/merge-from-milestone.yml

@@ -17,9 +17,6 @@ on:
         required: true
         default: 'pre-release-v3.8.2'
 
-  schedule:
-    - cron: '0 2 * * 0'
-
 env:
   MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.2' }}
   TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.2' }}

internal/conversation_msg/api.go

@@ -11,6 +11,8 @@ import (
 	"sync"
 	"time"
 
+	pconstant "github.com/openimsdk/protocol/constant"
+
 	"github.com/openimsdk/tools/errs"
 
 	"github.com/openimsdk/openim-sdk-core/v3/internal/third/file"
@@ -478,11 +480,18 @@ func (c *Conversation) SendMessage(ctx context.Context, s *sdk_struct.MsgStruct,
 			name = fmt.Sprintf("msg_file_%s.unknown", s.ClientMsgID)
 		}
 
-		delFile = append(delFile, s.FileElem.FilePath)
+		var sourcePath string
+		if utils.FileExist(s.FileElem.FilePath) {
+			sourcePath = s.FileElem.FilePath
+			delFile = append(delFile, utils.FileTmpPath(s.FileElem.FilePath, c.DataDir))
+		} else {
+			sourcePath = utils.FileTmpPath(s.FileElem.FilePath, c.DataDir)
+			delFile = append(delFile, sourcePath)
+		}
 
 		res, err := c.file.UploadFile(ctx, &file.UploadFileReq{
 			ContentType: content_type.GetType(s.FileElem.FileType, filepath.Ext(s.FileElem.FilePath), filepath.Ext(s.FileElem.FileName)),
-			Filepath:    s.FileElem.FilePath,
+			Filepath:    sourcePath,
 			Uuid:        s.FileElem.UUID,
 			Name:        c.fileName("file", s.ClientMsgID) + "/" + filepath.Base(name),
 			Cause:       "msg-file",

internal/interaction/msg_sync.go

@@ -16,7 +16,9 @@ package interaction
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"gorm.io/gorm"
 	"runtime/debug"
 	"strings"
 	"sync"
@@ -91,10 +93,10 @@ func (m *MsgSyncer) loadSeq(ctx context.Context) error {
 
 	if len(conversationIDList) == 0 {
 		version, err := m.db.GetAppSDKVersion(ctx)
-		if err != nil {
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			return err
 		}
-		if !version.Installed {
+		if version == nil || !version.Installed {
 			m.reinstalled = true
 		}
 	}
@@ -107,16 +109,19 @@ func (m *MsgSyncer) loadSeq(ctx context.Context) error {
 		Err            error
 	}
 
-	concurrency := 20
-	partSize := len(conversationIDList) / concurrency
+	partSize := 20
+	currency := (len(conversationIDList)-1)/partSize + 1
+	if len(conversationIDList) == 0 {
+		currency = 0
+	}
 	var wg sync.WaitGroup
-	resultMaps := make([]map[string]SyncedSeq, concurrency)
+	resultMaps := make([]map[string]SyncedSeq, currency)
 
-	for i := 0; i < concurrency; i++ {
+	for i := 0; i < currency; i++ {
 		wg.Add(1)
 		start := i * partSize
 		end := start + partSize
-		if i == concurrency-1 {
+		if i == currency-1 {
 			end = len(conversationIDList)
 		}
 

tools/changelog/changelog.go

@@ -53,6 +53,11 @@ func (g *GitHubRepo) classifyReleaseNotes(body string) map[string][]string {
 	lines := strings.Split(body, "\n")
 
 	for _, line := range lines {
+		// Skip lines that contain "deps: Merge"
+		if strings.Contains(strings.ToLower(line), "deps: merge #") {
+			continue
+		}
+
 		// Use a regular expression to extract Full Changelog link and its title (case insensitive).
 		if strings.Contains(strings.ToLower(line), "**full changelog**") {
 			matches := regexp.MustCompile(`(?i)\*\*full changelog\*\*: (https://github\.com/[^\s]+/compare/([^\s]+))`).FindStringSubmatch(line)