feat: 添加cqjson处理和url处理

handler/handler.go

@@ -10,6 +10,7 @@ import (
 type Handler func(msg model.Message) (reply model.Reply)
 
 var handlers = make(map[string]Handler)
+var frontMatchHandlers = make(map[string]Handler)
 var liveHandlers = make(map[int64]map[int64]Handler)
 var privateAllHandler Handler
 
@@ -21,6 +22,10 @@ func RegisterHandler(trigger string, handler Handler) {
 	handlers[trigger] = handler
 }
 
+func RegisterFrontMatchHandler(trigger string, handler Handler) {
+	frontMatchHandlers[trigger] = handler
+}
+
 func RegisterLiveHandler(groupID int64, userID int64, handler Handler) { //userID=-1 means for all users in groupID
 	if _, ok := liveHandlers[groupID]; !ok {
 		liveHandlers[groupID] = make(map[int64]Handler)
@@ -50,6 +55,11 @@ func MsgInHandler(msg model.Message) (reply model.Reply) {
 			return handler(msg)
 		}
 	}
+	for trigger, handler := range frontMatchHandlers {
+		if strings.HasPrefix(msg.RawMsg, trigger) {
+			return handler(msg)
+		}
+	}
 	msgArray := strings.Split(msg.RawMsg, " ")
 	if handler, ok := handlers[msgArray[0]]; ok {
 		return handler(msg)

handler/urlparser/url.go

@@ -10,17 +10,43 @@ import (
 
 	"git.lxtend.com/qqbot/handler"
 	"git.lxtend.com/qqbot/model"
+	"git.lxtend.com/qqbot/util"
 )
 
 func init() {
-	handler.RegisterFrontMatchHandler("[CQ:json,data=", urlParser)
+	handler.RegisterFrontMatchHandler("[CQ:json,data=", cqJsonUrlParser)
+	handler.RegisterFrontMatchHandler("http://", plainTextUrlParser)
+	handler.RegisterFrontMatchHandler("https://", plainTextUrlParser)
 }
 
-func urlParser(msg model.Message) (reply model.Reply) {
+func plainTextUrlParser(msg model.Message) (reply model.Reply) {
+	url := msg.RawMsg
+	url = strings.Split(url, " ")[0]
+	url = strings.Split(url, "\n")[0]
+	url = strings.Split(url, "\r")[0]
+	url = strings.Split(url, "\t")[0]
+	url, _ = removeTrackingParams(url)
+	newUrl, _ := resolveFinalURL(url)
+	newUrl, _ = removeTrackingParams(newUrl)
+	if util.IsEquivalentURL(url, newUrl) {
+		return model.Reply{
+			ReplyMsg:       "",
+			ReferOriginMsg: false,
+			FromMsg:        msg,
+		}
+	}
+	return model.Reply{
+		ReplyMsg:       newUrl,
+		ReferOriginMsg: true,
+		FromMsg:        msg,
+	}
+}
+
+func cqJsonUrlParser(msg model.Message) (reply model.Reply) {
 	qqdocurl, err := extractQQDocURL(msg.RawMsg)
 	if err != nil {
 		return model.Reply{
-			ReplyMsg:       fmt.Sprintf("解析失败: %v", err),
+			ReplyMsg:       "",
 			ReferOriginMsg: true,
 			FromMsg:        msg,
 		}