Initial sessions implementation

cmd/data/articles.go

@@ -1,9 +1,6 @@
 package data
 
 import (
-	"encoding/gob"
-	"fmt"
-	"os"
 	"sync"
 	"time"
 
@@ -21,56 +18,40 @@ type Article struct {
 	AuthorID int64
 }
 
-// TODO: setCh
 type ArticleList struct {
-	addCh    chan *Article
-	delCh    chan uuid.UUID
-	getCh    chan []Article
-	retCh    chan *Article
-	articles []*Article
-	wg       sync.WaitGroup
-}
-
-// TODO: setCh
-type TagList struct {
-	addCh chan string
-	getCh chan []string
-	tags  []string
+	addCh chan *Article
+	delCh chan uuid.UUID
+	retCh chan *Article
+	getCh chan []Article
+	list  []*Article
 	wg    sync.WaitGroup
 }
 
-func initArticleList() *ArticleList {
+func minArticleList() *ArticleList {
 	return &ArticleList{
 		addCh: make(chan *Article),
 		delCh: make(chan uuid.UUID),
-		getCh: make(chan []Article),
 		retCh: make(chan *Article),
+		getCh: make(chan []Article),
 	}
 }
 
-func initTagList() *TagList {
-	return &TagList{
-		addCh: make(chan string),
-		getCh: make(chan []string),
-	}
-}
-
-func (al *ArticleList) start() {
-	al.wg.Done()
+func (l *ArticleList) start() {
+	l.wg.Done()
 	for {
 		select {
-		case article := <-al.addCh:
-			al.articles = append(al.articles, article)
-		case uuid := <-al.delCh:
-			for i, article := range al.articles {
+		case article := <-l.addCh:
+			l.list = append(l.list, article)
+		case uuid := <-l.delCh:
+			for i, article := range l.list {
 				if article.UUID == uuid {
-					al.articles = append(al.articles[:i], al.articles[i+1:]...)
-					al.retCh <- article
+					l.list = append(l.list[:i], l.list[i+1:]...)
+					l.retCh <- article
 				}
 			}
-		case al.getCh <- func() []Article {
+		case l.getCh <- func() []Article {
 			var list []Article
-			for _, article := range al.articles {
+			for _, article := range l.list {
 				list = append(list, *article)
 			}
 			return list
@@ -79,20 +60,9 @@ func (al *ArticleList) start() {
 	}
 }
 
-func (tl *TagList) start() {
-	tl.wg.Done()
-	for {
-		select {
-		case tag := <-tl.addCh:
-			tl.tags = append(tl.tags, tag)
-		case tl.getCh <- tl.tags:
-		}
-	}
-}
-
 func NewArticleList() *ArticleList {
-	list := initArticleList()
-	list.articles = make([]*Article, 0)
+	list := minArticleList()
+	list.list = []*Article{}
 
 	list.wg.Add(1)
 	go list.start()
@@ -101,106 +71,19 @@ func NewArticleList() *ArticleList {
 	return list
 }
 
-func (al *ArticleList) Add(a *Article) {
-	al.addCh <- a
+func (l *ArticleList) Add(a *Article) {
+	l.addCh <- a
 }
 
-func (al *ArticleList) Release(uuid uuid.UUID) (*Article, bool) {
-	al.delCh <- uuid
-	article := <-al.retCh
-
+func (l *ArticleList) Release(uuid uuid.UUID) (*Article, bool) {
+	l.delCh <- uuid
+	article := <-l.retCh
 	if article == nil {
 		return nil, false
 	}
 	return article, true
 }
 
-func (al *ArticleList) Get() []Article {
-	return <-al.getCh
-}
-
-func (al *ArticleList) Save(filename string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error creating key file: %v", err)
-	}
-	defer file.Close()
-
-	articles := al.Get()
-	if err = gob.NewEncoder(file).Encode(articles); err != nil {
-		return fmt.Errorf("error ecoding key: %v", err)
-	}
-
-	return nil
-}
-
-func LoadArticleList(filename string) (*ArticleList, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return nil, fmt.Errorf("error opening key file: %v", err)
-	}
-
-	articleList := initArticleList()
-	if err = gob.NewDecoder(file).Decode(&articleList.articles); err != nil {
-		return nil, fmt.Errorf("error decoding key: %v", err)
-	}
-
-	articleList.wg.Add(1)
-	go articleList.start()
-	articleList.wg.Wait()
-
-	return articleList, nil
-}
-
-func NewTagList() *TagList {
-	list := initTagList()
-	list.tags = make([]string, 0)
-
-	list.wg.Add(1)
-	go list.start()
-	list.wg.Wait()
-
-	return list
-}
-
-func (tl *TagList) Add(tag string) {
-	tl.addCh <- tag
-}
-
-func (tl *TagList) Get() []string {
-	return <-tl.getCh
-}
-
-func (tl *TagList) Save(filename string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error creating key file: %v", err)
-	}
-	defer file.Close()
-
-	tags := tl.Get()
-	if err = gob.NewEncoder(file).Encode(tags); err != nil {
-		return fmt.Errorf("error ecoding key: %v", err)
-	}
-
-	return nil
-}
-
-func LoadTagList(filename string) (*TagList, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return nil, fmt.Errorf("error opening key file: %v", err)
-	}
-	defer file.Close()
-
-	tagList := initTagList()
-	if err = gob.NewDecoder(file).Decode(&tagList.tags); err != nil {
-		return nil, fmt.Errorf("error decoding key: %v", err)
-	}
-
-	tagList.wg.Add(1)
-	go tagList.start()
-	tagList.wg.Wait()
-
-	return tagList, nil
+func (l *ArticleList) Get() []Article {
+	return <-l.getCh
 }

cmd/data/db.go

@@ -34,7 +34,7 @@ func OpenDB(dbName string) (*DB, error) {
 	return &db, nil
 }
 
-func (db *DB) AddUser(user *User, pass string) error {
+func (db *DB) AddUser(user User, pass string) error {
 	hashedPass, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
 	if err != nil {
 		return fmt.Errorf("error creating password hash: %v", err)
@@ -45,7 +45,8 @@ func (db *DB) AddUser(user *User, pass string) error {
         (username, password, first_name, last_name, role)
     VALUES (?, ?, ?, ?, ?)
     `
-	if _, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role); err != nil {
+	_, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role)
+	if err != nil {
 		return fmt.Errorf("error inserting user into DB: %v", err)
 	}
 
@@ -89,19 +90,12 @@ func (db *DB) CheckPassword(id int64, pass string) error {
 }
 
 func (db *DB) ChangePassword(id int64, oldPass, newPass string) error {
-	tx, err := db.Begin()
-	if err != nil {
-		return fmt.Errorf("error starting transaction: %v", err)
-	}
-
 	if err := db.CheckPassword(id, oldPass); err != nil {
-		tx.Rollback()
 		return fmt.Errorf("error checking password: %v", err)
 	}
 
 	newHashedPass, err := bcrypt.GenerateFromPassword([]byte(newPass), bcrypt.DefaultCost)
 	if err != nil {
-		tx.Rollback()
 		return fmt.Errorf("error creating password hash: %v", err)
 	}
 
@@ -110,15 +104,11 @@ func (db *DB) ChangePassword(id int64, oldPass, newPass string) error {
     SET password = ?
     WHERE id = ?
     `
-	if _, err = db.Exec(query, string(newHashedPass), id); err != nil {
-		tx.Rollback()
+	_, err = db.Exec(query, string(newHashedPass), id)
+	if err != nil {
 		return fmt.Errorf("error updating password in DB: %v", err)
 	}
 
-	if err = tx.Commit(); err != nil {
-		return fmt.Errorf("error committing transaction: %v", err)
-	}
-
 	return nil
 }
 
@@ -144,7 +134,8 @@ func (db *DB) GetUser(id int64) (*User, error) {
     `
 
 	row := db.QueryRow(query, id)
-	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName, &user.LastName, &user.Role); err != nil {
+	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName,
+		&user.LastName, &user.Role); err != nil {
 		return nil, fmt.Errorf("error reading user information: %v", err)
 	}
 

cmd/data/rss.go

@@ -6,99 +6,101 @@ import (
 	"os"
 	"sync"
 
-	"git.streifling.com/jason/rss"
+	"github.com/gorilla/feeds"
 )
 
-type Channel struct {
-	addCh   chan *rss.Item
-	setCh   chan rss.Channel
-	getCh   chan rss.Channel
-	channel rss.Channel
-	wg      sync.WaitGroup
+type Feed struct {
+	addCh chan *feeds.Item
+	setCh chan feeds.Feed
+	getCh chan feeds.Feed
+	feed  feeds.Feed
+	wg    sync.WaitGroup
 }
 
-func initChannel() *Channel {
-	return &Channel{
-		addCh: make(chan *rss.Item),
-		setCh: make(chan rss.Channel),
-		getCh: make(chan rss.Channel),
-		channel: rss.Channel{
-			Items: make([]*rss.Item, 0),
-		},
+func minFeed() *Feed {
+	return &Feed{
+		addCh: make(chan *feeds.Item),
+		setCh: make(chan feeds.Feed),
+		getCh: make(chan feeds.Feed),
 	}
 }
 
-func (c *Channel) start() {
-	c.wg.Done()
+func (f *Feed) start() {
+	f.wg.Done()
 	for {
 		select {
-		case item := <-c.addCh:
-			c.channel.Items = append(c.channel.Items, item)
-		case c.getCh <- c.channel:
-		case c.channel = <-c.setCh:
+		case item := <-f.addCh:
+			f.feed.Items = append(f.feed.Items, item)
+		case f.getCh <- f.feed:
+		case f.feed = <-f.setCh:
 		}
 	}
 }
 
-func NewChannel(title, link, desc string) *Channel {
-	channel := initChannel()
-	channel.channel = rss.Channel{
+func NewFeed(title, link, desc string) *Feed {
+	feed := minFeed()
+	feed.feed = feeds.Feed{
 		Title:       title,
-		Link:        link,
+		Link:        &feeds.Link{Href: link},
 		Description: desc,
 	}
 
-	channel.wg.Add(1)
-	go channel.start()
-	channel.wg.Wait()
+	feed.wg.Add(1)
+	go feed.start()
+	feed.wg.Wait()
 
-	return channel
+	return feed
 }
 
-func (c *Channel) Get() rss.Channel {
-	return <-c.getCh
+func (f *Feed) Get() feeds.Feed {
+	return <-f.getCh
 }
 
-func (f *Channel) Set(channel rss.Channel) {
-	f.setCh <- channel
+func (f *Feed) Set(feed feeds.Feed) {
+	f.setCh <- feed
 }
 
-func LoadChannel(filename string) (*Channel, error) {
+func OpenFeed(filename string) (*Feed, error) {
 	file, err := os.Open(filename)
 	if err != nil {
 		return nil, fmt.Errorf("error opening file %v: %v", filename, err)
 	}
 	defer file.Close()
 
-	tmpChannel := new(rss.Channel)
-	if err = gob.NewDecoder(file).Decode(tmpChannel); err != nil {
-		return nil, fmt.Errorf("error decoding channel from file %v: %v", filename, err)
+	feed := minFeed()
+	feed.wg.Add(1)
+	go feed.start()
+	feed.wg.Wait()
+
+	decoder := gob.NewDecoder(file)
+	tmpFeed := new(feeds.Feed)
+	err = decoder.Decode(tmpFeed)
+	if err != nil {
+		return nil, fmt.Errorf("error decoding file %v: %v", filename, err)
 	}
 
-	channel := initChannel()
-	channel.wg.Add(1)
-	go channel.start()
-	channel.wg.Wait()
-	channel.Set(*tmpChannel)
+	feed.Set(*tmpFeed)
 
-	return channel, nil
+	return feed, nil
 }
 
-func (c *Channel) Save(filename string) error {
+func (f *Feed) Save(filename string) error {
 	file, err := os.Create(filename)
 	if err != nil {
 		return fmt.Errorf("error creating file %v: %v", filename, err)
 	}
 	defer file.Close()
 
-	channel := c.Get()
-	if err = gob.NewEncoder(file).Encode(channel); err != nil {
+	encoder := gob.NewEncoder(file)
+	feed := f.Get()
+	err = encoder.Encode(feed)
+	if err != nil {
 		return fmt.Errorf("error encoding file %v: %v", filename, err)
 	}
 
 	return nil
 }
 
-func (c *Channel) Add(i *rss.Item) {
-	c.addCh <- i
+func (f *Feed) Add(i *feeds.Item) {
+	f.addCh <- i
 }

cmd/data/sessions.go

@@ -17,7 +17,8 @@ type CookieStore struct {
 func NewKey() ([]byte, error) {
 	key := make([]byte, 32)
 
-	if _, err := io.ReadFull(rand.Reader, key); err != nil {
+	_, err := io.ReadFull(rand.Reader, key)
+	if err != nil {
 		return nil, fmt.Errorf("error generating key: %v", err)
 	}
 
@@ -32,7 +33,9 @@ func SaveKey(key []byte, filename string) error {
 	defer file.Close()
 	file.Chmod(0600)
 
-	if err = gob.NewEncoder(file).Encode(key); err != nil {
+	encoder := gob.NewEncoder(file)
+	err = encoder.Encode(key)
+	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -46,7 +49,9 @@ func LoadKey(filename string) ([]byte, error) {
 	}
 
 	key := make([]byte, 32)
-	if err = gob.NewDecoder(file).Decode(&key); err != nil {
+	decoder := gob.NewDecoder(file)
+	err = decoder.Decode(&key)
+	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 

cmd/ui/admin.go

@@ -11,11 +11,11 @@ import (
 )
 
 type AddUserData struct {
-	*data.User
 	Msg string
+	data.User
 }
 
-func inputsEmpty(user *data.User, pass, pass2 string) bool {
+func inputsEmpty(user data.User, pass, pass2 string) bool {
 	return len(user.UserName) == 0 ||
 		len(user.FirstName) == 0 ||
 		len(user.LastName) == 0 ||
@@ -23,7 +23,7 @@ func inputsEmpty(user *data.User, pass, pass2 string) bool {
 		len(pass2) == 0
 }
 
-func checkUserStrings(user *data.User) (string, int, bool) {
+func checkUserStrings(user data.User) (string, int, bool) {
 	userLen := 15
 	nameLen := 50
 
@@ -38,12 +38,14 @@ func checkUserStrings(user *data.User) (string, int, bool) {
 	}
 }
 
-func CreateUser(w http.ResponseWriter, r *http.Request) {
-	tmpl, err := template.ParseFiles("web/templates/add-user.html")
-	template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
+func CreateUser() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		tmpl, err := template.ParseFiles("web/templates/add-user.html")
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
+	}
 }
 
-func AddUser(db *data.DB, s *data.CookieStore) http.HandlerFunc {
+func AddUser(db *data.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		role, err := strconv.Atoi(r.PostFormValue("role"))
 		if err != nil {
@@ -53,7 +55,7 @@ func AddUser(db *data.DB, s *data.CookieStore) http.HandlerFunc {
 		}
 
 		htmlData := AddUserData{
-			User: &data.User{
+			User: data.User{
 				UserName:  r.PostFormValue("username"),
 				FirstName: r.PostFormValue("first-name"),
 				LastName:  r.PostFormValue("last-name"),
@@ -92,36 +94,12 @@ func AddUser(db *data.DB, s *data.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		num, err := db.CountEntries()
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		if num == 0 {
-			if htmlData.Role != data.Admin {
-				htmlData.Msg = "Der erste Benutzer muss ein Administrator sein."
-				htmlData.Role = data.Admin
-				tmpl, err := template.ParseFiles("web/templates/add-user.html")
-				tmpl = template.Must(tmpl, err)
-				tmpl.ExecuteTemplate(w, "page-content", htmlData)
-				return
-			}
-
-			if err := saveSession(w, r, s, htmlData.User); err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-		}
-
 		if err := db.AddUser(htmlData.User, pass); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", 0)
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
 }

cmd/ui/articles.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"git.streifling.com/jason/rss"
 	"github.com/google/uuid"
+	"github.com/gorilla/feeds"
 	"streifling.com/jason/cpolis/cmd/data"
 )
 
@@ -25,14 +25,12 @@ func ShowHub(s *data.CookieStore) http.HandlerFunc {
 	}
 }
 
-func WriteArticle(tl *data.TagList) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		tmpl, err := template.ParseFiles("web/templates/editor.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", tl.Get())
-	}
+func WriteArticle(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.ParseFiles("web/templates/editor.html")
+	template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 }
 
-func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
+func FinishArticle(l *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		article := new(data.Article)
 		var err error
@@ -58,9 +56,6 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		r.ParseForm()
-		article.Tags = append(article.Tags, r.Form["tags"]...)
-
 		session, err := s.Get(r, "cookie")
 		if err != nil {
 			tmpl, err := template.ParseFiles("web/templates/login.html")
@@ -73,8 +68,7 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 		article.Created = time.Now()
 		article.AuthorID = session.Values["id"].(int64)
 
-		al.Add(article)
-		al.Save("tmp/unpublished-articles.gob")
+		l.Add(article)
 
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
@@ -82,14 +76,14 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	}
 }
 
-func ShowUnpublishedArticles(al *data.ArticleList) http.HandlerFunc {
+func ShowUnpublishedArticles(l *data.ArticleList) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		tmpl, err := template.ParseFiles("web/templates/unpublished-articles.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", al.Get())
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", l.Get())
 	}
 }
 
-func ReviewArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
+func ReviewArticle(l *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uuid, err := uuid.Parse(r.PostFormValue("uuid"))
 		if err != nil {
@@ -98,7 +92,7 @@ func ReviewArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		for _, article := range al.Get() {
+		for _, article := range l.Get() {
 			if article.UUID == uuid {
 				tmpl, err := template.ParseFiles("web/templates/to-be-published.html")
 				template.Must(tmpl, err).ExecuteTemplate(w, "page-content", article)
@@ -119,7 +113,7 @@ func ReviewArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	}
 }
 
-func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
+func PublishArticle(f *data.Feed, l *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uuid, err := uuid.Parse(r.PostFormValue("uuid"))
 		if err != nil {
@@ -128,7 +122,7 @@ func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore)
 			return
 		}
 
-		article, ok := al.Release(uuid)
+		article, ok := l.Release(uuid)
 		if !ok {
 			// TODO: Warnung anzeigen
 			// msg = "Alle Felder müssen ausgefüllt werden."
@@ -137,6 +131,14 @@ func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore)
 			return
 		}
 
+		f.Add(&feeds.Item{
+			Title:       article.Title,
+			Created:     article.Created,
+			Description: article.Desc,
+			Content:     article.Content,
+		})
+		f.Save("tmp/rss.gob")
+
 		session, err := s.Get(r, "cookie")
 		if err != nil {
 			tmpl, err := template.ParseFiles("web/templates/login.html")
@@ -144,16 +146,6 @@ func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore)
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		c.Add(&rss.Item{
-			Title:       article.Title,
-			Author:      session.Values["name"].(string),
-			PubDate:     article.Created.Format(time.RFC1123Z),
-			Description: article.Desc,
-			Content:     &rss.Content{Value: article.Content},
-			Categories:  article.Tags,
-		})
-		c.Save("tmp/rss.gob")
-
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])

cmd/ui/editor.go

@@ -1,31 +0,0 @@
-package ui
-
-import (
-	"html/template"
-	"net/http"
-
-	"streifling.com/jason/cpolis/cmd/data"
-)
-
-func CreateTag(w http.ResponseWriter, r *http.Request) {
-	tmpl, err := template.ParseFiles("web/templates/add-tag.html")
-	template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
-}
-
-func AddTag(tl *data.TagList, s *data.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		tl.Add(r.PostFormValue("tag"))
-		tl.Save("tmp/tags.gob")
-
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles("web/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
-		tmpl, err := template.ParseFiles("web/templates/hub.html")
-		tmpl = template.Must(tmpl, err)
-		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
-	}
-}

cmd/ui/rss.go

@@ -5,16 +5,13 @@ import (
 	"log"
 	"net/http"
 
-	"git.streifling.com/jason/rss"
 	"streifling.com/jason/cpolis/cmd/data"
 )
 
-func ShowRSS(c *data.Channel) http.HandlerFunc {
+func ShowRSS(f *data.Feed) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		channel := c.Get()
-		feed := rss.NewFeed()
-		feed.Channels = append(feed.Channels, &channel)
-		rss, err := feed.ToXML()
+		feed := f.Get()
+		rss, err := feed.ToRss()
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/ui/sessions.go

@@ -1,7 +1,6 @@
 package ui
 
 import (
-	"fmt"
 	"html/template"
 	"log"
 	"net/http"
@@ -9,23 +8,6 @@ import (
 	"streifling.com/jason/cpolis/cmd/data"
 )
 
-func saveSession(w http.ResponseWriter, r *http.Request, s *data.CookieStore, u *data.User) error {
-	session, err := s.Get(r, "cookie")
-	if err != nil {
-		return fmt.Errorf("error getting session: %v", err)
-	}
-
-	session.Values["authenticated"] = true
-	session.Values["id"] = u.ID
-	session.Values["name"] = u.FirstName + u.LastName
-	session.Values["role"] = u.Role
-	if err := session.Save(r, w); err != nil {
-		return fmt.Errorf("error saving session: %v", err)
-	}
-
-	return nil
-}
-
 func HomePage(db *data.DB, s *data.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		numRows, err := db.CountEntries()
@@ -78,7 +60,18 @@ func Login(db *data.DB, s *data.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		if err := saveSession(w, r, s, user); err != nil {
+		session, err := s.Get(r, "cookie")
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		session.Values["authenticated"] = true
+		session.Values["id"] = user.ID
+		session.Values["name"] = user.FirstName + user.LastName
+		session.Values["role"] = user.Role
+		if err := session.Save(r, w); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

go.mod

@@ -3,7 +3,6 @@ module streifling.com/jason/cpolis
 go 1.22.0
 
 require (
-	git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/feeds v1.1.2

go.sum

@@ -1,11 +1,3 @@
-git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565 h1:/eO9NTksh+9yLz3HiYNR7BJo/iMTxxW5/d9h8I6vR6E=
-git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305160544-c8551159fe32 h1:G25NZzsD73rOkGYgV2vPUDviB0JXk5qi+dXOwB6J56U=
-git.streifling.com/jason/rss v0.0.0-20240305160544-c8551159fe32/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305160829-6cd08bb65d2a h1:TWQ9gwe7eWjaLUrZ0CJSc+sUUOw3VoGHlR3F8mH6vqs=
-git.streifling.com/jason/rss v0.0.0-20240305160829-6cd08bb65d2a/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188 h1:C8M/j3f+cl5Y7YfGpU/ynb/SC/4tTYMDsyGFt3rswM8=
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=

main.go

@@ -15,8 +15,7 @@ func init() {
 }
 
 func main() {
-	logFile, err := os.OpenFile("tmp/cpolis.log",
-		os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+	logFile, err := os.Create("tmp/cpolis.log")
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -29,10 +28,10 @@ func main() {
 	}
 	defer db.Close()
 
-	feed, err := data.LoadChannel("tmp/rss.gob")
+	feed, err := data.OpenFeed("tmp/rss.gob")
 	if err != nil {
 		log.Println(err)
-		feed = data.NewChannel("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
+		feed = data.NewFeed("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
 			"https://distrikt-ni-st.de",
 			"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität")
 	}
@@ -47,33 +46,23 @@ func main() {
 	}
 	store := data.NewCookieStore(key)
 
-	articleList, err := data.LoadArticleList("tmp/unpublished-articles.gob")
-	if err != nil {
-		articleList = data.NewArticleList()
-	}
-
-	tagList, err := data.LoadTagList("tmp/tags.gob")
-	if err != nil {
-		tagList = data.NewTagList()
-	}
+	articleList := data.NewArticleList()
 
 	mux := http.NewServeMux()
 	mux.Handle("/web/static/", http.StripPrefix("/web/static/", http.FileServer(http.Dir("web/static/"))))
 	mux.HandleFunc("/", ui.HomePage(db, store))
 
-	mux.HandleFunc("GET /create-tag/", ui.CreateTag)
-	mux.HandleFunc("GET /create-user/", ui.CreateUser)
 	mux.HandleFunc("GET /hub/", ui.ShowHub(store))
 	mux.HandleFunc("GET /rss/", ui.ShowRSS(feed))
-	mux.HandleFunc("GET /unpublished-articles/", ui.ShowUnpublishedArticles(articleList))
-	mux.HandleFunc("GET /write-article/", ui.WriteArticle(tagList))
 
-	mux.HandleFunc("POST /add-tag/", ui.AddTag(tagList, store))
-	mux.HandleFunc("POST /add-user/", ui.AddUser(db, store))
+	mux.HandleFunc("POST /add-user/", ui.AddUser(db))
+	mux.HandleFunc("POST /create-user/", ui.CreateUser())
 	mux.HandleFunc("POST /finish-article/", ui.FinishArticle(articleList, store))
 	mux.HandleFunc("POST /login/", ui.Login(db, store))
 	mux.HandleFunc("POST /review-article/", ui.ReviewArticle(articleList, store))
 	mux.HandleFunc("POST /publish-article/", ui.PublishArticle(feed, articleList, store))
+	mux.HandleFunc("POST /unpublished-articles/", ui.ShowUnpublishedArticles(articleList))
+	mux.HandleFunc("POST /write-article/", ui.WriteArticle)
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

web/templates/add-tag.html

@@ -1,8 +0,0 @@
-{{define "page-content"}}
-<h2>Neuer Benutzer</h2>
-<form>
-    <input required name="tag" placeholder="Tag" type="text" />
-    <input type="submit" value="Anlegen" hx-post="/add-tag/" hx-target="#page-content" />
-</form>
-<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
-{{end}}

web/templates/add-user.html

@@ -8,16 +8,15 @@
     <input required name="first-name" placeholder="Vorname" type="text" value="{{.FirstName}}" />
     <input required name="last-name" placeholder="Nachname" type="text" value="{{.LastName}}" />
 
-    <input required id="writer" name="role" type="radio" value="2" {{if eq .Role 2 }}checked{{end}} />
     <label for="writer">Schreiber</label>
-    <input required id="editor" name="role" type="radio" value="1" {{if eq .Role 1 }}checked{{end}} />
+    <input required id="writer" name="role" type="radio" value="2" {{if eq .Role "2" }}checked{{end}} />
     <label for="editor">Redakteur</label>
-    <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
+    <input required id="editor" name="role" type="radio" value="1" {{if eq .Role "1" }}checked{{end}} />
     <label for="admin">Admin</label>
+    <input required id="admin" name="role" type="radio" value="0" {{if eq .Role "0" }}checked{{end}} />
 
     <input type="submit" value="Anlegen" hx-post="/add-user/" hx-target="#page-content" />
 </form>
-<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 
 <script>
     var msg = "{{.Msg}}";

web/templates/editor.html

@@ -4,10 +4,6 @@
     <input name="editor-title" placeholder="Titel" type="text" />
     <textarea name="editor-desc" placeholder="Beschreibung"></textarea>
     <textarea name="editor-text" placeholder="Artikel"></textarea>
-    {{range .}}
-    <input id="{{.}}" name="tags" type="checkbox" value="{{.}}" />
-    <label for="{{.}}">{{.}}</label>
-    {{end}}
     <input type="submit" value="Senden" hx-post="/finish-article/" hx-target="#page-content" />
 </form>
 {{end}}

web/templates/hub.html

@@ -1,12 +1,11 @@
 {{define "page-content"}}
 <h2>Hub</h2>
-<button hx-get="/write-article/" hx-target="#page-content">Artikel schreiben</button>
-<button hx-get="/rss/" hx-target="#page-content">RSS Feed</button>
-{{if lt . 2}}
-<button hx-get="/unpublished-articles/" hx-target="#page-content">Unveröffentlichte Artikel</button>
-<button hx-get="/create-tag/" hx-target="#page-content">Neuer Tag</button>
-{{end}}
+<button hx-post="/write-article/" hx-target="#page-content">Artikel schreiben</button>
+<button hx-post="/rss/" hx-target="#page-content">RSS Feed</button>
 {{if eq . 0}}
-<button hx-get="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+<button hx-post="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+{{end}}
+{{if lt . 2}}
+<button hx-post="/unpublished-articles/" hx-target="#page-content">Unveröffentlichte Artikel</button>
 {{end}}
 {{end}}