golang/mtfosbot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix all error and bug !!!!!!!!!!!!!

Browse Source
This commit is contained in:
Jay
2018-09-21 01:14:08 +08:00
parent 07436cd8df
commit 906b7be381
24 changed files with 133 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/apis/line/line.go
+5 -10
View File
@@ -93,7 +93,6 @@ func PushMessage(target string, message interface{}) {
body.Messages = append(body.Messages, message)
dataByte, err := json.Marshal(body)
if err != nil {
fmt.Println("json encoding error")
return
}
@@ -101,7 +100,6 @@ func PushMessage(target string, message interface{}) {
apiURL, ok := getURL(urlPath)
if !ok {
fmt.Println("url parser fail")
return
}
@@ -119,7 +117,6 @@ func PushMessage(target string, message interface{}) {
_, err = http.DefaultClient.Do(req)
if err != nil {
fmt.Println("post api fail")
return
}
}
@@ -136,24 +133,24 @@ func ReplyMessage(replyToken string, message interface{}) {
}
switch message.(type) {
case ImageMessage:
m := (message.(ImageMessage))
case *ImageMessage:
m := (message.(*ImageMessage))
m.Type = "image"
message = m
break
case TextMessage:
m := (message.(TextMessage))
case *TextMessage:
m := (message.(*TextMessage))
m.Type = "text"
message = m
break
default:
fmt.Println("input type error")
return
}
body.Messages = append(body.Messages, message)
dataByte, err := json.Marshal(body)
if err != nil {
fmt.Println("json encoding error")
return
}
@@ -161,7 +158,6 @@ func ReplyMessage(replyToken string, message interface{}) {
apiURL, ok := getURL(urlPath)
if !ok {
fmt.Println("url parser fail")
return
}
@@ -179,7 +175,6 @@ func ReplyMessage(replyToken string, message interface{}) {
_, err = http.DefaultClient.Do(req)
if err != nil {
fmt.Println("post api fail")
return
}
}
module/apis/twitch/twitch.go
+18 -18
View File
@@ -238,11 +238,11 @@ func GetUserStreamStatus(ids []string) (info []*StreamInfo) {
// TwitchTokenData -
type TwitchTokenData struct {
AccessToken string `json:"access_token" cc:"access_token"`
RefreshToken string `json:"refresh_token" cc:"refresh_token"`
ExpiresIn int64 `json:"expires_in" cc:"expires_in"`
Scope string `json:"scope" cc:"scope"`
TokenType string `json:"token_type" cc:"token_type"`
AccessToken string `json:"access_token" cc:"access_token"`
RefreshToken string `json:"refresh_token" cc:"refresh_token"`
ExpiresIn int64 `json:"expires_in" cc:"expires_in"`
Scope []string `json:"scope" cc:"scope"`
TokenType string `json:"token_type" cc:"token_type"`
}
// GetTokenData -
@@ -261,17 +261,17 @@ func GetTokenData(code string) (token *TwitchTokenData, err error) {
qs.Add("grant_type", "authorization_code")
qs.Add("redirect_uri", redirectTo)
u, err := url.Parse(twitchURL)
if err != nil {
return nil, err
}
u, err = u.Parse(qs.Encode())
if err != nil {
return nil, err
}
// u, err := url.Parse(twitchURL)
// if err != nil {
// return nil, err
// }
// u, err = u.Parse(qs.Encode())
// if err != nil {
// return nil, err
// }
reqObj := apis.RequestObj{
URL: u.String(),
URL: twitchURL + "?" + qs.Encode(),
Method: "POST",
}
req, err := apis.GetRequest(reqObj)
@@ -285,15 +285,15 @@ func GetTokenData(code string) (token *TwitchTokenData, err error) {
}
defer resp.Body.Close()
if resp.StatusCode != 200 || strings.HasPrefix(resp.Header.Get("Content-Type"), "application/json") {
return nil, errors.New("api response error")
}
bodyBytes, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
if resp.StatusCode != 200 || !strings.HasPrefix(resp.Header.Get("Content-Type"), "application/json") {
return nil, errors.New("api response error")
}
err = json.Unmarshal(bodyBytes, &token)
return