Added Tags to RSS feed as categories

cmd/data/articles.go

@@ -11,25 +11,27 @@ import (
 )
 
 type Article struct {
-	Tags     *TagList
 	Title    string
 	Author   string
 	Created  time.Time
 	Desc     string
 	Content  string
+	Tags     []string
 	UUID     uuid.UUID
 	AuthorID int64
 }
 
+// TODO: setCh
 type ArticleList struct {
 	addCh    chan *Article
 	delCh    chan uuid.UUID
-	retCh    chan *Article
 	getCh    chan []Article
+	retCh    chan *Article
 	articles []*Article
 	wg       sync.WaitGroup
 }
 
+// TODO: setCh
 type TagList struct {
 	addCh chan string
 	getCh chan []string
@@ -37,16 +39,16 @@ type TagList struct {
 	wg    sync.WaitGroup
 }
 
-func minArticleList() *ArticleList {
+func initArticleList() *ArticleList {
 	return &ArticleList{
 		addCh: make(chan *Article),
 		delCh: make(chan uuid.UUID),
-		retCh: make(chan *Article),
 		getCh: make(chan []Article),
+		retCh: make(chan *Article),
 	}
 }
 
-func minTagList() *TagList {
+func initTagList() *TagList {
 	return &TagList{
 		addCh: make(chan string),
 		getCh: make(chan []string),
@@ -89,8 +91,8 @@ func (tl *TagList) start() {
 }
 
 func NewArticleList() *ArticleList {
-	list := minArticleList()
+	list := initArticleList()
-	list.articles = []*Article{}
+	list.articles = make([]*Article, 0)
 
 	list.wg.Add(1)
 	go list.start()
@@ -106,6 +108,7 @@ func (al *ArticleList) Add(a *Article) {
 func (al *ArticleList) Release(uuid uuid.UUID) (*Article, bool) {
 	al.delCh <- uuid
 	article := <-al.retCh
+
 	if article == nil {
 		return nil, false
 	}
@@ -123,10 +126,8 @@ func (al *ArticleList) Save(filename string) error {
 	}
 	defer file.Close()
 
-	encoder := gob.NewEncoder(file)
 	articles := al.Get()
-	err = encoder.Encode(articles)
+	if err = gob.NewEncoder(file).Encode(articles); err != nil {
-	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -139,10 +140,8 @@ func LoadArticleList(filename string) (*ArticleList, error) {
 		return nil, fmt.Errorf("error opening key file: %v", err)
 	}
 
-	decoder := gob.NewDecoder(file)
 	articleList := NewArticleList()
-	err = decoder.Decode(&articleList.articles)
+	if err = gob.NewDecoder(file).Decode(&articleList.articles); err != nil {
-	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 
@@ -150,8 +149,8 @@ func LoadArticleList(filename string) (*ArticleList, error) {
 }
 
 func NewTagList() *TagList {
-	list := minTagList()
+	list := initTagList()
-	list.tags = []string{}
+	list.tags = make([]string, 0)
 
 	list.wg.Add(1)
 	go list.start()
@@ -175,10 +174,8 @@ func (tl *TagList) Save(filename string) error {
 	}
 	defer file.Close()
 
-	encoder := gob.NewEncoder(file)
 	tags := tl.Get()
-	err = encoder.Encode(tags)
+	if err = gob.NewEncoder(file).Encode(tags); err != nil {
-	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -190,11 +187,10 @@ func LoadTagList(filename string) (*TagList, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error opening key file: %v", err)
 	}
+	defer file.Close()
 
-	decoder := gob.NewDecoder(file)
 	tagList := NewTagList()
-	err = decoder.Decode(&tagList.tags)
+	if err = gob.NewDecoder(file).Decode(&tagList.tags); err != nil {
-	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 

cmd/data/db.go

@@ -45,8 +45,7 @@ func (db *DB) AddUser(user *User, pass string) error {
         (username, password, first_name, last_name, role)
     VALUES (?, ?, ?, ?, ?)
     `
-	_, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role)
+	if _, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role); err != nil {
-	if err != nil {
 		return fmt.Errorf("error inserting user into DB: %v", err)
 	}
 
@@ -104,8 +103,7 @@ func (db *DB) ChangePassword(id int64, oldPass, newPass string) error {
     SET password = ?
     WHERE id = ?
     `
-	_, err = db.Exec(query, string(newHashedPass), id)
+	if _, err = db.Exec(query, string(newHashedPass), id); err != nil {
-	if err != nil {
 		return fmt.Errorf("error updating password in DB: %v", err)
 	}
 
@@ -134,8 +132,7 @@ func (db *DB) GetUser(id int64) (*User, error) {
     `
 
 	row := db.QueryRow(query, id)
-	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName,
+	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName, &user.LastName, &user.Role); err != nil {
-		&user.LastName, &user.Role); err != nil {
 		return nil, fmt.Errorf("error reading user information: %v", err)
 	}
 

cmd/data/rss.go

@@ -0,0 +1,104 @@
+package data
+
+import (
+	"encoding/gob"
+	"fmt"
+	"os"
+	"sync"
+
+	"git.streifling.com/jason/rss"
+)
+
+type Channel struct {
+	addCh   chan *rss.Item
+	setCh   chan rss.Channel
+	getCh   chan rss.Channel
+	channel rss.Channel
+	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 (c *Channel) start() {
+	c.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:
+		}
+	}
+}
+
+func NewChannel(title, link, desc string) *Channel {
+	channel := initChannel()
+	channel.channel = rss.Channel{
+		Title:       title,
+		Link:        link,
+		Description: desc,
+	}
+
+	channel.wg.Add(1)
+	go channel.start()
+	channel.wg.Wait()
+
+	return channel
+}
+
+func (c *Channel) Get() rss.Channel {
+	return <-c.getCh
+}
+
+func (f *Channel) Set(channel rss.Channel) {
+	f.setCh <- channel
+}
+
+func LoadChannel(filename string) (*Channel, error) {
+	file, err := os.Open(filename)
+	if err != nil {
+		return nil, fmt.Errorf("error opening file %v: %v", filename, err)
+	}
+	defer file.Close()
+
+	channel := initChannel()
+	channel.wg.Add(1)
+	go channel.start()
+	channel.wg.Wait()
+
+	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)
+	}
+
+	channel.Set(*tmpChannel)
+	return channel, nil
+}
+
+func (c *Channel) 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 {
+		return fmt.Errorf("error encoding file %v: %v", filename, err)
+	}
+
+	return nil
+}
+
+func (c *Channel) Add(i *rss.Item) {
+	c.addCh <- i
+}

cmd/data/sessions.go

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

cmd/ui/articles.go

@@ -58,6 +58,9 @@ 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")
@@ -71,7 +74,7 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 		article.AuthorID = session.Values["id"].(int64)
 
 		al.Add(article)
-		al.Save("tmp/articles.gob")
+		al.Save("tmp/unpublished-articles.gob")
 
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
@@ -116,7 +119,7 @@ func ReviewArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	}
 }
 
-func PublishArticle(f *rss.Feed, al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
+func PublishArticle(c *data.Channel, al *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 {
@@ -141,13 +144,15 @@ func PublishArticle(f *rss.Feed, al *data.ArticleList, s *data.CookieStore) http
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		item := rss.NewItem()
+		c.Add(&rss.Item{
-		item.Title = article.Title
+			Title:       article.Title,
-		item.Author = article.Author
+			Author:      session.Values["name"].(string),
-		item.Description = article.Desc
+			PubDate:     article.Created.Format(time.RFC1123Z),
-		item.Content = &rss.Content{Value: article.Content}
+			Description: article.Desc,
-		f.Channels[0].AddItem(item)
+			Content:     &rss.Content{Value: article.Content},
-		f.Save("tmp/rss.gob")
+			Categories:  article.Tags,
+		})
+		c.Save("tmp/rss.gob")
 
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)

cmd/ui/rss.go

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

go.mod

@@ -3,9 +3,10 @@ module streifling.com/jason/cpolis
 go 1.22.0
 
 require (
-	git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc
+	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
 	github.com/gorilla/sessions v1.2.2
 	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/yuin/goldmark v1.7.0

go.sum

@@ -1,7 +1,11 @@
-git.streifling.com/jason/rss v0.0.0-20240305140009-a59d3f112892 h1:miU3U9H8zSoYprEaG7xaGLMb4CcGLjGt7McC8Wrf+Vs=
+git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565 h1:/eO9NTksh+9yLz3HiYNR7BJo/iMTxxW5/d9h8I6vR6E=
-git.streifling.com/jason/rss v0.0.0-20240305140009-a59d3f112892/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc h1:vJ36ouI2wTK+jFktnqyAfFHoYnoznAgAo1nUzvMzCvQ=
+git.streifling.com/jason/rss v0.0.0-20240305160544-c8551159fe32 h1:G25NZzsD73rOkGYgV2vPUDviB0JXk5qi+dXOwB6J56U=
-git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+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=
@@ -12,12 +16,20 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
+github.com/gorilla/feeds v1.1.2 h1:pxzZ5PD3RJdhFH2FsJJ4x6PqMqbgFk1+Vez4XWBW8Iw=
+github.com/gorilla/feeds v1.1.2/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
 github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
 github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA=
 github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=

main.go

@@ -29,10 +29,10 @@ func main() {
 	}
 	defer db.Close()
 
-	feed, err := data.OpenFeed("tmp/rss.gob")
+	feed, err := data.LoadChannel("tmp/rss.gob")
 	if err != nil {
 		log.Println(err)
-		feed = data.NewFeed("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
+		feed = data.NewChannel("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
 			"https://distrikt-ni-st.de",
 			"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität")
 	}
@@ -47,7 +47,7 @@ func main() {
 	}
 	store := data.NewCookieStore(key)
 
-	articleList, err := data.LoadArticleList("tmp/articles.gob")
+	articleList, err := data.LoadArticleList("tmp/unpublished-articles.gob")
 	if err != nil {
 		articleList = data.NewArticleList()
 	}