Merge pull request #43 from tmpMeM/main

AnnonaOrg · Aug 15, 2024 · 9261be1 · 9261be1
2 parents 1d8839c + 4d418c8
commit 9261be1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 19 deletions.
diff --git a/internal/redis_user/get.go b/internal/redis_user/get.go
@@ -37,7 +37,7 @@ func GetAllByKey(keyStr string) ([]string, error) {
 	if len(list) > 0 {
 		return list, nil
 	}
-	return nil, fmt.Errorf("GET(%s): Null", keyStr)
+	return list, fmt.Errorf("GET(%s): Null", keyStr)
 }
 
 // 检查关键词是否在用户关键词列表 true 在，不在 false

diff --git a/internal/service/process_message.go b/internal/service/process_message.go
@@ -5,6 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/AnnonaOrg/annona_client/internal/api"
+
 	"github.com/AnnonaOrg/annona_client/internal/redis_user"
 	// "github.com/AnnonaOrg/annona_client/internal/service"
 	log "github.com/sirupsen/logrus"
@@ -21,7 +23,9 @@ import (
 // messageLinkIsPublic 消息链接是否为公开链接
 func ProcessMessageKeywords(
 	chatID, senderID int64, senderUsername string,
-	messageID int64, messageDateStr, messageContentText, originalText string, messageLink string, messageLinkIsPublic bool,
+	messageID int64, messageDateStr, messageContentText, originalText string,
+	// messageLink string, messageLinkIsPublic bool,
+	messageIsTopicMessage bool,
 	messageDate int64,
 ) {
 	chatIDStr := fmt.Sprintf("%d", chatID)
@@ -157,6 +161,20 @@ func ProcessMessageKeywords(
 		return
 	}
 
+	// 提取messageLink信息
+	var (
+		messageLink         string
+		messageLinkIsPublic bool
+	)
+	if messageLinkTmp, err := api.GetMessageLink(chatID, messageID, 0, false, messageIsTopicMessage); err != nil {
+		log.Errorf("ProcessMessageKeywords.(api.GetMessageLink(%d,%d,inMessageThread:%t)): %v",
+			chatID, messageID, messageIsTopicMessage,
+			err)
+	} else {
+		messageLink = messageLinkTmp.Link
+		messageLinkIsPublic = messageLinkTmp.IsPublic
+	}
+
 	// 根据检出的用户信息map 推送信息
 	var keyworldList []string
 	for k, v := range allUserMap {

diff --git a/internal/updates/texts.go b/internal/updates/texts.go
@@ -3,30 +3,27 @@ package updates
 import (
 	"github.com/AnnonaOrg/annona_client/internal/api"
 	"github.com/AnnonaOrg/annona_client/internal/service"
-
 	"github.com/AnnonaOrg/annona_client/utils"
 	"github.com/AnnonaOrg/osenv"
-	log "github.com/sirupsen/logrus"
 	"github.com/zelenin/go-tdlib/client"
 )
 
 // handleText handles incoming text messages.
 func handleText(message *client.Message, senderID int64, senderUsername string) {
 	messageContent := api.GetMessageFormattedText(message.Content) // message.Content.(*client.MessageText)
 	messageContentText := messageContent.Text
-	var (
-		messageLink         string
-		messageLinkIsPublic bool
-	)
-
-	if messageLinkTmp, err := api.GetMessageLink(message.ChatId, message.Id, 0, false, message.IsTopicMessage); err != nil {
-		log.Errorf("handleText.(api.GetMessageLink(%d,%d,inMessageThread:%t),MessageThreadId:%d): %v",
-			message.ChatId, message.Id, message.IsTopicMessage, message.MessageThreadId,
-			err)
-	} else {
-		messageLink = messageLinkTmp.Link
-		messageLinkIsPublic = messageLinkTmp.IsPublic
-	}
+	// var (
+	// 	messageLink         string
+	// 	messageLinkIsPublic bool
+	// )
+	// if messageLinkTmp, err := api.GetMessageLink(message.ChatId, message.Id, 0, false, message.IsTopicMessage); err != nil {
+	// 	log.Errorf("handleText.(api.GetMessageLink(%d,%d,inMessageThread:%t),MessageThreadId:%d): %v",
+	// 		message.ChatId, message.Id, message.IsTopicMessage, message.MessageThreadId,
+	// 		err)
+	// } else {
+	// 	messageLink = messageLinkTmp.Link
+	// 	messageLinkIsPublic = messageLinkTmp.IsPublic
+	// }
 
 	messageDateStr := utils.FormatTimestamp2String(int64(message.Date))
 	messageContentTextEx := messageContentText
@@ -43,8 +40,9 @@ func handleText(message *client.Message, senderID int64, senderUsername string)
 		messageDateStr,
 		messageContentTextEx,
 		messageContentText,
-		messageLink,
-		messageLinkIsPublic,
+		// messageLink,
+		// messageLinkIsPublic,
+		message.IsTopicMessage, //messageIsTopicMessage,
 		int64(message.Date),
 	)
 }