message search (#60)

internal/wechatdb/datasource/darwinv3/datasource.go

@@ -5,6 +5,8 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
+	"regexp"
+	"sort"
 	"strings"
 	"time"
 
@@ -15,6 +17,7 @@ import (
 	"github.com/sjzar/chatlog/internal/errors"
 	"github.com/sjzar/chatlog/internal/model"
 	"github.com/sjzar/chatlog/internal/wechatdb/datasource/dbm"
+	"github.com/sjzar/chatlog/pkg/util"
 )
 
 const (
@@ -188,70 +191,162 @@ func (ds *DataSource) initChatRoomDb() error {
 	return nil
 }
 
-// GetMessages 实现获取消息的方法
-func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
-	// 在 darwinv3 中，每个联系人/群聊的消息存储在单独的表中，表名为 Chat_md5(talker)
-	// 首先需要找到对应的表名
+func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error) {
 	if talker == "" {
 		return nil, errors.ErrTalkerEmpty
 	}
 
-	_talkerMd5Bytes := md5.Sum([]byte(talker))
-	talkerMd5 := hex.EncodeToString(_talkerMd5Bytes[:])
-	dbPath, ok := ds.talkerDBMap[talkerMd5]
-	if !ok {
-		return nil, errors.TalkerNotFound(talker)
+	// 解析talker参数，支持多个talker（以英文逗号分隔）
+	talkers := util.Str2List(talker, ",")
+	if len(talkers) == 0 {
+		return nil, errors.ErrTalkerEmpty
 	}
-	db, err := ds.dbm.OpenDB(dbPath)
-	if err != nil {
-		return nil, err
-	}
-	tableName := fmt.Sprintf("Chat_%s", talkerMd5)
 
-	// 构建查询条件
-	query := fmt.Sprintf(`
-		SELECT msgCreateTime, msgContent, messageType, mesDes
-		FROM %s 
-		WHERE msgCreateTime >= ? AND msgCreateTime <= ? 
-		ORDER BY msgCreateTime ASC
-	`, tableName)
+	// 解析sender参数，支持多个发送者（以英文逗号分隔）
+	senders := util.Str2List(sender, ",")
 
-	if limit > 0 {
-		query += fmt.Sprintf(" LIMIT %d", limit)
-
-		if offset > 0 {
-			query += fmt.Sprintf(" OFFSET %d", offset)
+	// 预编译正则表达式（如果有keyword）
+	var regex *regexp.Regexp
+	if keyword != "" {
+		var err error
+		regex, err = regexp.Compile(keyword)
+		if err != nil {
+			return nil, errors.QueryFailed("invalid regex pattern", err)
 		}
 	}
 
-	// 执行查询
-	rows, err := db.QueryContext(ctx, query, startTime.Unix(), endTime.Unix())
-	if err != nil {
-		return nil, errors.QueryFailed(query, err)
-	}
-	defer rows.Close()
+	// 从每个相关数据库中查询消息，并在读取时进行过滤
+	filteredMessages := []*model.Message{}
 
-	// 处理查询结果
-	messages := []*model.Message{}
-	for rows.Next() {
-		var msg model.MessageDarwinV3
-		err := rows.Scan(
-			&msg.MsgCreateTime,
-			&msg.MsgContent,
-			&msg.MessageType,
-			&msg.MesDes,
-		)
-		if err != nil {
-			log.Err(err).Msgf("扫描消息行失败")
+	// 对每个talker进行查询
+	for _, talkerItem := range talkers {
+		// 检查上下文是否已取消
+		if err := ctx.Err(); err != nil {
+			return nil, err
+		}
+
+		// 在 darwinv3 中，需要先找到对应的数据库
+		_talkerMd5Bytes := md5.Sum([]byte(talkerItem))
+		talkerMd5 := hex.EncodeToString(_talkerMd5Bytes[:])
+		dbPath, ok := ds.talkerDBMap[talkerMd5]
+		if !ok {
+			// 如果找不到对应的数据库，跳过此talker
 			continue
 		}
 
-		// 将消息包装为通用模型
-		message := msg.Wrap(talker)
-		messages = append(messages, message)
+		db, err := ds.dbm.OpenDB(dbPath)
+		if err != nil {
+			log.Error().Msgf("数据库 %s 未打开", dbPath)
+			continue
+		}
+
+		tableName := fmt.Sprintf("Chat_%s", talkerMd5)
+
+		// 构建查询条件
+		query := fmt.Sprintf(`
+			SELECT msgCreateTime, msgContent, messageType, mesDes
+			FROM %s 
+			WHERE msgCreateTime >= ? AND msgCreateTime <= ? 
+			ORDER BY msgCreateTime ASC
+		`, tableName)
+
+		// 执行查询
+		rows, err := db.QueryContext(ctx, query, startTime.Unix(), endTime.Unix())
+		if err != nil {
+			// 如果表不存在，跳过此talker
+			if strings.Contains(err.Error(), "no such table") {
+				continue
+			}
+			log.Err(err).Msgf("从数据库 %s 查询消息失败", dbPath)
+			continue
+		}
+
+		// 处理查询结果，在读取时进行过滤
+		for rows.Next() {
+			var msg model.MessageDarwinV3
+			err := rows.Scan(
+				&msg.MsgCreateTime,
+				&msg.MsgContent,
+				&msg.MessageType,
+				&msg.MesDes,
+			)
+			if err != nil {
+				rows.Close()
+				log.Err(err).Msgf("扫描消息行失败")
+				continue
+			}
+
+			// 将消息包装为通用模型
+			message := msg.Wrap(talkerItem)
+
+			// 应用sender过滤
+			if len(senders) > 0 {
+				senderMatch := false
+				for _, s := range senders {
+					if message.Sender == s {
+						senderMatch = true
+						break
+					}
+				}
+				if !senderMatch {
+					continue // 不匹配sender，跳过此消息
+				}
+			}
+
+			// 应用keyword过滤
+			if regex != nil {
+				plainText := message.PlainTextContent()
+				if !regex.MatchString(plainText) {
+					continue // 不匹配keyword，跳过此消息
+				}
+			}
+
+			// 通过所有过滤条件，保留此消息
+			filteredMessages = append(filteredMessages, message)
+
+			// 检查是否已经满足分页处理数量
+			if limit > 0 && len(filteredMessages) >= offset+limit {
+				// 已经获取了足够的消息，可以提前返回
+				rows.Close()
+
+				// 对所有消息按时间排序
+				sort.Slice(filteredMessages, func(i, j int) bool {
+					return filteredMessages[i].Seq < filteredMessages[j].Seq
+				})
+
+				// 处理分页
+				if offset >= len(filteredMessages) {
+					return []*model.Message{}, nil
+				}
+				end := offset + limit
+				if end > len(filteredMessages) {
+					end = len(filteredMessages)
+				}
+				return filteredMessages[offset:end], nil
+			}
+		}
+		rows.Close()
 	}
 
-	return messages, nil
+	// 对所有消息按时间排序
+	// FIXME 不同 talker 需要使用 Time 排序
+	sort.Slice(filteredMessages, func(i, j int) bool {
+		return filteredMessages[i].Time.Before(filteredMessages[j].Time)
+	})
+
+	// 处理分页
+	if limit > 0 {
+		if offset >= len(filteredMessages) {
+			return []*model.Message{}, nil
+		}
+		end := offset + limit
+		if end > len(filteredMessages) {
+			end = len(filteredMessages)
+		}
+		return filteredMessages[offset:end], nil
+	}
+
+	return filteredMessages, nil
 }
 
 // 从表名中提取 talker

internal/wechatdb/datasource/datasource.go

@@ -16,7 +16,7 @@ import (
 type DataSource interface {
 
 	// 消息
-	GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error)
+	GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error)
 
 	// 联系人
 	GetContacts(ctx context.Context, key string, limit, offset int) ([]*model.Contact, error)

internal/wechatdb/datasource/v4/datasource.go

@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -17,6 +18,7 @@ import (
 	"github.com/sjzar/chatlog/internal/errors"
 	"github.com/sjzar/chatlog/internal/model"
 	"github.com/sjzar/chatlog/internal/wechatdb/datasource/dbm"
+	"github.com/sjzar/chatlog/pkg/util"
 )
 
 const (
@@ -175,11 +177,16 @@ func (ds *DataSource) getDBInfosForTimeRange(startTime, endTime time.Time) []Mes
 	return dbs
 }
 
-func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
+func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error) {
 	if talker == "" {
 		return nil, errors.ErrTalkerEmpty
 	}
-	log.Debug().Msg(talker)
+
+	// 解析talker参数，支持多个talker（以英文逗号分隔）
+	talkers := util.Str2List(talker, ",")
+	if len(talkers) == 0 {
+		return nil, errors.ErrTalkerEmpty
+	}
 
 	// 找到时间范围内的数据库文件
 	dbInfos := ds.getDBInfosForTimeRange(startTime, endTime)
@@ -187,13 +194,21 @@ func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.T
 		return nil, errors.TimeRangeNotFound(startTime, endTime)
 	}
 
-	if len(dbInfos) == 1 {
-		// LIMIT 和 OFFSET 逻辑在单文件情况下可以直接在 SQL 里处理
-		return ds.getMessagesSingleFile(ctx, dbInfos[0], startTime, endTime, talker, limit, offset)
+	// 解析sender参数，支持多个发送者（以英文逗号分隔）
+	senders := util.Str2List(sender, ",")
+
+	// 预编译正则表达式（如果有keyword）
+	var regex *regexp.Regexp
+	if keyword != "" {
+		var err error
+		regex, err = regexp.Compile(keyword)
+		if err != nil {
+			return nil, errors.QueryFailed("invalid regex pattern", err)
+		}
 	}
 
-	// 从每个相关数据库中查询消息
-	totalMessages := []*model.Message{}
+	// 从每个相关数据库中查询消息，并在读取时进行过滤
+	filteredMessages := []*model.Message{}
 
 	for _, dbInfo := range dbInfos {
 		// 检查上下文是否已取消
@@ -207,183 +222,141 @@ func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.T
 			continue
 		}
 
-		messages, err := ds.getMessagesFromDB(ctx, db, startTime, endTime, talker)
-		if err != nil {
-			log.Err(err).Msgf("从数据库 %s 获取消息失败", dbInfo.FilePath)
-			continue
-		}
+		// 对每个talker进行查询
+		for _, talkerItem := range talkers {
+			// 构建表名
+			_talkerMd5Bytes := md5.Sum([]byte(talkerItem))
+			talkerMd5 := hex.EncodeToString(_talkerMd5Bytes[:])
+			tableName := "Msg_" + talkerMd5
 
-		totalMessages = append(totalMessages, messages...)
+			// 检查表是否存在
+			var exists bool
+			err = db.QueryRowContext(ctx,
+				"SELECT 1 FROM sqlite_master WHERE type='table' AND name=?",
+				tableName).Scan(&exists)
 
-		if limit+offset > 0 && len(totalMessages) >= limit+offset {
-			break
+			if err != nil {
+				if err == sql.ErrNoRows {
+					// 表不存在，继续下一个talker
+					continue
+				}
+				return nil, errors.QueryFailed("", err)
+			}
+
+			// 构建查询条件
+			conditions := []string{"create_time >= ? AND create_time <= ?"}
+			args := []interface{}{startTime.Unix(), endTime.Unix()}
+			log.Debug().Msgf("Table name: %s", tableName)
+			log.Debug().Msgf("Start time: %d, End time: %d", startTime.Unix(), endTime.Unix())
+
+			query := fmt.Sprintf(`
+				SELECT m.sort_seq, m.server_id, m.local_type, n.user_name, m.create_time, m.message_content, m.packed_info_data, m.status
+				FROM %s m
+				LEFT JOIN Name2Id n ON m.real_sender_id = n.rowid
+				WHERE %s 
+				ORDER BY m.sort_seq ASC
+			`, tableName, strings.Join(conditions, " AND "))
+
+			// 执行查询
+			rows, err := db.QueryContext(ctx, query, args...)
+			if err != nil {
+				// 如果表不存在，SQLite 会返回错误
+				if strings.Contains(err.Error(), "no such table") {
+					continue
+				}
+				log.Err(err).Msgf("从数据库 %s 查询消息失败", dbInfo.FilePath)
+				continue
+			}
+
+			// 处理查询结果，在读取时进行过滤
+			for rows.Next() {
+				var msg model.MessageV4
+				err := rows.Scan(
+					&msg.SortSeq,
+					&msg.ServerID,
+					&msg.LocalType,
+					&msg.UserName,
+					&msg.CreateTime,
+					&msg.MessageContent,
+					&msg.PackedInfoData,
+					&msg.Status,
+				)
+				if err != nil {
+					rows.Close()
+					return nil, errors.ScanRowFailed(err)
+				}
+
+				// 将消息转换为标准格式
+				message := msg.Wrap(talkerItem)
+
+				// 应用sender过滤
+				if len(senders) > 0 {
+					senderMatch := false
+					for _, s := range senders {
+						if message.Sender == s {
+							senderMatch = true
+							break
+						}
+					}
+					if !senderMatch {
+						continue // 不匹配sender，跳过此消息
+					}
+				}
+
+				// 应用keyword过滤
+				if regex != nil {
+					plainText := message.PlainTextContent()
+					if !regex.MatchString(plainText) {
+						continue // 不匹配keyword，跳过此消息
+					}
+				}
+
+				// 通过所有过滤条件，保留此消息
+				filteredMessages = append(filteredMessages, message)
+
+				// 检查是否已经满足分页处理数量
+				if limit > 0 && len(filteredMessages) >= offset+limit {
+					// 已经获取了足够的消息，可以提前返回
+					rows.Close()
+
+					// 对所有消息按时间排序
+					sort.Slice(filteredMessages, func(i, j int) bool {
+						return filteredMessages[i].Seq < filteredMessages[j].Seq
+					})
+
+					// 处理分页
+					if offset >= len(filteredMessages) {
+						return []*model.Message{}, nil
+					}
+					end := offset + limit
+					if end > len(filteredMessages) {
+						end = len(filteredMessages)
+					}
+					return filteredMessages[offset:end], nil
+				}
+			}
+			rows.Close()
 		}
 	}
 
 	// 对所有消息按时间排序
-	sort.Slice(totalMessages, func(i, j int) bool {
-		return totalMessages[i].Seq < totalMessages[j].Seq
+	sort.Slice(filteredMessages, func(i, j int) bool {
+		return filteredMessages[i].Seq < filteredMessages[j].Seq
 	})
 
 	// 处理分页
 	if limit > 0 {
-		if offset >= len(totalMessages) {
+		if offset >= len(filteredMessages) {
 			return []*model.Message{}, nil
 		}
 		end := offset + limit
-		if end > len(totalMessages) {
-			end = len(totalMessages)
+		if end > len(filteredMessages) {
+			end = len(filteredMessages)
 		}
-		return totalMessages[offset:end], nil
+		return filteredMessages[offset:end], nil
 	}
 
-	return totalMessages, nil
-}
-
-// getMessagesSingleFile 从单个数据库文件获取消息
-func (ds *DataSource) getMessagesSingleFile(ctx context.Context, dbInfo MessageDBInfo, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
-	db, err := ds.dbm.OpenDB(dbInfo.FilePath)
-	if err != nil {
-		return nil, errors.DBConnectFailed(dbInfo.FilePath, nil)
-	}
-
-	// 构建表名
-	_talkerMd5Bytes := md5.Sum([]byte(talker))
-	talkerMd5 := hex.EncodeToString(_talkerMd5Bytes[:])
-	tableName := "Msg_" + talkerMd5
-
-	// 检查表是否存在
-	var exists bool
-	err = db.QueryRowContext(ctx,
-		"SELECT 1 FROM sqlite_master WHERE type='table' AND name=?",
-		tableName).Scan(&exists)
-
-	if err != nil {
-		if err == sql.ErrNoRows {
-			// 表不存在，返回空结果
-			return []*model.Message{}, nil
-		}
-		return nil, errors.QueryFailed("", err)
-	}
-
-	// 构建查询条件
-	conditions := []string{"create_time >= ? AND create_time <= ?"}
-	args := []interface{}{startTime.Unix(), endTime.Unix()}
-
-	query := fmt.Sprintf(`
-		SELECT m.sort_seq, m.server_id, m.local_type, n.user_name, m.create_time, m.message_content, m.packed_info_data, m.status
-		FROM %s m
-		LEFT JOIN Name2Id n ON m.real_sender_id = n.rowid
-		WHERE %s 
-		ORDER BY m.sort_seq ASC
-	`, tableName, strings.Join(conditions, " AND "))
-
-	if limit > 0 {
-		query += fmt.Sprintf(" LIMIT %d", limit)
-		if offset > 0 {
-			query += fmt.Sprintf(" OFFSET %d", offset)
-		}
-	}
-
-	// 执行查询
-	rows, err := db.QueryContext(ctx, query, args...)
-	if err != nil {
-		return nil, errors.QueryFailed(query, err)
-	}
-	defer rows.Close()
-
-	// 处理查询结果
-	messages := []*model.Message{}
-
-	for rows.Next() {
-		var msg model.MessageV4
-		err := rows.Scan(
-			&msg.SortSeq,
-			&msg.ServerID,
-			&msg.LocalType,
-			&msg.UserName,
-			&msg.CreateTime,
-			&msg.MessageContent,
-			&msg.PackedInfoData,
-			&msg.Status,
-		)
-		if err != nil {
-			return nil, errors.ScanRowFailed(err)
-		}
-
-		messages = append(messages, msg.Wrap(talker))
-	}
-
-	return messages, nil
-}
-
-// getMessagesFromDB 从数据库获取消息
-func (ds *DataSource) getMessagesFromDB(ctx context.Context, db *sql.DB, startTime, endTime time.Time, talker string) ([]*model.Message, error) {
-	// 构建表名
-	_talkerMd5Bytes := md5.Sum([]byte(talker))
-	talkerMd5 := hex.EncodeToString(_talkerMd5Bytes[:])
-	tableName := "Msg_" + talkerMd5
-
-	// 检查表是否存在
-	var exists bool
-	err := db.QueryRowContext(ctx,
-		"SELECT 1 FROM sqlite_master WHERE type='table' AND name=?",
-		tableName).Scan(&exists)
-
-	if err != nil {
-		if err == sql.ErrNoRows {
-			// 表不存在，返回空结果
-			return []*model.Message{}, nil
-		}
-		return nil, errors.QueryFailed("", err)
-	}
-
-	// 构建查询条件
-	conditions := []string{"create_time >= ? AND create_time <= ?"}
-	args := []interface{}{startTime.Unix(), endTime.Unix()}
-
-	query := fmt.Sprintf(`
-		SELECT m.sort_seq, m.server_id, m.local_type, n.user_name, m.create_time, m.message_content, m.packed_info_data, m.status
-		FROM %s m
-		LEFT JOIN Name2Id n ON m.real_sender_id = n.rowid
-		WHERE %s 
-		ORDER BY m.sort_seq ASC
-	`, tableName, strings.Join(conditions, " AND "))
-
-	// 执行查询
-	rows, err := db.QueryContext(ctx, query, args...)
-	if err != nil {
-		// 如果表不存在，SQLite 会返回错误
-		if strings.Contains(err.Error(), "no such table") {
-			return []*model.Message{}, nil
-		}
-		return nil, errors.QueryFailed(query, err)
-	}
-	defer rows.Close()
-
-	// 处理查询结果
-	messages := []*model.Message{}
-
-	for rows.Next() {
-		var msg model.MessageV4
-		err := rows.Scan(
-			&msg.SortSeq,
-			&msg.ServerID,
-			&msg.LocalType,
-			&msg.UserName,
-			&msg.CreateTime,
-			&msg.MessageContent,
-			&msg.PackedInfoData,
-			&msg.Status,
-		)
-		if err != nil {
-			return nil, errors.ScanRowFailed(err)
-		}
-
-		messages = append(messages, msg.Wrap(talker))
-	}
-
-	return messages, nil
+	return filteredMessages, nil
 }
 
 // 联系人

internal/wechatdb/datasource/windowsv3/datasource.go

@@ -2,9 +2,9 @@ package windowsv3
 
 import (
 	"context"
-	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -16,6 +16,7 @@ import (
 	"github.com/sjzar/chatlog/internal/errors"
 	"github.com/sjzar/chatlog/internal/model"
 	"github.com/sjzar/chatlog/internal/wechatdb/datasource/dbm"
+	"github.com/sjzar/chatlog/pkg/util"
 )
 
 const (
@@ -221,21 +222,38 @@ func (ds *DataSource) getDBInfosForTimeRange(startTime, endTime time.Time) []Mes
 	return dbs
 }
 
-// GetMessages 实现 DataSource 接口的 GetMessages 方法
-func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
+func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error) {
+	if talker == "" {
+		return nil, errors.ErrTalkerEmpty
+	}
+
+	// 解析talker参数，支持多个talker（以英文逗号分隔）
+	talkers := util.Str2List(talker, ",")
+	if len(talkers) == 0 {
+		return nil, errors.ErrTalkerEmpty
+	}
+
 	// 找到时间范围内的数据库文件
 	dbInfos := ds.getDBInfosForTimeRange(startTime, endTime)
 	if len(dbInfos) == 0 {
 		return nil, errors.TimeRangeNotFound(startTime, endTime)
 	}
 
-	if len(dbInfos) == 1 {
-		// LIMIT 和 OFFSET 逻辑在单文件情况下可以直接在 SQL 里处理
-		return ds.getMessagesSingleFile(ctx, dbInfos[0], startTime, endTime, talker, limit, offset)
+	// 解析sender参数，支持多个发送者（以英文逗号分隔）
+	senders := util.Str2List(sender, ",")
+
+	// 预编译正则表达式（如果有keyword）
+	var regex *regexp.Regexp
+	if keyword != "" {
+		var err error
+		regex, err = regexp.Compile(keyword)
+		if err != nil {
+			return nil, errors.QueryFailed("invalid regex pattern", err)
+		}
 	}
 
 	// 从每个相关数据库中查询消息
-	totalMessages := []*model.Message{}
+	filteredMessages := []*model.Message{}
 
 	for _, dbInfo := range dbInfos {
 		// 检查上下文是否已取消
@@ -249,172 +267,137 @@ func (ds *DataSource) GetMessages(ctx context.Context, startTime, endTime time.T
 			continue
 		}
 
-		messages, err := ds.getMessagesFromDB(ctx, db, dbInfo, startTime, endTime, talker)
-		if err != nil {
-			log.Err(err).Msgf("从数据库 %s 获取消息失败", dbInfo.FilePath)
-			continue
-		}
+		// 对每个talker进行查询
+		for _, talkerItem := range talkers {
+			// 构建查询条件
+			conditions := []string{"Sequence >= ? AND Sequence <= ?"}
+			args := []interface{}{startTime.Unix() * 1000, endTime.Unix() * 1000}
 
-		totalMessages = append(totalMessages, messages...)
+			// 添加talker条件
+			talkerID, ok := dbInfo.TalkerMap[talkerItem]
+			if ok {
+				conditions = append(conditions, "TalkerId = ?")
+				args = append(args, talkerID)
+			} else {
+				conditions = append(conditions, "StrTalker = ?")
+				args = append(args, talkerItem)
+			}
 
-		if limit+offset > 0 && len(totalMessages) >= limit+offset {
-			break
+			query := fmt.Sprintf(`
+				SELECT MsgSvrID, Sequence, CreateTime, StrTalker, IsSender, 
+					Type, SubType, StrContent, CompressContent, BytesExtra
+				FROM MSG 
+				WHERE %s 
+				ORDER BY Sequence ASC
+			`, strings.Join(conditions, " AND "))
+
+			// 执行查询
+			rows, err := db.QueryContext(ctx, query, args...)
+			if err != nil {
+				// 如果表不存在，跳过此talker
+				if strings.Contains(err.Error(), "no such table") {
+					continue
+				}
+				log.Err(err).Msgf("从数据库 %s 查询消息失败", dbInfo.FilePath)
+				continue
+			}
+
+			// 处理查询结果，在读取时进行过滤
+			for rows.Next() {
+				var msg model.MessageV3
+				var compressContent []byte
+				var bytesExtra []byte
+
+				err := rows.Scan(
+					&msg.MsgSvrID,
+					&msg.Sequence,
+					&msg.CreateTime,
+					&msg.StrTalker,
+					&msg.IsSender,
+					&msg.Type,
+					&msg.SubType,
+					&msg.StrContent,
+					&compressContent,
+					&bytesExtra,
+				)
+				if err != nil {
+					rows.Close()
+					return nil, errors.ScanRowFailed(err)
+				}
+				msg.CompressContent = compressContent
+				msg.BytesExtra = bytesExtra
+
+				// 将消息转换为标准格式
+				message := msg.Wrap()
+
+				// 应用sender过滤
+				if len(senders) > 0 {
+					senderMatch := false
+					for _, s := range senders {
+						if message.Sender == s {
+							senderMatch = true
+							break
+						}
+					}
+					if !senderMatch {
+						continue // 不匹配sender，跳过此消息
+					}
+				}
+
+				// 应用keyword过滤
+				if regex != nil {
+					plainText := message.PlainTextContent()
+					if !regex.MatchString(plainText) {
+						continue // 不匹配keyword，跳过此消息
+					}
+				}
+
+				// 通过所有过滤条件，保留此消息
+				filteredMessages = append(filteredMessages, message)
+
+				// 检查是否已经满足分页处理数量
+				if limit > 0 && len(filteredMessages) >= offset+limit {
+					// 已经获取了足够的消息，可以提前返回
+					rows.Close()
+
+					// 对所有消息按时间排序
+					sort.Slice(filteredMessages, func(i, j int) bool {
+						return filteredMessages[i].Seq < filteredMessages[j].Seq
+					})
+
+					// 处理分页
+					if offset >= len(filteredMessages) {
+						return []*model.Message{}, nil
+					}
+					end := offset + limit
+					if end > len(filteredMessages) {
+						end = len(filteredMessages)
+					}
+					return filteredMessages[offset:end], nil
+				}
+			}
+			rows.Close()
 		}
 	}
 
 	// 对所有消息按时间排序
-	sort.Slice(totalMessages, func(i, j int) bool {
-		return totalMessages[i].Seq < totalMessages[j].Seq
+	sort.Slice(filteredMessages, func(i, j int) bool {
+		return filteredMessages[i].Seq < filteredMessages[j].Seq
 	})
 
 	// 处理分页
 	if limit > 0 {
-		if offset >= len(totalMessages) {
+		if offset >= len(filteredMessages) {
 			return []*model.Message{}, nil
 		}
 		end := offset + limit
-		if end > len(totalMessages) {
-			end = len(totalMessages)
+		if end > len(filteredMessages) {
+			end = len(filteredMessages)
 		}
-		return totalMessages[offset:end], nil
+		return filteredMessages[offset:end], nil
 	}
 
-	return totalMessages, nil
-}
-
-// getMessagesSingleFile 从单个数据库文件获取消息
-func (ds *DataSource) getMessagesSingleFile(ctx context.Context, dbInfo MessageDBInfo, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
-	db, err := ds.dbm.OpenDB(dbInfo.FilePath)
-	if err != nil {
-		return nil, errors.DBConnectFailed(dbInfo.FilePath, nil)
-	}
-
-	// 构建查询条件
-	conditions := []string{"Sequence >= ? AND Sequence <= ?"}
-	args := []interface{}{startTime.Unix() * 1000, endTime.Unix() * 1000}
-	if len(talker) > 0 {
-		// TalkerId 有索引，优先使用
-		talkerID, ok := dbInfo.TalkerMap[talker]
-		if ok {
-			conditions = append(conditions, "TalkerId = ?")
-			args = append(args, talkerID)
-		} else {
-			conditions = append(conditions, "StrTalker = ?")
-			args = append(args, talker)
-		}
-	}
-	query := fmt.Sprintf(`
-        SELECT MsgSvrID, Sequence, CreateTime, StrTalker, IsSender, 
-            Type, SubType, StrContent, CompressContent, BytesExtra
-        FROM MSG 
-        WHERE %s 
-        ORDER BY Sequence ASC
-    `, strings.Join(conditions, " AND "))
-
-	if limit > 0 {
-		query += fmt.Sprintf(" LIMIT %d", limit)
-
-		if offset > 0 {
-			query += fmt.Sprintf(" OFFSET %d", offset)
-		}
-	}
-
-	// 执行查询
-	rows, err := db.QueryContext(ctx, query, args...)
-	if err != nil {
-		return nil, errors.QueryFailed(query, err)
-	}
-	defer rows.Close()
-
-	// 处理查询结果
-	totalMessages := []*model.Message{}
-	for rows.Next() {
-		var msg model.MessageV3
-		var compressContent []byte
-		var bytesExtra []byte
-		err := rows.Scan(
-			&msg.MsgSvrID,
-			&msg.Sequence,
-			&msg.CreateTime,
-			&msg.StrTalker,
-			&msg.IsSender,
-			&msg.Type,
-			&msg.SubType,
-			&msg.StrContent,
-			&compressContent,
-			&bytesExtra,
-		)
-		if err != nil {
-			return nil, errors.ScanRowFailed(err)
-		}
-		msg.CompressContent = compressContent
-		msg.BytesExtra = bytesExtra
-		totalMessages = append(totalMessages, msg.Wrap())
-	}
-	return totalMessages, nil
-}
-
-// getMessagesFromDB 从数据库获取消息
-func (ds *DataSource) getMessagesFromDB(ctx context.Context, db *sql.DB, dbInfo MessageDBInfo, startTime, endTime time.Time, talker string) ([]*model.Message, error) {
-	// 构建查询条件
-	conditions := []string{"Sequence >= ? AND Sequence <= ?"}
-	args := []interface{}{startTime.Unix() * 1000, endTime.Unix() * 1000}
-
-	if len(talker) > 0 {
-		talkerID, ok := dbInfo.TalkerMap[talker]
-		if ok {
-			conditions = append(conditions, "TalkerId = ?")
-			args = append(args, talkerID)
-		} else {
-			conditions = append(conditions, "StrTalker = ?")
-			args = append(args, talker)
-		}
-	}
-
-	query := fmt.Sprintf(`
-		SELECT MsgSvrID, Sequence, CreateTime, StrTalker, IsSender, 
-			Type, SubType, StrContent, CompressContent, BytesExtra
-		FROM MSG 
-		WHERE %s 
-		ORDER BY Sequence ASC
-	`, strings.Join(conditions, " AND "))
-
-	// 执行查询
-	rows, err := db.QueryContext(ctx, query, args...)
-	if err != nil {
-		return nil, errors.QueryFailed(query, err)
-	}
-	defer rows.Close()
-
-	// 处理查询结果
-	messages := []*model.Message{}
-	for rows.Next() {
-		var msg model.MessageV3
-		var compressContent []byte
-		var bytesExtra []byte
-
-		err := rows.Scan(
-			&msg.MsgSvrID,
-			&msg.Sequence,
-			&msg.CreateTime,
-			&msg.StrTalker,
-			&msg.IsSender,
-			&msg.Type,
-			&msg.SubType,
-			&msg.StrContent,
-			&compressContent,
-			&bytesExtra,
-		)
-		if err != nil {
-			return nil, errors.ScanRowFailed(err)
-		}
-		msg.CompressContent = compressContent
-		msg.BytesExtra = bytesExtra
-
-		messages = append(messages, msg.Wrap())
-	}
-
-	return messages, nil
+	return filteredMessages, nil
 }
 
 // GetContacts 实现获取联系人信息的方法

internal/wechatdb/repository/chatroom.go

@@ -18,8 +18,8 @@ func (r *Repository) initChatRoomCache(ctx context.Context) error {
 	}
 
 	chatRoomMap := make(map[string]*model.ChatRoom)
-	remarkToChatRoom := make(map[string]*model.ChatRoom)
-	nickNameToChatRoom := make(map[string]*model.ChatRoom)
+	remarkToChatRoom := make(map[string][]*model.ChatRoom)
+	nickNameToChatRoom := make(map[string][]*model.ChatRoom)
 	chatRoomList := make([]string, 0)
 	chatRoomRemark := make([]string, 0)
 	chatRoomNickName := make([]string, 0)
@@ -30,11 +30,21 @@ func (r *Repository) initChatRoomCache(ctx context.Context) error {
 		chatRoomMap[chatRoom.Name] = chatRoom
 		chatRoomList = append(chatRoomList, chatRoom.Name)
 		if chatRoom.Remark != "" {
-			remarkToChatRoom[chatRoom.Remark] = chatRoom
+			remark, ok := remarkToChatRoom[chatRoom.Remark]
+			if !ok {
+				remark = make([]*model.ChatRoom, 0)
+			}
+			remark = append(remark, chatRoom)
+			remarkToChatRoom[chatRoom.Remark] = remark
 			chatRoomRemark = append(chatRoomRemark, chatRoom.Remark)
 		}
 		if chatRoom.NickName != "" {
-			nickNameToChatRoom[chatRoom.NickName] = chatRoom
+			nickName, ok := nickNameToChatRoom[chatRoom.NickName]
+			if !ok {
+				nickName = make([]*model.ChatRoom, 0)
+			}
+			nickName = append(nickName, chatRoom)
+			nickNameToChatRoom[chatRoom.NickName] = nickName
 			chatRoomNickName = append(chatRoomNickName, chatRoom.NickName)
 		}
 	}
@@ -49,11 +59,21 @@ func (r *Repository) initChatRoomCache(ctx context.Context) error {
 			chatRoomMap[contact.UserName] = chatRoom
 			chatRoomList = append(chatRoomList, contact.UserName)
 			if contact.Remark != "" {
-				remarkToChatRoom[contact.Remark] = chatRoom
+				remark, ok := remarkToChatRoom[chatRoom.Remark]
+				if !ok {
+					remark = make([]*model.ChatRoom, 0)
+				}
+				remark = append(remark, chatRoom)
+				remarkToChatRoom[chatRoom.Remark] = remark
 				chatRoomRemark = append(chatRoomRemark, contact.Remark)
 			}
 			if contact.NickName != "" {
-				nickNameToChatRoom[contact.NickName] = chatRoom
+				nickName, ok := nickNameToChatRoom[chatRoom.NickName]
+				if !ok {
+					nickName = make([]*model.ChatRoom, 0)
+				}
+				nickName = append(nickName, chatRoom)
+				nickNameToChatRoom[chatRoom.NickName] = nickName
 				chatRoomNickName = append(chatRoomNickName, contact.NickName)
 			}
 		}
@@ -63,9 +83,12 @@ func (r *Repository) initChatRoomCache(ctx context.Context) error {
 	sort.Strings(chatRoomNickName)
 
 	r.chatRoomCache = chatRoomMap
-	r.chatRoomList = chatRoomList
 	r.remarkToChatRoom = remarkToChatRoom
 	r.nickNameToChatRoom = nickNameToChatRoom
+	r.chatRoomList = chatRoomList
+	r.chatRoomRemark = chatRoomRemark
+	r.chatRoomNickName = chatRoomNickName
+
 	return nil
 }
 
@@ -75,7 +98,7 @@ func (r *Repository) GetChatRooms(ctx context.Context, key string, limit, offset
 	if key != "" {
 		ret = r.findChatRooms(key)
 		if len(ret) == 0 {
-			return nil, errors.ChatRoomNotFound(key)
+			return []*model.ChatRoom{}, nil
 		}
 
 		if limit > 0 {
@@ -129,21 +152,21 @@ func (r *Repository) findChatRoom(key string) *model.ChatRoom {
 		return chatRoom
 	}
 	if chatRoom, ok := r.remarkToChatRoom[key]; ok {
-		return chatRoom
+		return chatRoom[0]
 	}
 	if chatRoom, ok := r.nickNameToChatRoom[key]; ok {
-		return chatRoom
+		return chatRoom[0]
 	}
 
 	// Contain
 	for _, remark := range r.chatRoomRemark {
 		if strings.Contains(remark, key) {
-			return r.remarkToChatRoom[remark]
+			return r.remarkToChatRoom[remark][0]
 		}
 	}
 	for _, nickName := range r.chatRoomNickName {
 		if strings.Contains(nickName, key) {
-			return r.nickNameToChatRoom[nickName]
+			return r.nickNameToChatRoom[nickName][0]
 		}
 	}
 
@@ -157,26 +180,42 @@ func (r *Repository) findChatRooms(key string) []*model.ChatRoom {
 		ret = append(ret, chatRoom)
 		distinct[chatRoom.Name] = true
 	}
-	if chatRoom, ok := r.remarkToChatRoom[key]; ok && !distinct[chatRoom.Name] {
-		ret = append(ret, chatRoom)
-		distinct[chatRoom.Name] = true
+	if chatRooms, ok := r.remarkToChatRoom[key]; ok {
+		for _, chatRoom := range chatRooms {
+			if !distinct[chatRoom.Name] {
+				ret = append(ret, chatRoom)
+				distinct[chatRoom.Name] = true
+			}
+		}
 	}
-	if chatRoom, ok := r.nickNameToChatRoom[key]; ok && !distinct[chatRoom.Name] {
-		ret = append(ret, chatRoom)
-		distinct[chatRoom.Name] = true
+	if chatRooms, ok := r.nickNameToChatRoom[key]; ok {
+		for _, chatRoom := range chatRooms {
+			if !distinct[chatRoom.Name] {
+				ret = append(ret, chatRoom)
+				distinct[chatRoom.Name] = true
+			}
+		}
 	}
 
 	// Contain
 	for _, remark := range r.chatRoomRemark {
-		if strings.Contains(remark, key) && !distinct[r.remarkToChatRoom[remark].Name] {
-			ret = append(ret, r.remarkToChatRoom[remark])
-			distinct[r.remarkToChatRoom[remark].Name] = true
+		if strings.Contains(remark, key) {
+			for _, chatRoom := range r.remarkToChatRoom[remark] {
+				if !distinct[chatRoom.Name] {
+					ret = append(ret, chatRoom)
+					distinct[chatRoom.Name] = true
+				}
+			}
 		}
 	}
 	for _, nickName := range r.chatRoomNickName {
-		if strings.Contains(nickName, key) && !distinct[r.nickNameToChatRoom[nickName].Name] {
-			ret = append(ret, r.nickNameToChatRoom[nickName])
-			distinct[r.nickNameToChatRoom[nickName].Name] = true
+		if strings.Contains(nickName, key) {
+			for _, chatRoom := range r.nickNameToChatRoom[nickName] {
+				if !distinct[chatRoom.Name] {
+					ret = append(ret, chatRoom)
+					distinct[chatRoom.Name] = true
+				}
+			}
 		}
 	}
 

internal/wechatdb/repository/contact.go

@@ -18,9 +18,9 @@ func (r *Repository) initContactCache(ctx context.Context) error {
 	}
 
 	contactMap := make(map[string]*model.Contact)
-	aliasMap := make(map[string]*model.Contact)
-	remarkMap := make(map[string]*model.Contact)
-	nickNameMap := make(map[string]*model.Contact)
+	aliasMap := make(map[string][]*model.Contact)
+	remarkMap := make(map[string][]*model.Contact)
+	nickNameMap := make(map[string][]*model.Contact)
 	chatRoomUserMap := make(map[string]*model.Contact)
 	chatRoomInContactMap := make(map[string]*model.Contact)
 	contactList := make([]string, 0)
@@ -34,15 +34,30 @@ func (r *Repository) initContactCache(ctx context.Context) error {
 
 		// 建立快速查找索引
 		if contact.Alias != "" {
-			aliasMap[contact.Alias] = contact
+			alias, ok := aliasMap[contact.Alias]
+			if !ok {
+				alias = make([]*model.Contact, 0)
+			}
+			alias = append(alias, contact)
+			aliasMap[contact.Alias] = alias
 			aliasList = append(aliasList, contact.Alias)
 		}
 		if contact.Remark != "" {
-			remarkMap[contact.Remark] = contact
+			remark, ok := remarkMap[contact.Remark]
+			if !ok {
+				remark = make([]*model.Contact, 0)
+			}
+			remark = append(remark, contact)
+			remarkMap[contact.Remark] = remark
 			remarkList = append(remarkList, contact.Remark)
 		}
 		if contact.NickName != "" {
-			nickNameMap[contact.NickName] = contact
+			nickName, ok := nickNameMap[contact.NickName]
+			if !ok {
+				nickName = make([]*model.Contact, 0)
+			}
+			nickName = append(nickName, contact)
+			nickNameMap[contact.NickName] = nickName
 			nickNameList = append(nickNameList, contact.NickName)
 		}
 
@@ -88,7 +103,7 @@ func (r *Repository) GetContacts(ctx context.Context, key string, limit, offset
 	if key != "" {
 		ret = r.findContacts(key)
 		if len(ret) == 0 {
-			return nil, errors.ContactNotFound(key)
+			return []*model.Contact{}, nil
 		}
 		if limit > 0 {
 			end := offset + limit
@@ -124,29 +139,29 @@ func (r *Repository) findContact(key string) *model.Contact {
 		return contact
 	}
 	if contact, ok := r.aliasToContact[key]; ok {
-		return contact
+		return contact[0]
 	}
 	if contact, ok := r.remarkToContact[key]; ok {
-		return contact
+		return contact[0]
 	}
 	if contact, ok := r.nickNameToContact[key]; ok {
-		return contact
+		return contact[0]
 	}
 
 	// Contain
 	for _, alias := range r.aliasList {
 		if strings.Contains(alias, key) {
-			return r.aliasToContact[alias]
+			return r.aliasToContact[alias][0]
 		}
 	}
 	for _, remark := range r.remarkList {
 		if strings.Contains(remark, key) {
-			return r.remarkToContact[remark]
+			return r.remarkToContact[remark][0]
 		}
 	}
 	for _, nickName := range r.nickNameList {
 		if strings.Contains(nickName, key) {
-			return r.nickNameToContact[nickName]
+			return r.nickNameToContact[nickName][0]
 		}
 	}
 	return nil
@@ -159,37 +174,62 @@ func (r *Repository) findContacts(key string) []*model.Contact {
 		ret = append(ret, contact)
 		distinct[contact.UserName] = true
 	}
-	if contact, ok := r.aliasToContact[key]; ok && !distinct[contact.UserName] {
-		ret = append(ret, contact)
-		distinct[contact.UserName] = true
+	if contacts, ok := r.aliasToContact[key]; ok {
+		for _, contact := range contacts {
+			if !distinct[contact.UserName] {
+				ret = append(ret, contact)
+				distinct[contact.UserName] = true
+			}
+		}
 	}
-	if contact, ok := r.remarkToContact[key]; ok && !distinct[contact.UserName] {
-		ret = append(ret, contact)
-		distinct[contact.UserName] = true
+	if contacts, ok := r.remarkToContact[key]; ok {
+		for _, contact := range contacts {
+			if !distinct[contact.UserName] {
+				ret = append(ret, contact)
+				distinct[contact.UserName] = true
+			}
+		}
 	}
-	if contact, ok := r.nickNameToContact[key]; ok && !distinct[contact.UserName] {
-		ret = append(ret, contact)
-		distinct[contact.UserName] = true
+	if contacts, ok := r.nickNameToContact[key]; ok {
+		for _, contact := range contacts {
+			if !distinct[contact.UserName] {
+				ret = append(ret, contact)
+				distinct[contact.UserName] = true
+			}
+		}
 	}
 	// Contain
 	for _, alias := range r.aliasList {
-		if strings.Contains(alias, key) && !distinct[r.aliasToContact[alias].UserName] {
-			ret = append(ret, r.aliasToContact[alias])
-			distinct[r.aliasToContact[alias].UserName] = true
+		if strings.Contains(alias, key) {
+			for _, contact := range r.aliasToContact[alias] {
+				if !distinct[contact.UserName] {
+					ret = append(ret, contact)
+					distinct[contact.UserName] = true
+				}
+			}
 		}
 	}
 	for _, remark := range r.remarkList {
-		if strings.Contains(remark, key) && !distinct[r.remarkToContact[remark].UserName] {
-			ret = append(ret, r.remarkToContact[remark])
-			distinct[r.remarkToContact[remark].UserName] = true
+		if strings.Contains(remark, key) {
+			for _, contact := range r.remarkToContact[remark] {
+				if !distinct[contact.UserName] {
+					ret = append(ret, contact)
+					distinct[contact.UserName] = true
+				}
+			}
 		}
 	}
 	for _, nickName := range r.nickNameList {
-		if strings.Contains(nickName, key) && !distinct[r.nickNameToContact[nickName].UserName] {
-			ret = append(ret, r.nickNameToContact[nickName])
-			distinct[r.nickNameToContact[nickName].UserName] = true
+		if strings.Contains(nickName, key) {
+			for _, contact := range r.nickNameToContact[nickName] {
+				if !distinct[contact.UserName] {
+					ret = append(ret, contact)
+					distinct[contact.UserName] = true
+				}
+			}
 		}
 	}
+
 	return ret
 }
 

internal/wechatdb/repository/message.go

@@ -2,23 +2,20 @@ package repository
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/sjzar/chatlog/internal/model"
+	"github.com/sjzar/chatlog/pkg/util"
 
 	"github.com/rs/zerolog/log"
 )
 
 // GetMessages 实现 Repository 接口的 GetMessages 方法
-func (r *Repository) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, limit, offset int) ([]*model.Message, error) {
+func (r *Repository) GetMessages(ctx context.Context, startTime, endTime time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error) {
 
-	if contact, _ := r.GetContact(ctx, talker); contact != nil {
-		talker = contact.UserName
-	} else if chatRoom, _ := r.GetChatRoom(ctx, talker); chatRoom != nil {
-		talker = chatRoom.Name
-	}
-
-	messages, err := r.ds.GetMessages(ctx, startTime, endTime, talker, limit, offset)
+	talker, sender = r.parseTalkerAndSender(ctx, talker, sender)
+	messages, err := r.ds.GetMessages(ctx, startTime, endTime, talker, sender, keyword, limit, offset)
 	if err != nil {
 		return nil, err
 	}
@@ -62,3 +59,53 @@ func (r *Repository) enrichMessage(msg *model.Message) {
 		}
 	}
 }
+
+func (r *Repository) parseTalkerAndSender(ctx context.Context, talker, sender string) (string, string) {
+	displayName2User := make(map[string]string)
+	users := make(map[string]bool)
+
+	talkers := util.Str2List(talker, ",")
+	if len(talkers) > 0 {
+		for i := 0; i < len(talkers); i++ {
+			if contact, _ := r.GetContact(ctx, talkers[i]); contact != nil {
+				talkers[i] = contact.UserName
+			} else if chatRoom, _ := r.GetChatRoom(ctx, talker); chatRoom != nil {
+				talkers[i] = chatRoom.Name
+			}
+		}
+		// 获取群聊的用户列表
+		for i := 0; i < len(talkers); i++ {
+			if chatRoom, _ := r.GetChatRoom(ctx, talkers[i]); chatRoom != nil {
+				for user, displayName := range chatRoom.User2DisplayName {
+					displayName2User[displayName] = user
+				}
+				for _, user := range chatRoom.Users {
+					users[user.UserName] = true
+				}
+			}
+		}
+		talker = strings.Join(talkers, ",")
+	}
+
+	senders := util.Str2List(sender, ",")
+	if len(senders) > 0 {
+		for i := 0; i < len(senders); i++ {
+			if user, ok := displayName2User[senders[i]]; ok {
+				senders[i] = user
+			} else {
+				// FIXME 大量群聊用户名称重复，无法直接通过 GetContact 获取 ID，后续再优化
+				for user := range users {
+					if contact := r.getFullContact(user); contact != nil {
+						if contact.DisplayName() == senders[i] {
+							senders[i] = user
+							break
+						}
+					}
+				}
+			}
+		}
+		sender = strings.Join(senders, ",")
+	}
+
+	return talker, sender
+}

internal/wechatdb/repository/repository.go

@@ -17,9 +17,9 @@ type Repository struct {
 
 	// Cache for contact
 	contactCache      map[string]*model.Contact
-	aliasToContact    map[string]*model.Contact
-	remarkToContact   map[string]*model.Contact
-	nickNameToContact map[string]*model.Contact
+	aliasToContact    map[string][]*model.Contact
+	remarkToContact   map[string][]*model.Contact
+	nickNameToContact map[string][]*model.Contact
 	chatRoomInContact map[string]*model.Contact
 	contactList       []string
 	aliasList         []string
@@ -28,8 +28,8 @@ type Repository struct {
 
 	// Cache for chat room
 	chatRoomCache      map[string]*model.ChatRoom
-	remarkToChatRoom   map[string]*model.ChatRoom
-	nickNameToChatRoom map[string]*model.ChatRoom
+	remarkToChatRoom   map[string][]*model.ChatRoom
+	nickNameToChatRoom map[string][]*model.ChatRoom
 	chatRoomList       []string
 	chatRoomRemark     []string
 	chatRoomNickName   []string
@@ -43,17 +43,17 @@ func New(ds datasource.DataSource) (*Repository, error) {
 	r := &Repository{
 		ds:                 ds,
 		contactCache:       make(map[string]*model.Contact),
-		aliasToContact:     make(map[string]*model.Contact),
-		remarkToContact:    make(map[string]*model.Contact),
-		nickNameToContact:  make(map[string]*model.Contact),
+		aliasToContact:     make(map[string][]*model.Contact),
+		remarkToContact:    make(map[string][]*model.Contact),
+		nickNameToContact:  make(map[string][]*model.Contact),
 		chatRoomUserToInfo: make(map[string]*model.Contact),
 		contactList:        make([]string, 0),
 		aliasList:          make([]string, 0),
 		remarkList:         make([]string, 0),
 		nickNameList:       make([]string, 0),
 		chatRoomCache:      make(map[string]*model.ChatRoom),
-		remarkToChatRoom:   make(map[string]*model.ChatRoom),
-		nickNameToChatRoom: make(map[string]*model.ChatRoom),
+		remarkToChatRoom:   make(map[string][]*model.ChatRoom),
+		nickNameToChatRoom: make(map[string][]*model.ChatRoom),
 		chatRoomList:       make([]string, 0),
 		chatRoomRemark:     make([]string, 0),
 		chatRoomNickName:   make([]string, 0),

internal/wechatdb/wechatdb.go

@@ -57,11 +57,11 @@ func (w *DB) Initialize() error {
 	return nil
 }
 
-func (w *DB) GetMessages(start, end time.Time, talker string, limit, offset int) ([]*model.Message, error) {
+func (w *DB) GetMessages(start, end time.Time, talker string, sender string, keyword string, limit, offset int) ([]*model.Message, error) {
 	ctx := context.Background()
 
 	// 使用 repository 获取消息
-	messages, err := w.repo.GetMessages(ctx, start, end, talker, limit, offset)
+	messages, err := w.repo.GetMessages(ctx, start, end, talker, sender, keyword, limit, offset)
 	if err != nil {
 		return nil, err
 	}