refactor: 自动截取整页

This commit is contained in:
lixiangwuxian
2024-10-13 16:04:05 +08:00
parent 2290146862
commit 9f5106663f
4 changed files with 19 additions and 7 deletions

View File

@@ -15,7 +15,7 @@ func getweb(msg model.Message) (reply model.Reply) {
return model.Reply{}
}
url := msg.RawMsg[len("上网 "):]
if err := util.ScreenshotURL(url, "./tmp/getweb/url.png", 1920, 1080, 0, 0, 0, 0, ""); err != nil {
if err := util.ScreenshotURL(url, "./tmp/getweb/url.png", 0, 0, 0, 0, 0, 0, ""); err != nil {
return model.Reply{
ReplyMsg: err.Error(),
ReferOriginMsg: true,

View File

@@ -26,7 +26,14 @@ func plainTextUrlParser(msg model.Message) (reply model.Reply) {
url = strings.Split(url, "\r")[0]
url = strings.Split(url, "\t")[0]
url, _ = removeTrackingParams(url)
newUrl, _ := resolveFinalURL(url)
newUrl, err := resolveFinalURL(url)
if err != nil {
return model.Reply{
ReplyMsg: "",
ReferOriginMsg: false,
FromMsg: msg,
}
}
newUrl, _ = removeTrackingParams(newUrl)
if util.IsEquivalentURL(url, newUrl) {
return model.Reply{