Merge branch 'devel' into feature/id-for-hmtl-headers

cmd/backend/articles.go

@@ -356,12 +356,26 @@ func (db *DB) GetAllArticles() ([]*Article, error) {
 		return nil, fmt.Errorf("error querying DB: %v", err)
 	}
 
+	var created []byte
+	var uuidString string
+
 	articles := make([]*Article, 0)
 	for rows.Next() {
 		article := new(Article)
-		if err = rows.Scan(&article.Title, &article.Created, &article.BannerLink, &article.Summary, &article.Published, &article.CreatorID, &article.IssueID, &article.EditedID, &article.Clicks, &article.IsInIssue, &article.AutoGenerated, &article.UUID); err != nil {
+		if err = rows.Scan(&article.Title, &created, &article.BannerLink, &article.Summary, &article.Published, &article.CreatorID, &article.IssueID, &article.EditedID, &article.Clicks, &article.IsInIssue, &article.AutoGenerated, &uuidString); err != nil {
 			return nil, fmt.Errorf("error scanning rows: %v", err)
 		}
+
+		article.Created, err = time.Parse("2006-01-02 15:04:05", string(created))
+		if err != nil {
+			return nil, fmt.Errorf("error parsing created: %v", err)
+		}
+
+		article.UUID, err = uuid.Parse(uuidString)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing uuid: %v", err)
+		}
+
 		articles = append(articles, article)
 	}
 

cmd/backend/config.go

@@ -55,7 +55,7 @@ func newConfig() *Config {
 		MaxImgWidth:       1920,
 		PDFDir:            "/var/www/cpolis/pdfs",
 		Port:              ":1664",
-		Version:           "v0.16.1",
+		Version:           "v0.16.2",
 		WebDir:            "/var/www/cpolis/web",
 	}
 }

cmd/backend/markdown.go

@@ -6,16 +6,35 @@ import (
 
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/yuin/goldmark"
+	"github.com/yuin/goldmark/extension"
+	"github.com/yuin/goldmark/parser"
+	"github.com/yuin/goldmark/renderer/html"
 )
 
 func ConvertToHTML(md string) (string, error) {
 	var buf bytes.Buffer
 
-	if err := goldmark.Convert([]byte(md), &buf); err != nil {
+	// Goldmark-Instanz mit GFM und aktivierter Attribute-Unterstützung initialisieren.
+	gm := goldmark.New(
+		goldmark.WithExtensions(
+			extension.GFM,
+		),
+		goldmark.WithParserOptions(
+			parser.WithAttribute(),
+		),
+		goldmark.WithRendererOptions(
+			html.WithUnsafe(), // Falls du HTML-Inhalte erlauben möchtest
+		),
+	)
+
+	// Markdown in HTML konvertieren.
+	if err := gm.Convert([]byte(md), &buf); err != nil {
 		return "", fmt.Errorf("error converting markdown to html: %v", err)
 	}
 
+	// Bluemonday-Policy anpassen, sodass id-Attribute auf h1-h6 erlaubt sind.
 	p := bluemonday.UGCPolicy()
+	p.AllowAttrs("id").OnElements("h1", "h2", "h3", "h4", "h5", "h6")
 	html := p.Sanitize(buf.String())
 
 	return html, nil

cmd/frontend/articles.go

@@ -840,7 +840,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFun
 			return
 		}
 
-		if err = os.Remove(filepath.Join(c.ArticleDir, fmt.Sprint(article.UUID, ".md"))); err != nil {
+		if err = os.Remove(filepath.Join(c.ArticleDir, article.UUID.String()+".md")); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return