fix cached annotations not displaying

data/annotation.go

@@ -3,13 +3,13 @@ package data
 type AnnotationsResponse struct {
 	Response struct {
 		Referent struct {
-			Annotations []Annotation `json:"annotations"`
+			Annotations []struct {
+				Body Annotation `json:"body"`
+			} `json:"annotations"`
 		} `json:"referent"`
 	} `json:"response"`
 }
 
 type Annotation struct {
-	Body struct {
+	HTML string `json:"html"`
-		Html string `json:"html"`
-	} `json:"body"`
 }

handlers/annotations.go

@@ -18,14 +18,14 @@ import (
 func Annotations(l *logrus.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		id := mux.Vars(r)["id"]
-
+		if a, err := getCache[data.Annotation]("annotation:" + id); err == nil {
-		if data, err := getCache[data.Annotation](id); err == nil {
 			encoder := json.NewEncoder(w)
 
 			w.Header().Set("content-type", "application/json")
-			if err = encoder.Encode(&data); err != nil {
+			if err = encoder.Encode(&a); err != nil {
 				l.Errorln(err)
 			}
+
 			return
 		}
 
@@ -65,25 +65,20 @@ func Annotations(l *logrus.Logger) http.HandlerFunc {
 			return
 		}
 
-		w.Header().Set("content-type", "application/json")
 		body := data.Response.Referent.Annotations[0].Body
-		body.Html = cleanBody(body.Html)
+		body.HTML = cleanBody(body.HTML)
-		response, err := json.Marshal(body)
 
-		if err != nil {
+		w.Header().Set("content-type", "application/json")
-			l.Errorf("could not marshal json: %s\n", err)
+		encoder := json.NewEncoder(w)
-			w.WriteHeader(http.StatusInternalServerError)
+
-			views.ErrorPage(500, "something went wrong").Render(context.Background(), w)
+		if err = encoder.Encode(&body); err != nil {
+			l.Errorln("Error sending response: ", err)
 			return
 		}
 
-		if err = setCache(id, body); err != nil {
+		if err = setCache("annotation:"+id, body); err != nil {
 			l.Errorln(err)
 		}
-
-		if _, err = w.Write(response); err != nil {
-			l.Errorln("Error sending response: ", err)
-		}
 	}
 }
 

handlers/cache.go

@@ -8,6 +8,10 @@ import (
 	"github.com/rramiachraf/dumb/data"
 )
 
+type cachable interface {
+	data.Album | data.Song | data.Annotation
+}
+
 var c, _ = bigcache.NewBigCache(bigcache.DefaultConfig(time.Hour * 24))
 
 func setCache(key string, entry interface{}) error {
@@ -19,7 +23,7 @@ func setCache(key string, entry interface{}) error {
 	return c.Set(key, data)
 }
 
-func getCache[v data.Album | data.Song | data.Annotation](key string) (v, error) {
+func getCache[v cachable](key string) (v, error) {
 	var decoded v
 
 	data, err := c.Get(key)

static/script.js

@@ -14,6 +14,7 @@ document.querySelectorAll("#lyrics a").forEach(item => {
 
 function getAnnotation(e) {
 	e.preventDefault()
+	//document.querySelector('.annotation')?.remove()
 	const uri = e.target.parentElement.getAttribute("href")
 	const presentAnnotation = document.getElementById(uri)
 	if (presentAnnotation) {