Fixed small bug

.air.toml

@@ -3,42 +3,52 @@ testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-  args_bin = []
-  bin = "./tmp/main -key tmp/key.gob -log tmp/cpolis.log -pics tmp/pics -rss tmp/orientexpress_alle.rss -web web"
-  cmd = "go build -o ./tmp/main ./cmd/main.go"
-  delay = 0
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-  exclude_file = []
-  exclude_regex = ["_test.go"]
-  exclude_unchanged = false
-  follow_symlink = false
-  full_bin = ""
-  include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html", "css"]
-  include_file = []
-  kill_delay = "0s"
-  log = "build-errors.log"
-  poll = false
-  poll_interval = 0
-  rerun = false
-  rerun_delay = 500
-  send_interrupt = false
-  stop_on_error = false
+args_bin = [
+    "-desc 'Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität'",
+    "-domain localhost:8080",
+    "-key tmp/key.gob",
+    "-link https://distrikt-ni-st.de",
+    "-log tmp/cpolis.log",
+    "-pics tmp/pics",
+    "-rss tmp/orientexpress_alle.rss",
+    "-title 'Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt'",
+    "-web web"
+]
+bin = "./tmp/main"
+cmd = "go build -o ./tmp/main ./cmd/main.go"
+delay = 0
+exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+exclude_file = []
+exclude_regex = ["_test.go"]
+exclude_unchanged = false
+follow_symlink = false
+full_bin = ""
+include_dir = []
+include_ext = ["go", "tpl", "tmpl", "html", "css"]
+include_file = []
+kill_delay = "0s"
+log = "build-errors.log"
+poll = false
+poll_interval = 0
+rerun = false
+rerun_delay = 500
+send_interrupt = false
+stop_on_error = false
 
 [color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
+app = ""
+build = "yellow"
+main = "magenta"
+runner = "green"
+watcher = "cyan"
 
 [log]
-  main_only = false
-  time = false
+main_only = false
+time = false
 
 [misc]
-  clean_on_exit = false
+clean_on_exit = false
 
 [screen]
-  clear_on_rebuild = false
-  keep_scroll = true
+clear_on_rebuild = false
+keep_scroll = true

cmd/control/cli.go

@@ -7,12 +7,16 @@ import (
 )
 
 type CliArgs struct {
+	Description string
 	DBName      string
+	Domain      string
 	KeyFile     string
+	Link        string
 	LogFile     string
 	Port        string
 	PicsDir     string
 	RSSFile     string
+	Title       string
 	WebDir      string
 }
 
@@ -20,13 +24,17 @@ func HandleCliArgs() (*CliArgs, error) {
 	var err error
 	cliArgs := new(CliArgs)
 
+	flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
+	flag.StringVar(&cliArgs.Description, "desc", "Description", "Channel description")
+	flag.StringVar(&cliArgs.Domain, "domain", "", "domain name")
 	keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file")
+	flag.StringVar(&cliArgs.Link, "link", "Link", "Channel Link")
 	logFile := flag.String("log", "/var/log/cpolis.log", "log file")
-	picsDir := flag.String("pics", "/var/www/cpolis/pics", "pictures directory")
+	flag.StringVar(&cliArgs.PicsDir, "pics", "pics", "pictures directory")
 	port := flag.Int("port", 8080, "port")
 	rssFile := flag.String("rss", "/var/www/cpolis/cpolis.rss", "RSS file")
+	flag.StringVar(&cliArgs.Title, "title", "Title", "Channel title")
 	webDir := flag.String("web", "/var/www/cpolis/web", "web directory")
-	flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name")
 	flag.Parse()
 
 	cliArgs.KeyFile, err = filepath.Abs(*keyFile)
@@ -39,7 +47,7 @@ func HandleCliArgs() (*CliArgs, error) {
 		return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err)
 	}
 
-	cliArgs.PicsDir, err = filepath.Abs(*picsDir)
+	_, err = filepath.Abs(cliArgs.PicsDir)
 	if err != nil {
 		return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err)
 	}

cmd/control/rss.go

