Merge branch 'devel'

cmd/backend/atom.go

@@ -8,8 +8,6 @@ import (
 	"git.streifling.com/jason/atom"
 )
 
-type Feed struct{ *atom.Feed }
-
 func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 	feed := atom.NewFeed(c.Title)
 	feed.ID = atom.NewID("urn:feed:1")
@@ -32,12 +30,25 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 		}
 		entry := atom.NewEntry(articleTitle)
 		entry.ID = atom.NewID(fmt.Sprint("urn:entry:", article.ID))
-		entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
 		entry.Published = atom.NewDate(article.Created)
 
-		linkID := entry.AddLink(atom.NewLink(article.BannerLink))
-		entry.Links[linkID].Rel = "enclosure"
-		entry.Links[linkID].Type = "image/webp"
+		if article.AutoGenerated {
+			entry.Content = atom.NewContent(atom.InlineText, "text", "")
+		} else {
+			entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
+
+			articleSummary, err := ConvertToPlain(article.Summary)
+			if err != nil {
+				return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
+			}
+			entry.Summary = atom.NewText("text", articleSummary)
+		}
+
+		if len(article.BannerLink) > 0 {
+			linkID := entry.AddLink(atom.NewLink(article.BannerLink))
+			entry.Links[linkID].Rel = "enclosure"
+			entry.Links[linkID].Type = "image/webp"
+		}
 
 		user, err := db.GetUser(c, article.AuthorID)
 		if err != nil {
@@ -45,15 +56,6 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 		}
 		entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
 
-		articleSummary, err := ConvertToPlain(article.Summary)
-		if err != nil {
-			return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
-		}
-		if article.AutoGenerated {
-			articleSummary = "auto generated"
-		}
-		entry.Summary = atom.NewText("text", articleSummary)
-
 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {
 			return nil, fmt.Errorf("error getting tags for articles for Atom feed: %v", err)

cmd/backend/config.go

@@ -52,7 +52,7 @@ func newConfig() *Config {
 		PDFDir:          "/var/www/cpolis/pdfs",
 		PicsDir:         "/var/www/cpolis/pics",
 		Port:            ":8080",
-		Version:         "v0.13.2",
+		Version:         "v0.13.3",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }

cmd/frontend/articles.go

@@ -80,7 +80,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 		article := &b.Article{
 			Title:         r.PostFormValue("article-title"),
-			BannerLink:    r.PostFormValue("article-banner-url"),
+			BannerLink:    c.Domain + "/image/serve/" + r.PostFormValue("article-banner-url"),
 			Summary:       r.PostFormValue("article-summary"),
 			Published:     false,
 			Rejected:      false,
@@ -93,13 +93,6 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			http.Error(w, "Bitte den Titel eingeben.", http.StatusBadRequest)
 			return
 		}
-
-		if len(article.BannerLink) == 0 {
-			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
-			return
-		}
-		article.BannerLink = c.Domain + "/image/serve/" + article.BannerLink
-
 		if len(article.Summary) == 0 {
 			http.Error(w, "Bitte die Beschreibung eingeben.", http.StatusBadRequest)
 			return
@@ -185,11 +178,9 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 		}
 
 		bannerLink := r.PostFormValue("article-banner-url")
-		if len(bannerLink) == 0 {
-			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
-			return
+		if len(bannerLink) != 0 {
+			bannerLink = c.Domain + "/image/serve/" + bannerLink
 		}
-		bannerLink = c.Domain + "/image/serve/" + bannerLink
 
 		summary := r.PostFormValue("article-summary")
 		if len(summary) == 0 {

cmd/frontend/issues.go

@@ -41,10 +41,6 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFun
 			http.Error(w, "Bitte den Titel eingeben.", http.StatusBadRequest)
 			return
 		}
-		if len(article.BannerLink) == 0 {
-			http.Error(w, "Bitte ein Titelbild einfügen.", http.StatusBadRequest)
-			return
-		}
 
 		article.ID, err = db.AddArticle(article)
 		if err != nil {