From 271056a4aa6d2e1d7c030f92af0633a2c911a253 Mon Sep 17 00:00:00 2001
From: binwiederhier <philipp.heckel@gmail.com>
Date: Tue, 20 Jun 2023 21:46:09 -0400
Subject: [PATCH] The last commit

---
 server/server.go | 13 ++++---------
 server/types.go  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/server/server.go b/server/server.go
index 4ae85ebb..2162f47d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -589,29 +589,24 @@ func (s *Server) handleWebConfig(w http.ResponseWriter, _ *http.Request, _ *visi
 	return err
 }
 
+// handleWebManifest serves the web app manifest for the progressive web app (PWA)
 func (s *Server) handleWebManifest(w http.ResponseWriter, _ *http.Request, _ *visitor) error {
 	response := &webManifestResponse{
 		Name:            "ntfy web",
-		Description:     "ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://heckel.io/ntfy.",
+		Description:     "ntfy lets you send push notifications via scripts from any computer or phone",
 		ShortName:       "ntfy",
 		Scope:           "/",
 		StartURL:        s.config.WebRoot,
 		Display:         "standalone",
 		BackgroundColor: "#ffffff",
 		ThemeColor:      "#317f6f",
-		Icons: []webManifestIcon{
+		Icons: []*webManifestIcon{
 			{SRC: "/static/images/pwa-192x192.png", Sizes: "192x192", Type: "image/png"},
 			{SRC: "/static/images/pwa-512x512.png", Sizes: "512x512", Type: "image/png"},
 		},
 	}
-
-	err := s.writeJSON(w, response)
-	if err != nil {
-		return err
-	}
-
 	w.Header().Set("Content-Type", "application/manifest+json")
-	return nil
+	return s.writeJSON(w, response)
 }
 
 // handleMetrics returns Prometheus metrics. This endpoint is only called if enable-metrics is set,
diff --git a/server/types.go b/server/types.go
index 39d355bd..043263a7 100644
--- a/server/types.go
+++ b/server/types.go
@@ -521,15 +521,15 @@ func (w *webPushSubscription) Context() log.Context {
 
 // https://developer.mozilla.org/en-US/docs/Web/Manifest
 type webManifestResponse struct {
-	Name            string            `json:"name"`
-	Description     string            `json:"description"`
-	ShortName       string            `json:"short_name"`
-	Scope           string            `json:"scope"`
-	StartURL        string            `json:"start_url"`
-	Display         string            `json:"display"`
-	BackgroundColor string            `json:"background_color"`
-	ThemeColor      string            `json:"theme_color"`
-	Icons           []webManifestIcon `json:"icons"`
+	Name            string             `json:"name"`
+	Description     string             `json:"description"`
+	ShortName       string             `json:"short_name"`
+	Scope           string             `json:"scope"`
+	StartURL        string             `json:"start_url"`
+	Display         string             `json:"display"`
+	BackgroundColor string             `json:"background_color"`
+	ThemeColor      string             `json:"theme_color"`
+	Icons           []*webManifestIcon `json:"icons"`
 }
 
 type webManifestIcon struct {