Merge branch 'devel'

Fixed small bug that used article.Link instead of correct path for article deletion
2024-08-31 11:27:15 +02:00 · 2024-08-31 11:27:03 +02:00 · 2024-08-31 01:43:53 +02:00 · 2024-08-31 01:42:37 +02:00
1 changed files with 8 additions and 1 deletions
--- a/cmd/frontend/articles.go
+++ b/cmd/frontend/articles.go
@ -572,7 +572,8 @@ func ReviewArticleForDeletion(c *b.Config, db *b.DB, s *b.CookieStore) http.Hand
 			return
 		}

-		contentBytes, err := os.ReadFile(article.Link)
+		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.ID, ".md")
+		contentBytes, err := os.ReadFile(articleAbsName)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@ -620,6 +621,12 @@ func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}

+		if err = os.Remove(fmt.Sprint(c.ArticleDir, "/", id, ".md")); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
 		feed, err := b.GenerateRSS(c, db)
 		if err != nil {
 			log.Println(err)
Author	SHA1	Message	Date
Jason Streifling	e1af2979af	Merge branch 'devel'	2024-08-31 11:27:15 +02:00
Jason Streifling	b02a882ed7	Fixed small bug that used article.Link instead of correct path for article deletion	2024-08-31 11:27:03 +02:00
Jason Streifling	f6dedc6f10	Merge branch 'devel'	2024-08-31 01:43:53 +02:00
Jason Streifling	edb448413b	Remove deleted article file when deleting article	2024-08-31 01:42:37 +02:00