jason/cpolis
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 58 Wiki Activity

Added ability to publish articles

Browse Source
This commit is contained in:
Jason Streifling
2024-03-01 11:30:31 +01:00
parent cba3c663c9
commit f59321b9c6
10 changed files with 127 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
cmd/data/articles.go
View File

@ -1,58 +1,41 @@
package data
import "time"
import (
"sync"
"time"
"github.com/google/uuid"
)
type Article struct {
Title string
Created time.Time
Desc string
Content string
UUID uuid.UUID
}
type ArticleList struct {
addChan chan Article
releaseChan chan int
returnChan chan Article
List []Article
}
func (l *ArticleList) start() {
for {
select {
case article := <-l.addChan:
l.List = append(l.List, article)
case i := <-l.releaseChan:
l.returnChan <- l.List[i]
l.List = append(l.List[:i], l.List[i+1:]...)
}
}
}
func NewArticleList() *ArticleList {
list := &ArticleList{
List: []Article{},
addChan: make(chan Article),
releaseChan: make(chan int),
returnChan: make(chan Article),
}
list.start()
return list
}
func (l *ArticleList) Close() {
close(l.addChan)
close(l.releaseChan)
close(l.returnChan)
List []Article
sync.Mutex
}
func (l *ArticleList) Add(a Article) {
l.addChan <- a
l.Lock()
l.List = append(l.List, a)
l.Unlock()
}
func (l *ArticleList) Release(i int) (Article, bool) {
if i < 0 || i > len(l.List) {
return Article{}, false
func (l *ArticleList) Release(uuid uuid.UUID) (Article, bool) {
l.Lock()
for i, article := range l.List {
if article.UUID == uuid {
foo := l.List[i]
l.List = append(l.List[:i], l.List[i+1:]...)
l.Unlock()
return foo, true
}
}
l.releaseChan <- i
return <-l.returnChan, true
l.Unlock()
return Article{}, false
}

26
cmd/data/rss.go
View File

@ -4,36 +4,24 @@ import (
"encoding/gob"
"fmt"
"os"
"sync"
"github.com/gorilla/feeds"
)
type Feed struct {
feeds.Feed
addChan chan *feeds.Item
}
func (f *Feed) start() {
for item := range f.addChan {
f.Items = append(f.Items, item)
}
sync.Mutex
}
func NewFeed(title, link, desc string) *Feed {
feed := &Feed{
return &Feed{
Feed: feeds.Feed{
Title: title,
Link: &feeds.Link{Href: link},
Description: desc,
},
addChan: make(chan *feeds.Item),
}
feed.start()
return feed
}
func (f *Feed) Close() {
close(f.addChan)
}
func OpenFeed(filename string) (*Feed, error) {
@ -49,8 +37,6 @@ func OpenFeed(filename string) (*Feed, error) {
if err != nil {
return nil, fmt.Errorf("error decoding file %v: %v", filename, err)
}
feed.addChan = make(chan *feeds.Item)
feed.start()
return feed, nil
}
@ -63,7 +49,9 @@ func (f *Feed) Save(filename string) error {
defer file.Close()
encoder := gob.NewEncoder(file)
f.Lock()
err = encoder.Encode(f.Feed)
f.Unlock()
if err != nil {
return fmt.Errorf("error encoding file %v: %v", filename, err)
}
@ -72,5 +60,7 @@ func (f *Feed) Save(filename string) error {
}
func (f *Feed) Add(i *feeds.Item) {
f.addChan <- i
f.Lock()
f.Items = append(f.Items, i)
f.Unlock()
}

34
cmd/ui/admin.go
View File

@ -51,7 +51,7 @@ func AddUser(db *data.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var writer, editor, admin bool
data := AddUserData{
htmlData := AddUserData{
User: r.PostFormValue("username"),
First: r.PostFormValue("first-name"),
Last: r.PostFormValue("last-name"),
@ -60,29 +60,29 @@ func AddUser(db *data.DB) http.HandlerFunc {
pass := r.PostFormValue("password")
pass2 := r.PostFormValue("password2")
if inputsEmpty(data.User, pass, pass2, data.First, data.Last, data.Role) {
data.Msg = "Alle Felder müssen ausgefüllt werden."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
if inputsEmpty(htmlData.User, pass, pass2, htmlData.First, htmlData.Last, htmlData.Role) {
htmlData.Msg = "Alle Felder müssen ausgefüllt werden."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", htmlData)
return
}
userString, stringLen, ok := checkUserStrings(data.User, data.First, data.Last)
userString, stringLen, ok := checkUserStrings(htmlData.User, htmlData.First, htmlData.Last)
if !ok {
data.Msg = fmt.Sprint(userString, " ist zu lang. Maximal ", stringLen, " Zeichen erlaubt.")
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
htmlData.Msg = fmt.Sprint(userString, " ist zu lang. Maximal ", stringLen, " Zeichen erlaubt.")
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", htmlData)
return
}
id, _ := db.GetID(data.User)
id, _ := db.GetID(htmlData.User)
if id != 0 {
data.Msg = fmt.Sprint(data.User, " ist bereits vergeben. Bitte anderen Benutzernamen wählen.")
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
htmlData.Msg = fmt.Sprint(htmlData.User, " ist bereits vergeben. Bitte anderen Benutzernamen wählen.")
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", htmlData)
return
}
if pass != pass2 {
data.Msg = "Die Passwörter stimmen nicht überein."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
htmlData.Msg = "Die Passwörter stimmen nicht überein."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", htmlData)
return
}
switch data.Role {
switch htmlData.Role {
case "writer":
writer = true
editor = false
@ -96,13 +96,13 @@ func AddUser(db *data.DB) http.HandlerFunc {
editor = false
admin = true
default:
log.Println("When setting up", data.User, "the HTML was altered.")
data.Msg = "Das HTML der Seite zu verändern ist unzulässig. Dieser Vorfall wurde gespeichert."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
log.Println("When setting up", htmlData.User, "the HTML was altered.")
htmlData.Msg = "Das HTML der Seite zu verändern ist unzulässig. Dieser Vorfall wurde gespeichert."
template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", htmlData)
return
}
if err := db.AddUser(data.User, pass, data.First, data.Last, writer, editor, admin); err != nil {
if err := db.AddUser(htmlData.User, pass, htmlData.First, htmlData.Last, writer, editor, admin); err != nil {
log.Println(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return

51
cmd/ui/articles.go
View File

@ -6,10 +6,17 @@ import (
"net/http"
"time"
"github.com/google/uuid"
"github.com/gorilla/feeds"
"streifling.com/jason/cpolis/cmd/data"
)
func ShowHub() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
template.Must(template.ParseFiles("web/templates/hub.html")).ExecuteTemplate(w, "page-content", nil)
}
}
func WriteArticle() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
template.Must(template.ParseFiles("web/templates/editor.html")).ExecuteTemplate(w, "page-content", nil)
@ -42,20 +49,54 @@ func FinishArticle(l *data.ArticleList) http.HandlerFunc {
return
}
article.UUID = uuid.New()
article.Created = time.Now()
l.Add(article)
template.Must(template.ParseFiles("web/templates/hub.html")).ExecuteTemplate(w, "page-content", nil)
}
}
func PublishArticle(f *data.Feed, l *data.ArticleList, i int) http.HandlerFunc {
func ShowUnpublishedArticles(l *data.ArticleList) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
article, ok := l.Release(i)
template.Must(template.ParseFiles("web/templates/unpublished-articles.html")).ExecuteTemplate(w, "page-content", l.List)
}
}
func ReviewArticle(l *data.ArticleList) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
uuid, err := uuid.Parse(r.PostFormValue("uuid"))
if err != nil {
log.Println(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
for _, article := range l.List {
if article.UUID == uuid {
template.Must(template.ParseFiles("web/templates/to-be-published.html")).ExecuteTemplate(w, "page-content", article)
return
}
}
template.Must(template.ParseFiles("web/templates/hub.html")).ExecuteTemplate(w, "page-content", nil)
}
}
func PublishArticle(f *data.Feed, l *data.ArticleList) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
uuid, err := uuid.Parse(r.PostFormValue("uuid"))
if err != nil {
log.Println(err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
article, ok := l.Release(uuid)
if !ok {
// TODO: Warnung anzeigen
// data.Msg = "Alle Felder müssen ausgefüllt werden."
// template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", data)
// msg = "Alle Felder müssen ausgefüllt werden."
// template.Must(template.ParseFiles("web/templates/add-user.html")).ExecuteTemplate(w, "page-content", msg)
return
}
@ -65,7 +106,7 @@ func PublishArticle(f *data.Feed, l *data.ArticleList, i int) http.HandlerFunc {
Description: article.Desc,
Content: article.Content,
})
f.Save("rss.gob")
f.Save("tmp/rss.gob")
template.Must(template.ParseFiles("web/templates/hub.html")).ExecuteTemplate(w, "page-content", nil)
}