@@ -97,7 +97,7 @@ func GenerateRSS(db *model.DB, title, link, desc string) (*string, error) {
 
 		channel.Items = append(channel.Items, &rss.Item{
 			Title:       articleTitle,
-			Author:      user.FirstName + user.LastName,
+			Author:      user.FirstName + " " + user.LastName,
 			PubDate:     article.Created.Format(time.RFC1123Z),
 			Description: articleDescription,
 			Content:     &rss.Content{Value: articleContent},

cmd/main.go

@@ -60,7 +60,10 @@ func main() {
 	mux.HandleFunc("GET /rejected-articles", view.ShowRejectedArticles(args, db, store))
 	mux.HandleFunc("GET /review-rejected-article/{id}", view.ReviewRejectedArticle(args, db, store))
 	mux.HandleFunc("GET /review-unpublished-article/{id}", view.ReviewUnpublishedArticle(args, db, store))
-	mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, args.RSSFile) })
+	mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, args.RSSFile)
+	})
+	mux.HandleFunc("GET /pics/{pic}", view.ServeImage(args, store))
 	mux.HandleFunc("GET /this-issue", view.ShowCurrentArticles(args, db))
 	mux.HandleFunc("GET /unpublished-articles", view.ShowUnpublishedArticles(args, db))
 	mux.HandleFunc("GET /write-article", view.WriteArticle(args, db))

cmd/view/articles.go

@@ -7,9 +7,12 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	"streifling.com/jason/cpolis/cmd/control"
 	"streifling.com/jason/cpolis/cmd/model"
 )
@@ -335,12 +338,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht
 			return
 		}
 
-		feed, err := control.GenerateRSS(
-			db,
-			"Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
-			"https://distrikt-ni-st.de",
-			"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität",
-		)
+		feed, err := control.GenerateRSS(db, c.Title, c.Link, c.Description)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -412,8 +410,17 @@ func UploadImage(c *control.CliArgs) http.HandlerFunc {
 		}
 		defer file.Close()
 
-		filename := fmt.Sprint(c.PicsDir, time.Now().Format("2006-01-02_15:04:05"), "-", header.Filename)
-		img, err := os.Create(filename)
+		nameStrings := strings.Split(header.Filename, ".")
+		extension := "." + nameStrings[len(nameStrings)-1]
+		filename := fmt.Sprint(uuid.New(), extension)
+		absFilepath, err := filepath.Abs(fmt.Sprint(c.PicsDir, "/", filename))
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		img, err := os.Create(absFilepath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -427,7 +434,9 @@ func UploadImage(c *control.CliArgs) http.HandlerFunc {
 			return
 		}
 
+		alt := strings.Join(nameStrings[0:len(nameStrings)-1], " ")
+		imgMD := fmt.Sprint("![", alt, "](", c.Domain, "/pics/", filename, ")")
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/editor.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", fmt.Sprint("![", header.Filename, "](", filename, ")"))
+		template.Must(tmpl, err).ExecuteTemplate(w, "editor-images", imgMD)
 	}
 }

cmd/view/images.go

@@ -0,0 +1,22 @@
+package view
+
+import (
+	"log"
+	"net/http"
+	"path/filepath"
+
+	"streifling.com/jason/cpolis/cmd/control"
+)
+
+func ServeImage(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		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("pic"))
+	}
+}

go.mod

@@ -5,6 +5,7 @@ go 1.22.0
 require (
 	git.streifling.com/jason/rss v0.1.2
 	github.com/go-sql-driver/mysql v1.7.1
+	github.com/google/uuid v1.6.0
 	github.com/gorilla/sessions v1.2.2
 	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/yuin/goldmark v1.7.0

go.sum

@@ -6,6 +6,8 @@ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrt
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=

web/templates/add-user.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</h2>
+
 <form>
     <div class="grid grid-cols-3 gap-4">
         <div>

web/templates/current-articles.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Aktuelle Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .}}
     <div class="border px-2 py-1 rounded-md">

web/templates/edit-user.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Benutzerdaten bearbeiten</h2>
+
 <form>
     <div class="grid grid-cols-3 gap-4">
         <div>

web/templates/editor.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Editor</h2>
+
 <form>
     <div class="flex flex-col gap-y-1">
         <label for="article-title">Titel</label>

web/templates/feed.rss

@@ -1,3 +0,0 @@
-{{define "page-content"}}
-{{.}}
-{{end}}

web/templates/login.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Anmeldung</h2>
+
 <form>
     <div class="btn-area">
         <input class="w-full" name="username" placeholder="Benutzername" type="text" />

web/templates/rejected-articles.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Abgelehnte Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .RejectedArticles}}
     {{if index $.MyIDs .ID}}

web/templates/rework-article.html

@@ -1,5 +1,6 @@
 {{define "page-content"}}
 <h2>Editor</h2>
+
 <form>
     <div class="flex flex-col gap-y-1">
         <label for="article-title">Titel</label>

web/templates/to-be-published.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Artikel veröffentlichen</h2>
+
 <div>
     <span>Titel</span>
     <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">

web/templates/unpublished-articles.html

@@ -1,4 +1,6 @@
 {{define "page-content"}}
+<h2>Unveröffentlichte Artikel</h2>
+
 <div class="flex flex-col gap-4">
     {{range .}}
     <button class="btn" hx-get="/review-unpublished-article/{{.ID}}" hx-target="#page-content">