Merge pull request #9 from rxrw/master

config.json

@@ -14,5 +14,6 @@
         }
     ],
     "C": "android",
-    "S": ""
+    "S": "",
+    "F": ""
 }

src/WeiboClient/WeiboClient.go

@@ -15,6 +15,7 @@ type WeiboClient struct{
 	client *http.Client
 	C string
 	S string
+	F string
 }
 
 // @title         init
@@ -37,10 +38,11 @@ func (w *WeiboClient) init() {
 // @description   创建一个WeiboClient对象并初始化
 // @auth          星辰
 // @return        WeiboClient对象
-func New(c string, s string) *WeiboClient {
+func New(c string, s string, f string) *WeiboClient {
 	ret := new(WeiboClient)
 	ret.init()
 	ret.C = c
 	ret.S = s
+	ret.F = f
 	return ret
 }

src/WeiboClient/api.go

@@ -306,7 +306,7 @@ func (w *WeiboClient) UrlSafe() (map[string]interface{}, error){
 	resp, err := w.client.Get("https://api.weibo.cn/2/client/url_safe"+
 		"?c="+w.C+
 		"&s="+w.S+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -334,7 +334,7 @@ func (w *WeiboClient) CardList(containerid string) (map[string]interface{}, erro
 	resp, err := w.client.Get("https://api.weibo.cn/2/cardlist"+
 		"?c="+w.C+
 		"&s="+w.S+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn")+
 		"&page="+"1"+
 		"&count="+"20"+
@@ -369,7 +369,7 @@ func (w *WeiboClient) AppRepost(id string) (map[string]interface{}, error){
 		"share_source":"0",
 		"is_fast":"1",
 		"gsid":w.getCookie("SUB", ".weibo.cn"),
-		"from":"10AC395010",
+		"from":w.F,
 	}
 	var b bytes.Buffer
 	wt := multipart.NewWriter(&b)
@@ -391,7 +391,7 @@ func (w *WeiboClient) AppRepost(id string) (map[string]interface{}, error){
 			"?c="+w.C+
 			"&s="+w.S+
 			"&id="+id+
-			"&from="+"10AC395010"+
+			"&from="+w.F+
 			//"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 			"&gsid="+bodyMap["gsid"],
 		&b,
@@ -424,7 +424,7 @@ func (w *WeiboClient) AppDestroy(id string) (map[string]interface{}, error){
 		"?c="+w.C+
 		"&s="+w.S+
 		"&id="+id+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -476,7 +476,7 @@ func (w *WeiboClient) AppCommentsCreate(id string, content string) (map[string]i
 			"&s="+w.S+
 			"&fromlog="+"100016356549855"+
 			"&featurecode="+"10000001"+
-			"&from="+"10AC395010"+
+			"&from="+w.F+
 			"&lfid="+"guanzhu"+
 			"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 		&b,
@@ -509,7 +509,7 @@ func (w *WeiboClient) AppCommentsDestroy(id string) (map[string]interface{}, err
 		"?c="+w.C+
 		"&s="+w.S+
 		"&cid="+id+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -542,7 +542,7 @@ func (w *WeiboClient) AppFriendshipsCreate(id string) (map[string]interface{}, e
 		"&invite="+"0"+
 		"&able_recommend="+"0"+
 		"&featurecode="+"10000326"+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -573,7 +573,7 @@ func (w *WeiboClient) AppFriendshipsDestroy(id string) (map[string]interface{},
 		"&uid="+id+
 		"&trim_level="+"0"+
 		"&trim="+"1"+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -603,7 +603,7 @@ func (w *WeiboClient) AppSetLike(id string) (map[string]interface{}, error){
 		"&s="+w.S+
 		"&id="+id+
 		"&sourcetype="+"feed"+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -633,7 +633,7 @@ func (w *WeiboClient) AppCancelLike(id string) (map[string]interface{}, error){
 		"&s="+w.S+
 		"&id="+id+
 		"&sourcetype="+"feed"+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 	)
 	if err != nil {
@@ -665,7 +665,7 @@ func (w *WeiboClient) UnreadFriendsTimeline() (map[string]interface{}, error){
 		"&featurecode="+"10000001"+
 		"&c="+w.C+
 		"&s="+w.S+
-		"&from="+"10AC395010"+
+		"&from="+w.F+
 	    "&lfid="+"guanzhu"+
 		"&gsid="+w.getCookie("SUB", ".weibo.cn"),
 		strings.NewReader("since_id=0"),

src/WeiboTask/Tasks/SuperCheckIn.go

@@ -59,7 +59,8 @@ func GetSuperTopics(w *WeiboClient.WeiboClient, ch chan<- [2]string) {
 			break
 		}
 		//python里直接["data"]["cardlistInfo"]["since_id"]
-		sinceId, ok := data["data"].(map[string]interface{})["cardlistInfo"].(map[string]interface{})["since_id"]
+		var ok bool
+		sinceId, ok = data["data"].(map[string]interface{})["cardlistInfo"].(map[string]interface{})["since_id"].(string)
 		if !ok {
 			log.Println("获取超话列表sinceId错误")
 			break

src/WeiboTask/WeiboTask.go

@@ -83,7 +83,7 @@ func runOnce(reloadConfig bool) {
 		}
 	}
 	defer sendToServerChan()
-	wb := WeiboClient.New(MyConfig.C, MyConfig.S)
+	wb := WeiboClient.New(MyConfig.C, MyConfig.S, MyConfig.F)
 	if wb.LoginByCookies(MyConfig.Cookies) {
 		defer func() { MyConfig.Cookies = wb.GetCookies(); _ = SaveConfig() }()
 		runTasks(wb)

src/WeiboTask/config.go

@@ -20,6 +20,7 @@ type Config struct{
 	Stime [2]int                  //定时启动时间，格式为{小时, 分钟}
 	C string                      //平台,如"android"
 	S string                      //app秘钥,6位字符串
+	F string                      //app from参数,8位字符串
 }
 
 var MyConfig Config  //配置文件对象