Merge branch 'devel'

cmd/backend/config.go

@@ -18,7 +18,7 @@ type Config struct {
 	DBName          string
 	Description     string
 	Domain          string
-	AtomFile        string
+	AtomFeed        string
 	FirebaseKey     string
 	GOBKeyFile      string
 	Link            string
@@ -39,7 +39,7 @@ func newConfig() *Config {
 	return &Config{
 		AESKeyFile:      "/var/www/cpolis/aes.key",
 		ArticleDir:      "/var/www/cpolis/articles",
-		AtomFile:        "/var/www/cpolis/cpolis.atom",
+		AtomFeed:        "/var/www/cpolis/cpolis.atom",
 		ConfigFile:      "/etc/cpolis/config.toml",
 		DBName:          "cpolis",
 		FirebaseKey:     "/var/www/cpolis/serviceAccountKey.json",
@@ -52,7 +52,7 @@ func newConfig() *Config {
 		PDFDir:          "/var/www/cpolis/pdfs",
 		PicsDir:         "/var/www/cpolis/pics",
 		Port:            ":8080",
-		Version:         "v0.13.2",
+		Version:         "v0.13.1",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }
@@ -110,7 +110,7 @@ func (c *Config) handleCliArgs() error {
 
 	flag.StringVar(&c.AESKeyFile, "aes", c.AESKeyFile, "aes key file")
 	flag.StringVar(&c.ArticleDir, "articles", c.ArticleDir, "articles directory")
-	flag.StringVar(&c.AtomFile, "feed", c.AtomFile, "atom feed file")
+	flag.StringVar(&c.AtomFeed, "feed", c.AtomFeed, "atom feed file")
 	flag.StringVar(&c.ConfigFile, "config", c.ConfigFile, "config file")
 	flag.StringVar(&c.DBName, "db", c.DBName, "DB name")
 	flag.StringVar(&c.Description, "desc", c.Description, "channel description")
@@ -187,10 +187,10 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		c.Domain = "https://" + c.Domain
 	}
 
-	if cliConfig.AtomFile != defaultConfig.AtomFile {
-		c.AtomFile = cliConfig.AtomFile
+	if cliConfig.AtomFeed != defaultConfig.AtomFeed {
+		c.AtomFeed = cliConfig.AtomFeed
 	}
-	c.AtomFile, err = mkFile(c.AtomFile, 0644, 0744)
+	c.AtomFeed, err = mkFile(c.AtomFeed, 0644, 0744)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
 	}

cmd/backend/images.go

@@ -1,6 +1,7 @@
 package backend
 
 import (
+	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
@@ -42,3 +43,20 @@ func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, err
 
 	return filename, nil
 }
+
+func ServeBase64Image(c *Config, filename string) (string, error) {
+	file := c.PicsDir + "/" + filename
+
+	img, err := os.Open(file)
+	if err != nil {
+		return "", fmt.Errorf("error opening file %v: %v", file, err)
+	}
+	defer img.Close()
+
+	imgBytes, err := io.ReadAll(img)
+	if err != nil {
+		return "", fmt.Errorf("error turning %v into bytes: %v", file, err)
+	}
+
+	return base64.StdEncoding.EncodeToString(imgBytes), nil
+}

cmd/calls/atom.go

@@ -14,7 +14,7 @@ func ServeAtomFeed(c *b.Config) http.HandlerFunc {
 			return
 		}
 
-		absFilepath, err := filepath.Abs(c.AtomFile)
+		absFilepath, err := filepath.Abs(c.AtomFeed)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/articles.go

@@ -93,13 +93,10 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, "Bitte den Titel eingeben.", http.StatusBadRequest)
 			return
 		}
-
 		if len(article.BannerLink) == 0 {
 			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
 			return
 		}
-		article.BannerLink = c.Domain + "/image/serve/" + article.BannerLink
-
 		if len(article.Summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
 			return
@@ -184,13 +181,6 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		bannerLink := r.PostFormValue("article-banner-url")
-		if len(bannerLink) == 0 {
-			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
-			return
-		}
-		bannerLink = c.Domain + "/image/serve/" + bannerLink
-
 		summary := r.PostFormValue("article-summary")
 		if len(summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
@@ -212,7 +202,6 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 		if err = db.UpdateAttributes(
 			&b.Attribute{Table: "articles", ID: id, AttName: "title", Value: title},
-			&b.Attribute{Table: "articles", ID: id, AttName: "banner_link", Value: bannerLink},
 			&b.Attribute{Table: "articles", ID: id, AttName: "summary", Value: summary},
 			&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: false},
 			&b.Attribute{Table: "articles", ID: id, AttName: "is_in_issue", Value: r.PostFormValue("issue") == "on"},
@@ -358,7 +347,13 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 		}
 
 		imgURL := strings.Split(data.Article.BannerLink, "/")
-		data.BannerImage = imgURL[len(imgURL)-1]
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		articleAbsName := fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md")
 		content, err := os.ReadFile(articleAbsName)
@@ -474,7 +469,7 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -629,7 +624,13 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 		}
 
 		imgURL := strings.Split(article.BannerLink, "/")
-		data.BannerImage = imgURL[len(imgURL)-1]
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		data.Article.Summary, err = b.ConvertToPlain(article.Summary)
 		if err != nil {
@@ -703,7 +704,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -806,7 +807,13 @@ func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		imgURL := strings.Split(data.Article.BannerLink, "/")
-		data.BannerImage = imgURL[len(imgURL)-1]
+		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage, err = b.ServeBase64Image(c, imgFileName)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		content, err := os.ReadFile(fmt.Sprint(c.ArticleDir, "/", data.Article.ID, ".md"))
 		if err != nil {

cmd/frontend/images.go

@@ -5,7 +5,6 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
@@ -18,6 +17,12 @@ func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
+		if err := r.ParseMultipartForm(10 << 20); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
 		file, _, err := r.FormFile("article-image")
 		if err != nil {
 			log.Println(err)
@@ -70,8 +75,20 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 			return
 		}
 
-		data := new(struct{ BannerImage string })
-		data.BannerImage = filename
+		base64Img, err := b.ServeBase64Image(c, filename)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		data := new(struct {
+			BannerImage string
+			URL         string
+		})
+
+		data.BannerImage = base64Img
+		data.URL = c.Domain + "/image/serve/" + filename
 
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/" + htmlFile)
 		if err = template.Must(tmpl, err).ExecuteTemplate(w, htmlTemplate, data); err != nil {
@@ -81,22 +98,3 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 		}
 	}
 }
-
-func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		absFilepath, err := filepath.Abs(c.PicsDir)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		http.ServeFile(w, r, absFilepath+"/"+r.PathValue("img"))
-	}
-}

