Added description to Pushover notification service.

notification/pushover.go

@@ -17,6 +17,7 @@ import (
 )
 
 type Pushover struct {
+	Description string
 	UserKey     string `json:"user_key"`
 	APIKey      string `json:"api_key"`
 	DeviceName  string `json:"device_name"`
@@ -70,6 +71,10 @@ func (po Pushover) Exists() bool {
 }
 
 func (po *Pushover) String() string {
+	if po.Description != "" {
+		return po.Description
+	}
+
 	return fmt.Sprintf("%s, %s", po.UserKey, po.APIKey)
 }
 
@@ -135,23 +140,30 @@ func (po *Pushover) Update(values url.Values) (err error) {
 	updated := Pushover{}
 	po.updated = &updated
 
+	// Prio
 	updated.Prio, err = strconv.Atoi(values.Get("prio"))
 	if err != nil {
 		return werr.Wrap(err)
 	}
 
+	// Description
+	updated.Description = strings.TrimSpace(values.Get("description"))
+
+	// API (application) key
 	givenAPIKey := values.Get("api_key")
 	if strings.TrimSpace(givenAPIKey) == "" {
 		return werr.New("API key cannot be empty")
 	}
 	updated.APIKey = strings.TrimSpace(givenAPIKey)
 
+	// User key
 	givenUserKey := values.Get("user_key")
 	if strings.TrimSpace(givenUserKey) == "" {
 		return werr.New("User key cannot be empty")
 	}
 	updated.UserKey = strings.TrimSpace(givenUserKey)
 
+	// Device name
 	updated.DeviceName = strings.TrimSpace(values.Get("device_name"))
 	return
 }
@@ -163,6 +175,7 @@ func (po *Pushover) Updated() Service {
 func (po *Pushover) Commit() {
 	updatedPushover := po.updated.(*Pushover)
 	po.Prio = updatedPushover.Prio
+	po.Description = updatedPushover.Description
 	po.APIKey = updatedPushover.APIKey
 	po.UserKey = updatedPushover.UserKey
 	po.DeviceName = updatedPushover.DeviceName
@@ -170,10 +183,12 @@ func (po *Pushover) Commit() {
 
 func (po Pushover) JSON() []byte {
 	data := struct {
+		Description string
 		APIKey      string `json:"api_key"`
 		UserKey     string `json:"user_key"`
 		DeviceName  string `json:"device_name"`
 	}{
+		po.Description,
 		po.APIKey,
 		po.UserKey,
 		po.DeviceName,

views/pages/notification/pushover.gotmpl

@@ -29,13 +29,16 @@ div.grid > div {
 		<div>Prio:</div>
 		<input type="number" min=0 name="prio" value="{{ .Data.Service.GetPrio }}">
 
-		<div>User key:</div>
+		<div>Description</div>
+		<input type="text" name="description" value="{{ .Data.Service.Description }}" style="width: 100%">
+
+		<div>User key: <span class="error">*</span></div>
 		<input type="text" name="user_key" value="{{ .Data.Service.UserKey }}" style="width: 100%">
 
-		<div>API (application) key:</div>
+		<div>API (application) key: <span class="error">*</span></div>
 		<input type="text" name="api_key" value="{{ .Data.Service.APIKey }}" style="width: 100%">
 
-		<div>Device name (optional):</div>
+		<div>Device name:</div>
 		<input type="text" name="device_name" value="{{ .Data.Service.DeviceName }}" style="width: 100%">
 
 		<button style="grid-column: 1 / -1; width: min-content;">OK</button>