Merge branch 'devel'

.air.toml

@@ -6,12 +6,14 @@ tmp_dir = "tmp"
 args_bin = [
     "-aes tmp/cpolis.aes",
     "-articles tmp/articles",
+    "-banner-width 512",
     "-config tmp/config.toml",
     "-desc 'Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität'",
     "-domain localhost",
     "-feed tmp/cpolis.atom",
     "-firebase tmp/firebase.json",
     "-gob tmp/cpolis.gob",
+    "-img-width 256",
     "-link https://distrikt-ni-st.de",
     "-log tmp/cpolis.log",
     "-pdfs tmp/pdfs",
@@ -19,7 +21,6 @@ args_bin = [
     "-port 8080",
     "-title 'Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt'",
     "-web web",
-    "-width 1024",
 ]
 bin = "./tmp/main"
 cmd = "go build -o ./tmp/main ./cmd/main.go"

cmd/backend/atom.go

@@ -8,8 +8,6 @@ import (
 	"git.streifling.com/jason/atom"
 )
 
-type Feed struct{ *atom.Feed }
-
 func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 	feed := atom.NewFeed(c.Title)
 	feed.ID = atom.NewID("urn:feed:1")
@@ -22,41 +20,45 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 
 	articles, err := db.GetCertainArticles("published", true)
 	if err != nil {
-		return nil, fmt.Errorf("error getting published articles for RSS feed: %v", err)
+		return nil, fmt.Errorf("error getting published articles for Atom feed: %v", err)
 	}
 
 	for _, article := range articles {
 		articleTitle, err := ConvertToPlain(article.Title)
 		if err != nil {
-			return nil, fmt.Errorf("error converting title to plain text for RSS feed: %v", err)
+			return nil, fmt.Errorf("error converting title to plain text for Atom feed: %v", err)
 		}
 		entry := atom.NewEntry(articleTitle)
 		entry.ID = atom.NewID(fmt.Sprint("urn:entry:", article.ID))
-		entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
 		entry.Published = atom.NewDate(article.Created)
 
-		linkID := entry.AddLink(atom.NewLink(article.BannerLink))
+		if article.AutoGenerated {
-		entry.Links[linkID].Rel = "enclosure"
+			entry.Content = atom.NewContent(atom.InlineText, "text", "")
-		entry.Links[linkID].Type = "image/webp"
+		} else {
+			entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
+
+			articleSummary, err := ConvertToPlain(article.Summary)
+			if err != nil {
+				return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
+			}
+			entry.Summary = atom.NewText("text", articleSummary)
+		}
+
+		if len(article.BannerLink) > 0 {
+			linkID := entry.AddLink(atom.NewLink(article.BannerLink))
+			entry.Links[linkID].Rel = "enclosure"
+			entry.Links[linkID].Type = "image/webp"
+		}
 
 		user, err := db.GetUser(c, article.AuthorID)
 		if err != nil {
-			return nil, fmt.Errorf("error getting user user info for RSS feed: %v", err)
+			return nil, fmt.Errorf("error getting user user info for Atom feed: %v", err)
 		}
 		entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
 
-		articleSummary, err := ConvertToPlain(article.Summary)
-		if err != nil {
-			return nil, fmt.Errorf("error converting description to plain text for RSS feed: %v", err)
-		}
-		if article.AutoGenerated {
-			articleSummary = "auto generated"
-		}
-		entry.Summary = atom.NewText("text", articleSummary)
-
 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {
-			return nil, fmt.Errorf("error getting tags for articles for RSS feed: %v", err)
+			return nil, fmt.Errorf("error getting tags for articles for Atom feed: %v", err)
 		}
 		for _, tag := range tags {
 			entry.AddCategory(atom.NewCategory(tag.Name))
@@ -79,7 +81,7 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 
 	atom, err := feed.ToXML("UTF-8")
 	if err != nil {
-		return nil, fmt.Errorf("error converting RSS feed to XML: %v", err)
+		return nil, fmt.Errorf("error converting Atom feed to XML: %v", err)
 	}
 
 	return &atom, nil

cmd/backend/config.go

@@ -12,44 +12,48 @@ import (
 )
 
 type Config struct {
-	AESKeyFile   string
+	AESKeyFile      string
-	ArticleDir   string
+	ArticleDir      string
-	ConfigFile   string
+	ConfigFile      string
-	DBName       string
+	DBName          string
-	Description  string
+	Description     string
-	Domain       string
+	Domain          string
-	AtomFeed     string
+	AtomFile        string
-	FirebaseKey  string
+	FirebaseKey     string
-	GOBKeyFile   string
+	GOBKeyFile      string
-	Link         string
+	Link            string
-	LogFile      string
+	LogFile         string
-	PDFDir       string
+	PDFDir          string
-	PicsDir      string
+	PicsDir         string
-	Port         string
+	Port            string
-	Title        string
+	Title           string
-	Version      string
+	Version         string
-	WebDir       string
+	WebDir          string
-	MaxImgHeight int
+	MaxBannerHeight int
-	MaxImgWidth  int
+	MaxBannerWidth  int
+	MaxImgHeight    int
+	MaxImgWidth     int
 }
 
 func newConfig() *Config {
 	return &Config{
-		AESKeyFile:   "/var/www/cpolis/aes.key",
+		AESKeyFile:      "/var/www/cpolis/aes.key",
-		ArticleDir:   "/var/www/cpolis/articles",
+		ArticleDir:      "/var/www/cpolis/articles",
-		ConfigFile:   "/etc/cpolis/config.toml",
+		AtomFile:        "/var/www/cpolis/cpolis.atom",
-		DBName:       "cpolis",
+		ConfigFile:      "/etc/cpolis/config.toml",
-		AtomFeed:     "/var/www/cpolis/cpolis.atom",
+		DBName:          "cpolis",
-		FirebaseKey:  "/var/www/cpolis/serviceAccountKey.json",
+		FirebaseKey:     "/var/www/cpolis/serviceAccountKey.json",
-		GOBKeyFile:   "/var/www/cpolis/gob.key",
+		GOBKeyFile:      "/var/www/cpolis/gob.key",
-		LogFile:      "/var/log/cpolis.log",
+		LogFile:         "/var/log/cpolis.log",
-		MaxImgHeight: 1080,
+		MaxBannerHeight: 1080,
-		MaxImgWidth:  1920,
+		MaxBannerWidth:  1920,
-		PDFDir:       "/var/www/cpolis/pdfs",
+		MaxImgHeight:    1080,
-		PicsDir:      "/var/www/cpolis/pics",
+		MaxImgWidth:     1920,
-		Port:         ":8080",
+		PDFDir:          "/var/www/cpolis/pdfs",
-		Version:      "v0.13.0",
+		PicsDir:         "/var/www/cpolis/pics",
-		WebDir:       "/var/www/cpolis/web",
+		Port:            ":8080",
+		Version:         "v0.13.3",
+		WebDir:          "/var/www/cpolis/web",
 	}
 }
 
@@ -106,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.AtomFeed, "feed", c.AtomFeed, "atom feed file")
+	flag.StringVar(&c.AtomFile, "feed", c.AtomFile, "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")
@@ -119,8 +123,10 @@ func (c *Config) handleCliArgs() error {
 	flag.StringVar(&c.PicsDir, "pics", c.PicsDir, "pictures directory")
 	flag.StringVar(&c.Title, "title", c.Title, "channel title")
 	flag.StringVar(&c.WebDir, "web", c.WebDir, "web directory")
-	flag.IntVar(&c.MaxImgHeight, "height", c.MaxImgHeight, "maximum image height")
+	flag.IntVar(&c.MaxBannerHeight, "banner-height", c.MaxBannerHeight, "maximum banner height")
-	flag.IntVar(&c.MaxImgWidth, "width", c.MaxImgWidth, "maximum image width")
+	flag.IntVar(&c.MaxBannerWidth, "banner-width", c.MaxBannerWidth, "maximum banner width")
+	flag.IntVar(&c.MaxImgHeight, "img-height", c.MaxImgHeight, "maximum image height")
+	flag.IntVar(&c.MaxImgWidth, "img-width", c.MaxImgWidth, "maximum image width")
 	flag.IntVar(&port, "port", port, "port")
 	flag.Parse()
 
@@ -181,10 +187,10 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		c.Domain = "https://" + c.Domain
 	}
 
-	if cliConfig.AtomFeed != defaultConfig.AtomFeed {
+	if cliConfig.AtomFile != defaultConfig.AtomFile {
-		c.AtomFeed = cliConfig.AtomFeed
+		c.AtomFile = cliConfig.AtomFile
 	}
-	c.AtomFeed, err = mkFile(c.AtomFeed, 0644, 0744)
+	c.AtomFile, err = mkFile(c.AtomFile, 0644, 0744)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
 	}
@@ -217,6 +223,14 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		return fmt.Errorf("error setting up file: %v", err)
 	}
 
+	if cliConfig.MaxBannerHeight != defaultConfig.MaxBannerHeight {
+		c.MaxBannerHeight = cliConfig.MaxBannerHeight
+	}
+
+	if cliConfig.MaxBannerWidth != defaultConfig.MaxBannerWidth {
+		c.MaxBannerWidth = cliConfig.MaxBannerWidth
+	}
+
 	if cliConfig.MaxImgHeight != defaultConfig.MaxImgHeight {
 		c.MaxImgHeight = cliConfig.MaxImgHeight
 	}

cmd/backend/images.go

@@ -13,7 +13,7 @@ import (
 
 var ErrUnsupportedFormat error = image.ErrFormat // used internally by imaging
 
-func SaveImage(c *Config, src io.Reader) (string, error) {
+func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, error) {
 	img, err := imaging.Decode(src, imaging.AutoOrientation(true))
 	if err != nil {
 		if err == ErrUnsupportedFormat {
@@ -22,15 +22,15 @@ func SaveImage(c *Config, src io.Reader) (string, error) {
 		return "", fmt.Errorf("error decoding image: %v", err)
 	}
 
-	if img.Bounds().Dy() > c.MaxImgHeight {
+	if img.Bounds().Dy() > maxHeight {
-		img = imaging.Resize(img, 0, c.MaxImgHeight, imaging.Lanczos)
+		img = imaging.Resize(img, 0, maxHeight, imaging.Lanczos)
 	}
-	if img.Bounds().Dx() > c.MaxImgWidth {
+	if img.Bounds().Dx() > maxWidth {
-		img = imaging.Resize(img, c.MaxImgWidth, 0, imaging.Lanczos)
+		img = imaging.Resize(img, maxWidth, 0, imaging.Lanczos)
 	}
 
 	filename := fmt.Sprint(uuid.New(), ".webp")
-	file, err := os.Create(c.PicsDir + "/" + filename)
+	file, err := os.Create(path + filename)
 	if err != nil {
 		return "", fmt.Errorf("error creating new image file: %v", err)
 	}

cmd/backend/rss.go

@@ -1,103 +0,0 @@
-package backend
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"time"
-
-	"git.streifling.com/jason/rss"
-)
-
-func GenerateRSS(c *Config, db *DB) (*string, error) {
-	channel := &rss.Channel{
-		Title:       c.Title,
-		Link:        c.Link,
-		Description: c.Description,
-		Items:       make([]*rss.Item, 0),
-	}
-
-	articles, err := db.GetCertainArticles("published", true)
-	if err != nil {
-		return nil, fmt.Errorf("error getting published articles for RSS feed: %v", err)
-	}
-
-	for _, article := range articles {
-		tags, err := db.GetArticleTags(article.ID)
-		if err != nil {
-			return nil, fmt.Errorf("error getting tags for articles for RSS feed: %v", err)
-		}
-		tagNames := make([]string, 0)
-		for _, tag := range tags {
-			tagNames = append(tagNames, tag.Name)
-		}
-
-		if article.IsInIssue || article.AutoGenerated {
-			tagNames = append(tagNames, fmt.Sprint("Orient Express ", article.IssueID))
-		}
-		if article.AutoGenerated {
-			tagNames = append(tagNames, "autogenerated")
-		}
-
-		user, err := db.GetUser(c, article.AuthorID)
-		if err != nil {
-			return nil, fmt.Errorf("error getting user user info for RSS feed: %v", err)
-		}
-
-		articleTitle, err := ConvertToPlain(article.Title)
-		if err != nil {
-			return nil, fmt.Errorf("error converting title to plain text for RSS feed: %v", err)
-		}
-
-		articleDescription, err := ConvertToPlain(article.Summary)
-		if err != nil {
-			return nil, fmt.Errorf("error converting description to plain text for RSS feed: %v", err)
-		}
-
-		item := &rss.Item{
-			Author:      user.FirstName + " " + user.LastName,
-			Categories:  tagNames,
-			Description: articleDescription,
-			Guid:        string(article.ID),
-			Link:        article.ContentLink,
-			PubDate:     article.Created.Format(time.RFC1123Z),
-			Title:       articleTitle,
-		}
-
-		// if article.AutoGenerated {
-		// 	item.Enclosure = &rss.Enclosure{
-		// 		Url:    article.EncURL,
-		// 		Lenght: article.EncLength,
-		// 		Type:   article.EncType,
-		// 	}
-		// }
-		//
-		channel.Items = append(channel.Items, item)
-	}
-
-	feed := rss.NewFeed()
-	feed.Channels = append(feed.Channels, channel)
-	rss, err := feed.ToXML("UTF-8")
-	if err != nil {
-		return nil, fmt.Errorf("error converting RSS feed to XML: %v", err)
-	}
-
-	return &rss, nil
-}
-
-func SaveRSS(filename string, feed *string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error creating file for RSS feed: %v", err)
-	}
-	defer file.Close()
-	if err = file.Chmod(0644); err != nil {
-		return fmt.Errorf("error setting permissions for RSS file: %v", err)
-	}
-
-	if _, err = io.WriteString(file, *feed); err != nil {
-		return fmt.Errorf("error writing to RSS file: %v", err)
-	}
-
-	return nil
-}

cmd/calls/atom.go

@@ -0,0 +1,26 @@
+package calls
+
+import (
+	"log"
+	"net/http"
+	"path/filepath"
+
+	b "streifling.com/jason/cpolis/cmd/backend"
+)
+
+func ServeAtomFeed(c *b.Config) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if !tokenIsVerified(w, r, c) {
+			return
+		}
+
+		absFilepath, err := filepath.Abs(c.AtomFile)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		http.ServeFile(w, r, absFilepath)
+	}
+}

cmd/calls/images.go

@@ -8,7 +8,7 @@ import (
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
-func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
+func ServeImage(c *b.Config) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if !tokenIsVerified(w, r, c) {
 			return

cmd/frontend/articles.go

@@ -80,7 +80,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 		article := &b.Article{
 			Title:         r.PostFormValue("article-title"),
-			BannerLink:    r.PostFormValue("article-banner-url"),
+			BannerLink:    c.Domain + "/image/serve/" + r.PostFormValue("article-banner-url"),
 			Summary:       r.PostFormValue("article-summary"),
 			Published:     false,
 			Rejected:      false,
@@ -93,10 +93,6 @@ 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
-		}
 		if len(article.Summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
 			return
@@ -181,6 +177,11 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
+		bannerLink := r.PostFormValue("article-banner-url")
+		if len(bannerLink) != 0 {
+			bannerLink = c.Domain + "/image/serve/" + bannerLink
+		}
+
 		summary := r.PostFormValue("article-summary")
 		if len(summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
@@ -202,6 +203,7 @@ 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"},
@@ -347,13 +349,7 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 		}
 
 		imgURL := strings.Split(data.Article.BannerLink, "/")
-		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage = imgURL[len(imgURL)-1]
-		data.BannerImage, err = 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)
@@ -469,7 +465,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.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -624,13 +620,7 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 		}
 
 		imgURL := strings.Split(article.BannerLink, "/")
-		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage = imgURL[len(imgURL)-1]
-		data.BannerImage, err = 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 {
@@ -704,7 +694,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.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -807,13 +797,7 @@ func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		imgURL := strings.Split(data.Article.BannerLink, "/")
-		imgFileName := imgURL[len(imgURL)-1]
+		data.BannerImage = imgURL[len(imgURL)-1]
-		data.BannerImage, err = 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

@@ -1,35 +1,15 @@
 package frontend
 
 import (
-	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"html/template"
-	"io"
 	"log"
 	"net/http"
-	"os"
+	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
-func serveBase64Image(c *b.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
-}
-
 func UploadImage(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 {
@@ -38,12 +18,6 @@ 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)
@@ -52,7 +26,7 @@ func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 		}
 		defer file.Close()
 
-		filename, err := b.SaveImage(c, file)
+		filename, err := b.SaveImage(file, c.MaxImgHeight, c.MaxImgWidth, c.PicsDir+"/")
 		if err != nil {
 			if err == b.ErrUnsupportedFormat {
 				http.Error(w, "Das Dateiformat wird nicht unterstützt.", http.StatusBadRequest)
@@ -69,51 +43,6 @@ func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	}
 }
 
-func UploadIssueImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		if err := r.ParseMultipartForm(10 << 20); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		file, _, err := r.FormFile("issue-image")
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer file.Close()
-
-		filename, err := b.SaveImage(c, file)
-		if err != nil {
-			if err == b.ErrUnsupportedFormat {
-				http.Error(w, "Das Dateiformat wird nicht unterstützt.", http.StatusBadRequest)
-				return
-			}
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		session.Values["issue-image"] = filename
-		if err = session.Save(r, w); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		w.WriteHeader(http.StatusOK)
-	}
-}
-
 func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if _, err := getSession(w, r, c, s); err != nil {
@@ -130,7 +59,7 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 		}
 		defer file.Close()
 
-		filename, err := b.SaveImage(c, file)
+		filename, err := b.SaveImage(file, c.MaxBannerHeight, c.MaxBannerWidth, c.PicsDir+"/")
 		if err != nil {
 			if err == b.ErrUnsupportedFormat {
 				http.Error(w, "Das Dateiformat wird nicht unterstützt.", http.StatusBadRequest)
@@ -141,20 +70,8 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 			return
 		}
 
-		base64Img, err := serveBase64Image(c, filename)
+		data := new(struct{ BannerImage string })
-		if err != nil {
+		data.BannerImage = filename
-			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 {
@@ -164,3 +81,22 @@ 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

@@ -41,10 +41,6 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			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.ID, err = db.AddArticle(article)
 		if err != nil {
@@ -97,7 +93,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.AtomFeed, feed); err != nil {
+		if err = b.SaveAtomFeed(c.AtomFile, feed); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/pdf.go

@@ -18,12 +18,6 @@ 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/frontend/users.go

@@ -11,8 +11,8 @@ import (
 )
 
 func checkUserStrings(user *b.User) (string, int, bool) {
-	userLen := 255
+	userLen := 63 // max value for utf-8 at 255 bytes
-	nameLen := 56 // max value when aes encrypting up to 255 bytes
+	nameLen := 56 // max value when aes encrypting utf-8 at up to 255 bytes
 
 	if len(user.UserName) > userLen {
 		return "Benutzername", userLen, false

cmd/main.go

@@ -66,8 +66,10 @@ func main() {
 	mux.HandleFunc("GET /article/review-unpublished/{id}", f.ReviewArticle(config, db, store, "publish", "Artikel veröffentlichen", "Veröffentlichen"))
 	mux.HandleFunc("GET /article/serve/{id}", c.ServeArticle(config, db))
 	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/serve/{pic}", c.ServeImage(config, 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))
 	mux.HandleFunc("GET /pdf/get-list", c.ServePDFList(config))

go.mod

@@ -3,9 +3,8 @@ module streifling.com/jason/cpolis
 go 1.23.2
 
 require (
-	firebase.google.com/go/v4 v4.14.1
+	firebase.google.com/go/v4 v4.15.0
 	git.streifling.com/jason/atom v1.0.0
-	git.streifling.com/jason/rss v0.1.3
 	github.com/BurntSushi/toml v1.4.0
 	github.com/chai2010/webp v1.1.1
 	github.com/disintegration/imaging v1.6.2
@@ -16,19 +15,19 @@ require (
 	github.com/yuin/goldmark v1.7.8
 	golang.org/x/crypto v0.28.0
 	golang.org/x/term v0.25.0
-	google.golang.org/api v0.201.0
+	google.golang.org/api v0.203.0
 )
 
 require (
-	cel.dev/expr v0.16.2 // indirect
+	cel.dev/expr v0.18.0 // indirect
 	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/auth v0.9.8 // indirect
+	cloud.google.com/go/auth v0.9.9 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.2 // indirect
 	cloud.google.com/go/firestore v1.17.0 // indirect
-	cloud.google.com/go/iam v1.2.1 // indirect
+	cloud.google.com/go/iam v1.2.2 // indirect
-	cloud.google.com/go/longrunning v0.6.1 // indirect
+	cloud.google.com/go/longrunning v0.6.2 // indirect
-	cloud.google.com/go/monitoring v1.21.1 // indirect
+	cloud.google.com/go/monitoring v1.21.2 // indirect
 	cloud.google.com/go/storage v1.45.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3 // indirect
@@ -70,10 +69,10 @@ require (
 	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	google.golang.org/appengine/v2 v2.0.6 // indirect
-	google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
 	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/grpc/stats/opentelemetry v0.0.0-20241018153737-98959d9a4904 // indirect
+	google.golang.org/grpc/stats/opentelemetry v0.0.0-20241025232817-cb329375b14e // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 )

go.sum

@@ -1,36 +1,34 @@
-cel.dev/expr v0.16.2 h1:RwRhoH17VhAu9U5CMvMhH1PDVgf0tuz9FT+24AfMLfU=
+cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
-cel.dev/expr v0.16.2/go.mod h1:gXngZQMkWJoSbE8mOzehJlXQyubn/Vg0vR9/F3W7iw8=
+cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
 cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/auth v0.9.8 h1:+CSJ0Gw9iVeSENVCKJoLHhdUykDgXSc4Qn+gu2BRtR8=
+cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ=
-cloud.google.com/go/auth v0.9.8/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
+cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
 cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
 cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
 cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
 cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
 cloud.google.com/go/firestore v1.17.0 h1:iEd1LBbkDZTFsLw3sTH50eyg4qe8eoG6CjocmEXO9aQ=
 cloud.google.com/go/firestore v1.17.0/go.mod h1:69uPx1papBsY8ZETooc71fOhoKkD70Q1DwMrtKuOT/Y=
-cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU=
+cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA=
-cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g=
+cloud.google.com/go/iam v1.2.2/go.mod h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY=
-cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs=
+cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk=
-cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A=
+cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM=
-cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc=
+cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0MK+hc=
-cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0=
+cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
-cloud.google.com/go/monitoring v1.21.1 h1:zWtbIoBMnU5LP9A/fz8LmWMGHpk4skdfeiaa66QdFGc=
+cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU=
-cloud.google.com/go/monitoring v1.21.1/go.mod h1:Rj++LKrlht9uBi8+Eb530dIrzG/cU/lB8mt+lbeFK1c=
+cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU=
 cloud.google.com/go/storage v1.45.0 h1:5av0QcIVj77t+44mV4gffFC/LscFRUhto6UBMB5SimM=
 cloud.google.com/go/storage v1.45.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE=
 cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew=
 cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-firebase.google.com/go/v4 v4.14.1 h1:4qiUETaFRWoFGE1XP5VbcEdtPX93Qs+8B/7KvP2825g=
+firebase.google.com/go/v4 v4.15.0 h1:k27M+cHbyN1YpBI2Cf4NSjeHnnYRB9ldXwpqA5KikN0=
-firebase.google.com/go/v4 v4.14.1/go.mod h1:fgk2XshgNDEKaioKco+AouiegSI9oTWVqRaBdTTGBoM=
+firebase.google.com/go/v4 v4.15.0/go.mod h1:S/4MJqVZn1robtXkHhpRUbwOC4gdYtgsiMMJQ4x+xmQ=
 git.streifling.com/jason/atom v1.0.0 h1:E88z4S7JeT6T+WuAaJWnGwCWTx+vzSJ6giUL51MdptI=
 git.streifling.com/jason/atom v1.0.0/go.mod h1:FNTYJfatYaIOQn4OKy8y+Mtohqm3MeyEGZUu4bMtZ9E=
-git.streifling.com/jason/rss v0.1.3 h1:fd3j4ZtcLehapcmmroo3AP3X34gRHC4xzpfV6bDV1ZU=
-git.streifling.com/jason/rss v0.1.3/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
@@ -227,8 +225,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.201.0 h1:+7AD9JNM3tREtawRMu8sOjSbb8VYcYXJG/2eEOmfDu0=
+google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU=
-google.golang.org/api v0.201.0/go.mod h1:HVY0FCHVs89xIW9fzf/pBvOEm+OolHa86G/txFezyq4=
+google.golang.org/api v0.203.0/go.mod h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw=
@@ -236,12 +234,12 @@ google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE=
+google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU=
-google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE=
+google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38/go.mod h1:xBI+tzfqGGN2JBeSebfKXFSdBpWVQ7sLW40PTupVRm4=
-google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
+google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=
-google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
+google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -249,8 +247,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
 google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/grpc/stats/opentelemetry v0.0.0-20241018153737-98959d9a4904 h1:Lplo3VKrYtWeryBkDI4SZ4kJTFaWO4qUGs+xX7N2bFc=
+google.golang.org/grpc/stats/opentelemetry v0.0.0-20241025232817-cb329375b14e h1:SoMI+r+Qsp379U9BlVzrHtqAqYP3NEv9vNhYqUaAWOg=
-google.golang.org/grpc/stats/opentelemetry v0.0.0-20241018153737-98959d9a4904/go.mod h1:jzYlkSMbKypzuu6xoAEijsNVo9ZeDF1u/zCfFgsx7jg=
+google.golang.org/grpc/stats/opentelemetry v0.0.0-20241025232817-cb329375b14e/go.mod h1:jzYlkSMbKypzuu6xoAEijsNVo9ZeDF1u/zCfFgsx7jg=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

web/templates/editor.html

@@ -3,10 +3,7 @@
 
 <form id="edit-area" hx-encoding="multipart/form-data">
     <div class="flex flex-col gap-y-1">
-        <div class="w-full" id="article-banner-container">
+        {{template "article-banner-template" .}}
-            <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">
@@ -17,7 +14,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-target="#article-banner-container" />
+                    hx-post="/article/upload-banner" hx-swap="outerHTML" hx-target="#article-banner-container" />
             </div>
         </div>
     </div>
@@ -92,8 +89,8 @@
 {{end}}
 
 {{define "article-banner-template"}}
-<div class="w-full" id="article-banner-container">
+<div id="article-banner-container">
-    <img src="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+    <img src="/image/{{.BannerImage}}" alt="">
-    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.URL}}" />
+    <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.BannerImage}}" />
 </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.2"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.3"></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="data:image/webp;base64,{{.BannerImage}}" alt="Banner Image">
+        <img src="/image/{{.BannerImage}}" alt="Banner Image">
     </div>
 
     <span>Titel</span>