shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-06-19 05:55:04 +08:00
Code Issues Projects Releases Wiki Activity

feat(global): lazy compile split url regex pattern

Browse Source
This commit is contained in:
wdvxdr 2021-04-27 20:38:59 +08:00
parent 2492fa88f5
commit 0138a6c467
No known key found for this signature in database
GPG Key ID: 55FF1414A69CEBA6
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coolq/cqcode.go
View File

@ -1084,7 +1084,7 @@ func CQCodeUnescapeValue(content string) string {
// makeImageOrVideoElem 图片 elem 生成器，单独拎出来，用于公用 // makeImageOrVideoElem 图片 elem 生成器，单独拎出来，用于公用
func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) { func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
f := d["file"] f := d["file"]
if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") { if strings.HasPrefix(f, "http") {
cache := d["cache"] cache := d["cache"]
c := d["c"] c := d["c"]
if cache == "" { if cache == "" {
@ -1120,7 +1120,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` { if runtime.GOOS == `windows` && strings.HasPrefix(fu.Path, "/") {
fu.Path = fu.Path[1:] fu.Path = fu.Path[1:]
} }
info, err := os.Stat(fu.Path) info, err := os.Stat(fu.Path)

12
global/param.go
View File

@ -5,6 +5,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"sync"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )
@ -85,9 +86,18 @@ func VersionNameCompare(current, remote string) bool {
return len(cur) < len(re) return len(cur) < len(re)
} }
var (
// once lazy compile the reg
once sync.Once
// reg is splitURL regex pattern.
reg *regexp.Regexp
)
// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控 // SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
func SplitURL(s string) []string { func SplitURL(s string) []string {
reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`) once.Do(func() { // lazy init.
reg = regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
})
idx := reg.FindAllStringIndex(s, -1) idx := reg.FindAllStringIndex(s, -1)
if len(idx) == 0 { if len(idx) == 0 {
return []string{s} return []string{s}

2
server/http.go
View File

@ -203,7 +203,7 @@ func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
} }
func (s *httpServer) HandleActions(c *gin.Context) { func (s *httpServer) HandleActions(c *gin.Context) {
action := strings.ReplaceAll(c.Param("action"), "_async", "") action := strings.TrimSuffix(c.Param("action"), "_async")
log.Debugf("HTTPServer接收到API调用: %v", action) log.Debugf("HTTPServer接收到API调用: %v", action)
c.JSON(200, s.api.callAPI(action, httpContext{ctx: c})) c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))
} }

2
server/websocket.go
View File

@ -388,7 +388,7 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
} }
}() }()
j := gjson.Parse(utils.B2S(payload)) j := gjson.Parse(utils.B2S(payload))
t := strings.ReplaceAll(j.Get("action").Str, "_async", "") t := strings.TrimSuffix(j.Get("action").Str, "_async")
log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw) log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
ret := c.apiCaller.callAPI(t, j.Get("params")) ret := c.apiCaller.callAPI(t, j.Get("params"))
if j.Get("echo").Exists() { if j.Get("echo").Exists() {