jason/cpolis
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 56 Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Jason Streifling 2025-02-12 17:28:07 +01:00
commit a1a470712b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/backend/articles.go
View File

@ -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)
}

2
cmd/frontend/articles.go
View File

@ -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