v0.1.3 debug

AnnonaOrg · Aug 9, 2024 · 3929e81 · 3929e81
1 parent d7fcdf7
commit 3929e81
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/internal/service/send_message.go b/internal/service/send_message.go
@@ -53,6 +53,20 @@ func SendMessage(
 	richMsg.Link = messageLink
 	richMsg.LinkIsPublic = messageLinkIsPublic
 
+	msgContentSuffix := ""
+	if len(richMsg.FormInfo.FormChatTitle) > 0 {
+		msgContentSuffix = "来源:" + richMsg.FormInfo.FormChatTitle + "\n"
+		if len(richMsg.FormInfo.FormSenderTitle) > 0 {
+			msgContentSuffix = "发送人:" + richMsg.FormInfo.FormSenderTitle + "\n" + msgContentSuffix
+		}
+	}
+	// retText = fmt.Sprintf("#ID%d", senderID)
+	msgContentSuffix = msgContentSuffix + "#ID" + senderIDStr
+	if len(senderUsername) > 0 {
+		msgContentSuffix = msgContentSuffix + " @" + senderUsername
+	}
+	richMsg.Text.ContentEx = messageContentText + "\n" + msgContentSuffix
+
 	serverRouter := osenv.GetNoticeOfFeedRichMsgPushUrl()
 	serverChannel := fmt.Sprintf("%d", toChatID)
 	serverToken := fmt.Sprintf("%d", toChatID)

diff --git a/internal/updates/texts.go b/internal/updates/texts.go
@@ -62,17 +62,17 @@ func handleText(message *client.Message, senderID int64, senderUsername string)
 		messageData int32,
 	) string {
 		retText := ""
-		retText = fmt.Sprintf("#ID%d", senderID)
-		if len(senderUsername) > 0 {
-			retText = retText + " @" + senderUsername
-		}
+		// retText = fmt.Sprintf("#ID%d", senderID)
+		// if len(senderUsername) > 0 {
+		// 	retText = retText + " @" + senderUsername
+		// }
 		if osenv.IsTDlibSimpleMessage() {
 			messageContentText = utils.GetStringRuneN(messageContentText, 20)
 		}
-		retText = retText + "\n" +
-			// fmt.Sprintf("用户ID: tg://user?id=%d", senderID) + "\n" +
-			// "messageLink: " + messageLink + " " + fmt.Sprintf("%t", messageLinkIsPublic) + "\n" +
-			"消息日期: " + utils.FormatTimestamp2String(int64(messageData)) + "\n" +
+		// retText = //retText + //"\n" +
+		// fmt.Sprintf("用户ID: tg://user?id=%d", senderID) + "\n" +
+		// "messageLink: " + messageLink + " " + fmt.Sprintf("%t", messageLinkIsPublic) + "\n" +
+		retText = "消息日期: " + utils.FormatTimestamp2String(int64(messageData)) + "\n" +
 			"消息内容: \n" + messageContentText
 
 		return retText