cmd/frontend/issues.go

@@ -97,7 +97,7 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFeed, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/pdf.go

@@ -18,6 +18,12 @@ func UploadPDF(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
+		if err := r.ParseMultipartForm(10 << 20); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
 		file, _, err := r.FormFile("pdf-upload")
 		if err != nil {
 			log.Println(err)

cmd/main.go

@@ -68,7 +68,6 @@ func main() {
 	mux.HandleFunc("GET /article/write", f.WriteArticle(config, db, store))
 	mux.HandleFunc("GET /atom/serve", c.ServeAtomFeed(config))
 	mux.HandleFunc("GET /hub", f.ShowHub(config, db, store))
-	mux.HandleFunc("GET /image/{img}", f.ServeImage(config, store))
 	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config))
 	mux.HandleFunc("GET /issue/this", f.ShowCurrentIssue(config, db, store))
 	mux.HandleFunc("GET /logout", f.Logout(config, store))

web/templates/editor.html

@@ -3,7 +3,10 @@
 
 <form id="edit-area" hx-encoding="multipart/form-data">
     <div class="flex flex-col gap-y-1">
-        {{template "article-banner-template" .}}
+        <div class="w-full" id="article-banner-container">
+            <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+            <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.Article.BannerLink}}" />
+        </div>
 
         <div class="grid grid-cols-2 gap-4 items-center">
             <div class="flex flex-col">
@@ -14,7 +17,7 @@
             <div class="grid grid-cols-1 items-center">
                 <label class="btn text-center" for="article-banner">Titelbild</label>
                 <input class="hidden" id="article-banner" name="article-banner" type="file" required
-                    hx-post="/article/upload-banner" hx-swap="outerHTML" hx-target="#article-banner-container" />
+                    hx-post="/article/upload-banner" hx-target="#article-banner-container" />
             </div>
         </div>
     </div>
@@ -89,8 +92,8 @@
 {{end}}
 
 {{define "article-banner-template"}}
-<div id="article-banner-container">
-    <img src="/image/{{.BannerImage}}" alt="">
-    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.BannerImage}}" />
+<div class="w-full" id="article-banner-container">
+    <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.URL}}" />
 </div>
 {{end}}

web/templates/index.html

@@ -42,7 +42,7 @@
         <p>{{.Version}} - <strong>Alpha: Drastische Änderungen und Fehler vorbehalten.</strong></p>
     </footer>
 
-    <script src="https://unpkg.com/htmx.org@2.0.3"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.2"></script>
     <script src="https://unpkg.com/easymde/dist/easymde.min.js"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {

web/templates/review-article.html

@@ -3,7 +3,7 @@
 
 <div>
     <div class="w-full" id="article-banner-container">
-        <img src="/image/{{.BannerImage}}" alt="Banner Image">
+        <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
     </div>
 
     <span>Titel</span>