v0.2.2 debug

AnnonaOrg · Aug 15, 2024 · 1d1414f · 1d1414f
1 parent af15214
commit 1d1414f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/internal/request/keyworld_history.go b/internal/request/keyworld_history.go
@@ -7,6 +7,8 @@ type KeyworldHistoryInfo struct {
 	MessageId          int64  `json:"message_id" form:"message_id" gorm:"column:message_id;"`
 	MessageLink        string `json:"message_link" form:"message_link" gorm:"column:message_link;"`
 	MessageContentText string `json:"message_content_text" form:"message_content_text" gorm:"column:message_content_text;"`
+	MessageDateEx      string `json:"message_date_ex" form:"message_date_ex" gorm:"column:message_date_ex;"`
+	MessageDate        int64  `json:"message_date" form:"message_date" gorm:"column:message_date;"`
 
 	KeyWorld string `json:"key_world" form:"key_world" gorm:"column:key_world;"`
 

diff --git a/internal/service/keyworld_history.go b/internal/service/keyworld_history.go
@@ -38,6 +38,8 @@ func CreateKeyworldHistoryEx(
 	chatID, senderID int64, senderUsername string,
 	messageID int64, messageContentText string, messageLink string,
 	keyworld string,
+	messageDateStr string,
+	messageDate int64,
 ) error {
 	req := &request.KeyworldHistoryInfo{}
 	req.ChatId = chatID
@@ -47,5 +49,7 @@ func CreateKeyworldHistoryEx(
 	req.MessageContentText = messageContentText
 	req.MessageLink = messageLink
 	req.KeyWorld = keyworld
+	req.MessageDateEx = messageDateStr
+	req.MessageDate = messageDate
 	return CreateKeyworldHistory(req)
 }
diff --git a/internal/service/process_message.go b/internal/service/process_message.go
@@ -19,7 +19,11 @@ import (
 // originalText 原始消息内容
 // messageLink 消息链接
 // messageLinkIsPublic 消息链接是否为公开链接
-func ProcessMessageKeywords(chatID, senderID int64, senderUsername string, messageID int64, messageDate, messageContentText, originalText string, messageLink string, messageLinkIsPublic bool) {
+func ProcessMessageKeywords(
+	chatID, senderID int64, senderUsername string,
+	messageID int64, messageDateStr, messageContentText, originalText string, messageLink string, messageLinkIsPublic bool,
+	messageDate int64,
+) {
 	chatIDStr := fmt.Sprintf("%d", chatID)
 	senderIDStr := fmt.Sprintf("%d", senderID)
 	messageIDStr := fmt.Sprintf("%d_%d", chatID, messageID)
@@ -191,7 +195,7 @@ func ProcessMessageKeywords(chatID, senderID int64, senderUsername string, messa
 				messageID,
 				chatID, senderID, toChatID,
 				botToken,
-				messageIDStr, messageDate, messageContentText, messageLink, messageLinkIsPublic,
+				messageIDStr, messageDateStr, messageContentText, messageLink, messageLinkIsPublic,
 				vc,
 			); err != nil {
 				log.Errorf("msg Send( %s )Fail: %v", messageContentText, err)
@@ -205,5 +209,6 @@ func ProcessMessageKeywords(chatID, senderID int64, senderUsername string, messa
 		chatID, senderID, senderUsername,
 		messageID, originalText, messageLink,
 		strings.Join(keyworldList, ","),
+		messageDateStr, messageDate,
 	)
 }
diff --git a/internal/updates/texts.go b/internal/updates/texts.go
@@ -28,22 +28,23 @@ func handleText(message *client.Message, senderID int64, senderUsername string)
 		messageLinkIsPublic = messageLinkTmp.IsPublic
 	}
 
-	messageDataStr := utils.FormatTimestamp2String(int64(message.Date))
+	messageDateStr := utils.FormatTimestamp2String(int64(message.Date))
 	messageContentTextEx := messageContentText
 	if osenv.IsTDlibSimpleMessage() {
 		messageContentTextEx = utils.GetStringRuneN(messageContentText, 20)
 	}
-	messageContentTextEx = "日期: " + messageDataStr + "\n" +
+	messageContentTextEx = "日期: " + messageDateStr + "\n" +
 		"内容: " + messageContentTextEx
 
 	go service.ProcessMessageKeywords(
 		message.ChatId,
 		senderID, senderUsername,
 		message.Id,
-		messageDataStr,
+		messageDateStr,
 		messageContentTextEx,
 		messageContentText,
 		messageLink,
 		messageLinkIsPublic,
+		int64(message.Date),
 	)
 }