Compare commits
No commits in common. "259a2088a84e2a7d665bba7d97b746c8f5687930" and "5afd6b771a9c5d43507a8613315abd4c1f2dcc27" have entirely different histories.
259a2088a8
...
5afd6b771a
@ -345,33 +345,6 @@ func (db *DB) DeleteArticle(id int64) error {
|
|||||||
return nil
|
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)
|
|
||||||
}
|
|
||||||
|
|
||||||
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 {
|
|
||||||
return nil, fmt.Errorf("error scanning rows: %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 {
|
func WriteArticleToFile(c *Config, articleUUID uuid.UUID, content []byte) error {
|
||||||
articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(articleUUID, ".md"))
|
articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(articleUUID, ".md"))
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ func newConfig() *Config {
|
|||||||
MaxImgWidth: 1920,
|
MaxImgWidth: 1920,
|
||||||
PDFDir: "/var/www/cpolis/pdfs",
|
PDFDir: "/var/www/cpolis/pdfs",
|
||||||
Port: ":1664",
|
Port: ":1664",
|
||||||
Version: "v0.16.1",
|
Version: "v0.16.0",
|
||||||
WebDir: "/var/www/cpolis/web",
|
WebDir: "/var/www/cpolis/web",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,20 +56,7 @@ func checkImageUsage(c *Config, db *DB, name string) (bool, error) {
|
|||||||
|
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
if name == user.ProfilePicLink {
|
if name == user.ProfilePicLink {
|
||||||
imageWasFound = true
|
return true, nil
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user