sneak/sco
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: sneak:f5fe993105445f528a60da21c6e7497939b5cc9c
Branches Tags
sneak:master
sneak:next
...
compare: sneak:b26e11ac88c6a0499b7e24fc5370b4ed10358ea7
Branches Tags
sneak:master
sneak:next

2 Commits
f5fe993105 ... b26e11ac88

Author SHA1 Message Date
Jeffrey Paul
b26e11ac88 Merge branch 'next' of sneak/sco into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2020-09-14 02:14:15 +00:00
sneak
3d60361fa2 should now maybe show better aqi
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2020-09-13 18:55:43 -07:00
1 changed files with 21 additions and 6 deletions
Show Stats Expand all files Collapse all files

27
bot/aqi.go
View File

@ -13,7 +13,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
type AQIResponse []struct { type AQIResponse struct {
DateObserved string `json:"DateObserved"` DateObserved string `json:"DateObserved"`
HourObserved int `json:"HourObserved"` HourObserved int `json:"HourObserved"`
LocalTimeZone string `json:"LocalTimeZone"` LocalTimeZone string `json:"LocalTimeZone"`
@ -29,6 +29,19 @@ type AQIResponse []struct {
} `json:"Category"` } `json:"Category"`
} }
func formatAQIResponse(input *[]AQIResponse, zip string) string {
dinput := *input
in := dinput[0]
when := fmt.Sprintf("%s at %d:00 %s", in.DateObserved, in.HourObserved, in.LocalTimeZone)
bytes, err := json.Marshal(input)
if err != nil {
panic(err)
}
formatted := string(bytes)
out := fmt.Sprintf("# AQI for %s as of %s:\n %s", zip, when, formatted)
return out
}
func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message string) { func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message string) {
// we are using a very bare image with no CA cert bundle // we are using a very bare image with no CA cert bundle
@ -44,10 +57,10 @@ func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message s
b.SendMsgToChannel("error, sorry", postid, channelid) b.SendMsgToChannel("error, sorry", postid, channelid)
} }
zip4 := matches[1] zip := matches[1]
apikey := os.Getenv("AIRNOW_API_KEY") apikey := os.Getenv("AIRNOW_API_KEY")
url := fmt.Sprintf("http://www.airnowapi.org/aq/observation/zipCode/current/?format=application/json&zipCode=%s&distance=25&API_KEY=%s", zip4, apikey) url := fmt.Sprintf("http://www.airnowapi.org/aq/observation/zipCode/current/?format=application/json&zipCode=%s&distance=25&API_KEY=%s", zip, apikey)
log.Info().Msgf("calculated url: `%s`", url) log.Info().Msgf("calculated url: `%s`", url)
@ -69,9 +82,9 @@ func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message s
data, _ := ioutil.ReadAll(resp.Body) data, _ := ioutil.ReadAll(resp.Body)
var parsedAQIResponse AQIResponse var parsedAQIResponse []AQIResponse
log.Info().Msgf("aqi %s: %s", zip4, data) log.Info().Msgf("aqi %s: %s", zip, data)
err = nil err = nil
err = json.Unmarshal([]byte(data), &parsedAQIResponse) err = json.Unmarshal([]byte(data), &parsedAQIResponse)
@ -80,5 +93,7 @@ func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message s
b.SendMsgToChannel("error deserializing AQI data", postid, channelid) b.SendMsgToChannel("error deserializing AQI data", postid, channelid)
return return
} }
b.SendMsgToChannel(fmt.Sprintf("AQI for `%s`: \n```\n%+v\n```\n", zip4, parsedAQIResponse), postid, channelid)
msg := formatAQIResponse(&parsedAQIResponse, zip)
b.SendMsgToChannel(msg, postid, channelid)
} }