web/switchcounter: use a new-style go api

1 files changed, 18 insertions, 3 deletions

diff --git a/discord/ilo-kesi/parse.go b/discord/ilo-kesi/parse.go
index ec83f1f..f2e8bd5 100644
--- a/discord/ilo-kesi/parse.go
+++ b/discord/ilo-kesi/parse.go
@@ -2,11 +2,13 @@ package main
 
 import (
 	"bytes"
-	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"time"
 
+	"github.com/Xe/x/web/switchcounter"
 	"github.com/Xe/x/web/tokiponatokens"
 )
 
@@ -45,7 +47,16 @@ func (i ilo) parse(authorID, inp string) (*reply, error) {
 		switch req.Action {
 		case actionFront:
 			if req.Subject == actionWhat {
-				st, err := i.sw.Status(context.Background())
+				req := i.sw.Status()
+				resp, err := http.DefaultClient.Do(req)
+				if err != nil {
+					return nil, err
+				}
+				if resp.StatusCode/100 != 2 {
+					return nil, errors.New(resp.Status)
+				}
+				var st switchcounter.Status
+				err = json.NewDecoder(resp.Body).Decode(&st)
 				if err != nil {
 					return nil, err
 				}
@@ -61,10 +72,14 @@ func (i ilo) parse(authorID, inp string) (*reply, error) {
 
 			front := tokiToWithin[req.Subject]
 
-			_, err := i.sw.Switch(context.Background(), front)
+			hreq := i.sw.Switch(front)
+			resp, err := http.DefaultClient.Do(hreq)
 			if err != nil {
 				return nil, err
 			}
+			if resp.StatusCode/100 != 2 {
+				return nil, errors.New(resp.Status)
+			}
 
 			fmt.Fprintf(buf, "tenpo ni la jan %s li lawa insa.\n", req.Subject)
 			goto ok