Fix sending the right content-type for note images (#3091)

Author: nono

model/vfs/vfsafero/thumbs.go

@@ -156,6 +156,10 @@ func (t *thumbs) ServeNoteThumbContent(w http.ResponseWriter, req *http.Request,
 
 func (t *thumbs) makeName(imgID string, format string) string {
 	dir := imgID[:4]
-	name := fmt.Sprintf("%s-%s.jpg", imgID, format)
+	ext := ".jpg"
+	if format == consts.NoteImageOriginalFormat {
+		ext = ""
+	}
+	name := fmt.Sprintf("%s-%s%s", imgID, format, ext)
 	return path.Join("/", dir, name)
 }

model/vfs/vfsswift/thumbs_v2_v3.go

@@ -126,6 +126,7 @@ func (t *thumbsV2) ServeThumbContent(w http.ResponseWriter, req *http.Request, i
 	defer f.Close()
 
 	w.Header().Set("Etag", fmt.Sprintf(`"%s"`, o["Etag"]))
+	w.Header().Set("Content-Type", o["Content-Type"])
 	http.ServeContent(w, req, name, unixEpochZero, f)
 	return nil
 }
@@ -185,6 +186,7 @@ func (t *thumbsV2) ServeNoteThumbContent(w http.ResponseWriter, req *http.Reques
 	defer f.Close()
 
 	w.Header().Set("Etag", fmt.Sprintf(`"%s"`, o["Etag"]))
+	w.Header().Set("Content-Type", o["Content-Type"])
 	http.ServeContent(w, req, name, unixEpochZero, f)
 	return nil
 }