changeset 3:1a10e3641292

fix webhook
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Tue, 16 Jun 2020 21:30:07 +0900
parents a92a8de9d190
children d86513005167
files members.json run.go
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/members.json	Wed May 27 10:45:45 2020 +0900
+++ b/members.json	Tue Jun 16 21:30:07 2020 +0900
@@ -1,1 +1,1 @@
-[{"id":"@e175701","done":false},{"id":"@e175706","done":true},{"id":"@e175733","done":false},{"id":"@e175748","done":false},{"id":"@k198576","done":false},{"id":"@k198584","done":false},{"id":"@k198592","done":false},{"id":"@k208573","done":false},{"id":"@riono","done":false}]
\ No newline at end of file
+[{"id":"@e175701","done":false},{"id":"@e175706","done":true},{"id":"@e175733","done":false},{"id":"@e175748","done":true},{"id":"@k198576","done":false},{"id":"@k198584","done":false},{"id":"@k198592","done":true},{"id":"@k208573","done":true},{"id":"@riono","done":true}]
\ No newline at end of file
--- a/run.go	Wed May 27 10:45:45 2020 +0900
+++ b/run.go	Tue Jun 16 21:30:07 2020 +0900
@@ -12,10 +12,14 @@
 
 var iconURL string = "https://upload.wikimedia.org/wikipedia/commons/a/a4/13-02-27-spielbank-wiesbaden-by-RalfR-093.jpg"
 var botName string = "ログルーレット"
-var webhook string = os.Getenv("MATTERMOST_WEBHOOK")
+var webhook string
 
 func Run(jsonp string) int {
 
+	if webhook == "" {
+		os.Getenv("MATTERMOST_WEBHOOK")
+	}
+
 	users, err := convertFromJSonToUserInfo(jsonp)
 	if err != nil {
 		fmt.Println(err)
@@ -26,8 +30,7 @@
 		fmt.Println(err)
 		return 1
 	}
-	err = converUserInfoToJSON(newUsers, jsonp)
-	if err != nil {
+	if err := converUserInfoToJSON(newUsers, jsonp); err != nil {
 		fmt.Println(err)
 		return 1
 	}
@@ -37,11 +40,13 @@
 	strBuilder.WriteString(targetUser)
 	strBuilder.WriteString("さんです!! オナシャス!!")
 
-	slack.Send(webhook, &slack.Message{
+	if err := slack.Send(webhook, &slack.Message{
 		Username: botName,
 		Text:     strBuilder.String(),
 		IconURL:  iconURL,
-	})
+	}); err != nil {
+		fmt.Println(err)
+	}
 	return 0
 }