Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta85 #228

Merged
merged 16 commits into from
Dec 6, 2023
1 change: 0 additions & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -1130,4 +1130,3 @@ func GetTransferUrl() bool {
}
return instance.Settings.TransferUrl
}

13 changes: 10 additions & 3 deletions handlers/message_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func parseMessageContent(paramsMessage callapi.ParamsContent) (string, map[strin
mylog.Println("Unsupported message format: params.message field is not a string, map or slice")
}
//处理at
messageText = transformMessageText(messageText)
messageText = transformMessageTextAt(messageText)

//mylog.Printf(messageText)

Expand Down Expand Up @@ -183,6 +183,8 @@ func parseMessageContent(paramsMessage callapi.ParamsContent) (string, map[strin
// 移动替换操作到这里,确保所有匹配都被处理后再进行替换
messageText = pattern.pattern.ReplaceAllString(messageText, "")
}
//最后再处理Url
messageText = transformMessageTextUrl(messageText)

// for key, items := range foundItems {
// fmt.Printf("Key: %s, Items: %v\n", key, items)
Expand All @@ -194,8 +196,8 @@ func isIPAddress(address string) bool {
return net.ParseIP(address) != nil
}

// at处理和链接处理
func transformMessageText(messageText string) string {
// at处理
func transformMessageTextAt(messageText string) string {
// 首先,将AppID替换为BotID
messageText = strings.ReplaceAll(messageText, AppID, BotID)

Expand Down Expand Up @@ -224,6 +226,11 @@ func transformMessageText(messageText string) string {
}
return m
})
return messageText
}

// 链接处理
func transformMessageTextUrl(messageText string) string {
//是否处理url
if config.GetTransferUrl() {
// 判断服务器地址是否是IP地址
Expand Down
Loading