Merge branch 'devel'

cmd/backend/articles.go

@@ -345,6 +345,47 @@ func (db *DB) DeleteArticle(id int64) error {
 	return nil
 }
 
+func (db *DB) GetAllArticles() ([]*Article, error) {
+	query := `
+    SELECT title, created, banner_link, summary, published, creator_id, issue_id, edited_id, clicks, is_in_issue, auto_generated, uuid
+    FROM articles
+    `
+
+	rows, err := db.Query(query)
+	if err != nil {
+		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, &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)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
+	return articles, nil
+}
+
 func WriteArticleToFile(c *Config, articleUUID uuid.UUID, content []byte) error {
 	articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(articleUUID, ".md"))
 

cmd/backend/config.go

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

cmd/backend/images.go

@@ -56,7 +56,20 @@ func checkImageUsage(c *Config, db *DB, name string) (bool, error) {
 
 		for _, user := range users {
 			if name == user.ProfilePicLink {
-				return true, nil
+				imageWasFound = true
+			}
+		}
+	}
+
+	if !imageWasFound {
+		articles, err := db.GetAllArticles()
+		if err != nil {
+			return false, fmt.Errorf("error getting all articles: %v", err)
+		}
+
+		for _, article := range articles {
+			if name == article.BannerLink {
+				imageWasFound = true
 			}
 		}
 	}

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