From 6908e744e14f469514e91949d896691748362623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miha=20Frange=C5=BE?= <miha.frangez@gmail.com>
Date: Sun, 4 Oct 2020 10:51:39 +0200
Subject: [PATCH] Make CI happy

---
 modules/uptimerobot/widget.go | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/uptimerobot/widget.go b/modules/uptimerobot/widget.go
index f9917b5e..ec8cc96d 100644
--- a/modules/uptimerobot/widget.go
+++ b/modules/uptimerobot/widget.go
@@ -1,9 +1,9 @@
 package uptimerobot
 
 import (
-	"fmt"
-	"errors"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -92,11 +92,9 @@ func (widget *Widget) contentFrom(monitors []Monitor) string {
 		switch monitor.State {
 		case 2:
 			prefix += "[green] + "
-			break
 		case 8:
 		case 9:
 			prefix += "[red] - "
-			break
 		default:
 			prefix += "[yellow] ~ "
 		}
@@ -113,9 +111,9 @@ func (widget *Widget) contentFrom(monitors []Monitor) string {
 }
 
 type Monitor struct {
-	Name   string `json:"friendly_name"`
+	Name string `json:"friendly_name"`
 	// Monitor state, see: https://uptimerobot.com/api/#parameters
-	State  int8   `json:"status"`
+	State int8 `json:"status"`
 	// Uptime ratio, preformatted, e.g.: 100.000-97.233-96.975
 	Uptime string `json:"custom_uptime_ratio"`
 }
@@ -124,8 +122,8 @@ func (widget *Widget) getMonitors() ([]Monitor, error) {
 	// See: https://uptimerobot.com/api/#getMonitorsWrap
 	resp, err_h := http.PostForm("https://api.uptimerobot.com/v2/getMonitors",
 		url.Values{
-			"api_key": {widget.settings.apiKey}, 
-			"format": {"json"},
+			"api_key":              {widget.settings.apiKey},
+			"format":               {"json"},
 			"custom_uptime_ratios": {widget.settings.uptimePeriods},
 		},
 	)
@@ -138,19 +136,22 @@ func (widget *Widget) getMonitors() ([]Monitor, error) {
 
 	// First pass to read the status
 	c := make(map[string]json.RawMessage)
-	json.Unmarshal([]byte(body), &c)
+	err_j1 := json.Unmarshal([]byte(body), &c)
 
-	stat := string(c["stat"])
-	if stat != `"ok"` {
+	if err_j1 != nil {
+		return nil, err_j1
+	}
+
+	if string(c["stat"]) != `"ok"` {
 		return nil, errors.New(string(body))
 	}
 
 	// Second pass to get the actual info
 	var monitors []Monitor
-	err_j := json.Unmarshal(c["monitors"], &monitors)
+	err_j2 := json.Unmarshal(c["monitors"], &monitors)
 
-	if err_j != nil {
-		return nil, err_j
+	if err_j2 != nil {
+		return nil, err_j2
 	}
 
 	return monitors, nil