From 3d60361fa2b9adc795736e2b23f50cc071905b2f Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 13 Sep 2020 18:55:43 -0700 Subject: [PATCH] should now maybe show better aqi --- bot/aqi.go | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/bot/aqi.go b/bot/aqi.go index 8efa63f..a76e9a6 100644 --- a/bot/aqi.go +++ b/bot/aqi.go @@ -13,7 +13,7 @@ import ( "github.com/rs/zerolog/log" ) -type AQIResponse []struct { +type AQIResponse struct { DateObserved string `json:"DateObserved"` HourObserved int `json:"HourObserved"` LocalTimeZone string `json:"LocalTimeZone"` @@ -29,6 +29,19 @@ type AQIResponse []struct { } `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) { // 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) } - zip4 := matches[1] + zip := matches[1] 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) @@ -69,9 +82,9 @@ func (b *Bot) HandleAirQualityRequest(channelid string, postid string, message s 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 = 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) 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) }