From ba2d011d4879935170c3820bbe5a7816c45086eb Mon Sep 17 00:00:00 2001
From: Kanri <yiwen_chan@foxmail.com>
Date: Thu, 24 Feb 2022 16:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=AC=E4=BC=97=E5=8F=B7=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#135)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin_moyu_calendar/calendar.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugin_moyu_calendar/calendar.go b/plugin_moyu_calendar/calendar.go
index 15fe7c59..d622e26f 100644
--- a/plugin_moyu_calendar/calendar.go
+++ b/plugin_moyu_calendar/calendar.go
@@ -4,9 +4,11 @@ package moyucalendar
 import (
 	"bufio"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"regexp"
 	"strings"
 	"time"
@@ -53,13 +55,19 @@ func init() {
 	}
 }
 
-var newest = regexp.MustCompile(`uigs="account_article_0" href="(/link.+?)">`)
+var newest = regexp.MustCompile(`href="(/link.+?)" id="sogou_vr_11002601_title_0" uigs="article_title_0"`)
 var weixin = regexp.MustCompile(`url \+= '(.+)';`)
 var calendar = regexp.MustCompile(`data-src="(.{0,300})" data-type="png" data-w="540"`)
 
 func crew() (string, error) {
 	client := &http.Client{}
-	req, err := http.NewRequest("GET", "https://weixin.sogou.com/weixin?type=1&s_from=input&query=%E6%91%B8%E9%B1%BC%E4%BA%BA%E6%97%A5%E5%8E%86", nil)
+	u, _ := url.Parse("https://weixin.sogou.com/weixin")
+	u.RawQuery = url.Values{
+		"type":   []string{"2"},
+		"s_from": []string{"input"},
+		"query":  []string{fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())},
+	}.Encode()
+	req, err := http.NewRequest("GET", u.String(), nil)
 	if err != nil {
 		return "", err
 	}
@@ -140,7 +148,7 @@ func crew() (string, error) {
 		return "", err
 	}
 	if !today.Match(bw) {
-		return "", errors.New("calendar not found")
+		return "", errors.New("today not found")
 	}
 	matchw := calendar.FindStringSubmatch(binary.BytesToString(bw))
 	if len(matchw) < 2 {