Merge branch 'devel'

cmd/backend/rss.go

@@ -23,6 +23,10 @@ func GenerateRSS(c *Config, db *DB) (*string, error) {
 	}
 
 	for _, article := range articles {
+		if !article.Published {
+			continue
+		}
+
 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {
 			return nil, fmt.Errorf("error getting tags for articles for RSS feed: %v", err)

cmd/frontend/articles.go

@@ -94,7 +94,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		article.Link = fmt.Sprint(c.Domain, "/article/serve/", article.ID)
+		article.Link = fmt.Sprint(c.Domain, c.Port, "/article/serve/", article.ID)
 		if err = db.UpdateAttributes(&b.Attribute{Table: "articles", ID: article.ID, AttName: "link", Value: article.Link}); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -502,7 +502,7 @@ func UploadArticleImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		url := fmt.Sprint(c.Domain, "/image/serve/", filename)
+		url := fmt.Sprint(c.Domain, c.Port, "/image/serve/", filename)
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(url)
 	}
@@ -521,16 +521,9 @@ func ShowPublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 			return
 		}
 
-		filteredArticles := make([]*b.Article, 0)
-		for _, article := range publishedArticles {
-			if article.Title != "Autogenerated cpolis Issue Article" {
-				filteredArticles = append(filteredArticles, article)
-			}
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/published-articles.html")
 		tmpl = template.Must(tmpl, err)
-		tmpl.ExecuteTemplate(w, "page-content", filteredArticles)
+		tmpl.ExecuteTemplate(w, "page-content", publishedArticles)
 	}
 }
 
@@ -579,8 +572,7 @@ func ReviewArticleForDeletion(c *b.Config, db *b.DB, s *b.CookieStore) http.Hand
 			return
 		}
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.ID, ".md")
+		contentBytes, err := os.ReadFile(article.Link)
-		contentBytes, err := os.ReadFile(articleAbsName)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -628,12 +620,6 @@ 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)

cmd/frontend/issues.go

@@ -60,7 +60,7 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 
 		article := &b.Article{
 			Title:     "Autogenerated cpolis Issue Article",
-			EncURL:    fmt.Sprint(c.Domain, "/image/serve/", imgFileName),
+			EncURL:    fmt.Sprint(c.Domain, c.Port, "/image/serve/", imgFileName),
 			EncLength: int(imgSize),
 			EncType:   mimeType,
 			Published: true,
@@ -84,7 +84,7 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			return
 		}
 
-		article.Link = fmt.Sprint(c.Domain, "/article/serve/", article.ID)
+		article.Link = fmt.Sprint(c.Domain, c.Port, "/article/serve/", article.ID)
 		if err = db.UpdateAttributes(&b.Attribute{Table: "articles", ID: article.ID, AttName: "link", Value: article.Link}); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

update.sh

@@ -43,9 +43,7 @@ chmod +x $CPOLIS_DIR/tailwindcss
 $CPOLIS_DIR/tailwindcss -i $CPOLIS_DIR/web/static/css/input.css -o $CPOLIS_DIR/web/static/css/style.css
 
 echo '\nBuilding cpolis...' >&2
-cd $CPOLIS_DIR
+go build -o $BIN_DIR/cpolis $CPOLIS_DIR/cmd/main.go
-go build -o $BIN_DIR/cpolis cmd/main.go
-cd
 
 echo '\nSetting up system files...' >&2
 sudo chown root:root $BIN_DIR/cpolis