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,24 @@ 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)
+		entry.Content = atom.NewContent(atom.OutOfLine, "text/hmtl", article.ContentLink)
 
-		linkID := entry.AddLink(atom.NewLink(article.BannerLink))
-		entry.Links[linkID].Rel = "enclosure"
-		entry.Links[linkID].Type = "image/webp"
+		if article.AutoGenerated {
+			entry.Summary = atom.NewText("text", "automatically generated")
+		} else {
+			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 +55,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.4",
 		WebDir:          "/var/www/cpolis/web",
 	}
 }

cmd/calls/images.go

@@ -6,12 +6,15 @@ import (
 	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
+	f "streifling.com/jason/cpolis/cmd/frontend"
 )
 
-func ServeImage(c *b.Config) http.HandlerFunc {
+func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if !tokenIsVerified(w, r, c) {
-			return
+		if _, err := f.GetSession(w, r, c, s); err != nil {
+			if !tokenIsVerified(w, r, c) {
+				return
+			}
 		}
 
 		absFilepath, err := filepath.Abs(c.PicsDir)

cmd/frontend/articles.go

@@ -32,7 +32,7 @@ type EditorHTMLData struct {
 
 func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -64,7 +64,7 @@ func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -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
@@ -164,7 +157,7 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -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 {
@@ -254,7 +245,7 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowUnpublishedUnrejectedAndPublishedRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -298,7 +289,7 @@ func ShowUnpublishedUnrejectedAndPublishedRejectedArticles(c *b.Config, db *b.DB
 
 func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -336,7 +327,7 @@ func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerF
 
 func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -401,7 +392,7 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 
 func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -495,7 +486,7 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -530,7 +521,7 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowCurrentIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -554,7 +545,7 @@ func ShowCurrentIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc
 
 func ShowPublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -591,7 +582,7 @@ func ShowPublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore, action strin
 
 func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, button string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -671,7 +662,7 @@ func ReviewArticle(c *b.Config, db *b.DB, s *b.CookieStore, action, title, butto
 
 func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -724,7 +715,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func AllowEditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -783,7 +774,7 @@ func AllowEditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc
 
 func EditArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/images.go

@@ -5,14 +5,13 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
 func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -45,7 +44,7 @@ func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -81,22 +80,3 @@ func UploadBanner(c *b.Config, s *b.CookieStore, fileKey, htmlFile, htmlTemplate
 		}
 	}
 }
-
-func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		absFilepath, err := filepath.Abs(c.PicsDir)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		http.ServeFile(w, r, absFilepath+"/"+r.PathValue("img"))
-	}
-}

cmd/frontend/issues.go

@@ -13,7 +13,7 @@ import (
 
 func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -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 {

cmd/frontend/pdf.go

@@ -12,7 +12,7 @@ import (
 
 func UploadPDF(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/sessions.go

@@ -26,8 +26,8 @@ func saveSession(w http.ResponseWriter, r *http.Request, s *b.CookieStore, u *b.
 	return nil
 }
 
-// getSession is used for verifying that the user is logged in and returns their session and an error.
-func getSession(w http.ResponseWriter, r *http.Request, c *b.Config, s *b.CookieStore) (*b.Session, error) {
+// GetSession is used for verifying that the user is logged in and returns their session and an error.
+func GetSession(w http.ResponseWriter, r *http.Request, c *b.Config, s *b.CookieStore) (*b.Session, error) {
 	msg := "Keine gültige Session. Bitte erneut anmelden."
 	tmpl, tmplErr := template.ParseFiles(c.WebDir+"/templates/index.html", c.WebDir+"/templates/login.html")
 
@@ -142,7 +142,7 @@ func Login(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -167,7 +167,7 @@ func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/tags.go

@@ -10,7 +10,7 @@ import (
 
 func CreateTag(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -27,7 +27,7 @@ func CreateTag(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func AddTag(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/users.go

@@ -27,7 +27,7 @@ func checkUserStrings(user *b.User) (string, int, bool) {
 
 func CreateUser(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -44,7 +44,7 @@ func CreateUser(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 
 func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -122,7 +122,7 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -147,7 +147,7 @@ func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -293,7 +293,7 @@ func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -325,7 +325,7 @@ func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.H
 
 func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := getSession(w, r, c, s); err != nil {
+		if _, err := GetSession(w, r, c, s); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -356,7 +356,7 @@ func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -440,7 +440,7 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func DeleteUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := getSession(w, r, c, s)
+		session, err := GetSession(w, r, c, s)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/main.go

@@ -68,8 +68,7 @@ func main() {
 	mux.HandleFunc("GET /article/write", f.WriteArticle(config, db, store))
 	mux.HandleFunc("GET /atom/serve", c.ServeAtomFeed(config))
 	mux.HandleFunc("GET /hub", f.ShowHub(config, db, store))
-	mux.HandleFunc("GET /image/{img}", f.ServeImage(config, store))
-	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config))
+	mux.HandleFunc("GET /image/serve/{pic}", c.ServeImage(config, store))
 	mux.HandleFunc("GET /issue/this", f.ShowCurrentIssue(config, db, store))
 	mux.HandleFunc("GET /logout", f.Logout(config, store))
 	mux.HandleFunc("GET /pdf/get-list", c.ServePDFList(config))

web/templates/editor.html

@@ -90,7 +90,7 @@
 
 {{define "article-banner-template"}}
 <div id="article-banner-container">
-    <img src="/image/{{.BannerImage}}" alt="">
+    <img src="/image/serve/{{.BannerImage}}" alt="">
     <input id="article-banner-url" name="article-banner-url" type="hidden" value="{{.BannerImage}}" />
 </div>
 {{end}}

web/templates/review-article.html

@@ -3,7 +3,7 @@
 
 <div>
     <div class="w-full" id="article-banner-container">
-        <img src="/image/{{.BannerImage}}" alt="Banner Image">
+        <img src="/image/serve/{{.BannerImage}}" alt="Banner Image">
     </div>
 
     <span>Titel</span>