From f880c0ef1907196a93490206c23930b19429b526 Mon Sep 17 00:00:00 2001
From: Chris Cummer <chris.cummer@lendesk.com>
Date: Tue, 31 Jul 2018 14:21:02 -0700
Subject: [PATCH] Clean up the OpsGenie module's API credentials loading

---
 opsgenie/client.go | 12 ++++++++++--
 opsgenie/widget.go |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/opsgenie/client.go b/opsgenie/client.go
index 59ba2b90..b2a980cf 100644
--- a/opsgenie/client.go
+++ b/opsgenie/client.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+
+	"github.com/senorprogrammer/wtf/wtf"
 )
 
 type OnCallResponse struct {
@@ -28,16 +30,22 @@ type Parent struct {
 /* -------------------- Exported Functions -------------------- */
 
 func Fetch() (*OnCallResponse, error) {
-	apiKey := os.Getenv("WTF_OPS_GENIE_API_KEY")
 	scheduleUrl := "https://api.opsgenie.com/v2/schedules/on-calls?flat=true"
 
-	response, err := opsGenieRequest(scheduleUrl, apiKey)
+	response, err := opsGenieRequest(scheduleUrl, apiKey())
 
 	return response, err
 }
 
 /* -------------------- Unexported Functions -------------------- */
 
+func apiKey() string {
+	return wtf.Config.UString(
+		"wtf.mods.opsgenie.apiKey",
+		os.Getenv("WTF_OPS_GENIE_API_KEY"),
+	)
+}
+
 func opsGenieRequest(url string, apiKey string) (*OnCallResponse, error) {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
diff --git a/opsgenie/widget.go b/opsgenie/widget.go
index c95b7dcd..aab56db3 100644
--- a/opsgenie/widget.go
+++ b/opsgenie/widget.go
@@ -25,7 +25,7 @@ func (widget *Widget) Refresh() {
 	data, err := Fetch()
 
 	widget.UpdateRefreshedAt()
-	widget.View.SetTitle(widget.Name)
+	widget.View.SetTitle(widget.ContextualTitle(widget.Name))
 
 	var content string
 	if err != nil {