diff --git a/.air.toml b/.air.toml index 482fd84..8f9d6f6 100644 --- a/.air.toml +++ b/.air.toml @@ -5,7 +5,7 @@ tmp_dir = "tmp" [build] args_bin = [ "-desc 'Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität'", - "-domain localhost:8080", + "-domain localhost", "-key tmp/key.gob", "-link https://distrikt-ni-st.de", "-log tmp/cpolis.log", diff --git a/cmd/control/cli.go b/cmd/control/cli.go deleted file mode 100644 index 370545e..0000000 --- a/cmd/control/cli.go +++ /dev/null @@ -1,68 +0,0 @@ -package control - -import ( - "flag" - "fmt" - "path/filepath" -) - -type CliArgs struct { - Description string - DBName string - Domain string - KeyFile string - Link string - LogFile string - Port string - PicsDir string - RSSFile string - Title string - WebDir string -} - -func HandleCliArgs() (*CliArgs, error) { - var err error - cliArgs := new(CliArgs) - - flag.StringVar(&cliArgs.DBName, "db", "cpolis", "DB name") - flag.StringVar(&cliArgs.Description, "desc", "Description", "Channel description") - flag.StringVar(&cliArgs.Domain, "domain", "", "domain name") - keyFile := flag.String("key", "/var/www/cpolis/cpolis.key", "key file") - flag.StringVar(&cliArgs.Link, "link", "Link", "Channel Link") - logFile := flag.String("log", "/var/log/cpolis.log", "log file") - flag.StringVar(&cliArgs.PicsDir, "pics", "pics", "pictures directory") - port := flag.Int("port", 8080, "port") - rssFile := flag.String("rss", "/var/www/cpolis/cpolis.rss", "RSS file") - flag.StringVar(&cliArgs.Title, "title", "Title", "Channel title") - webDir := flag.String("web", "/var/www/cpolis/web", "web directory") - flag.Parse() - - cliArgs.KeyFile, err = filepath.Abs(*keyFile) - if err != nil { - return nil, fmt.Errorf("error finding absolute path for KeyFile: %v", err) - } - - cliArgs.LogFile, err = filepath.Abs(*logFile) - if err != nil { - return nil, fmt.Errorf("error finding absolute path for LogFile: %v", err) - } - - _, err = filepath.Abs(cliArgs.PicsDir) - if err != nil { - return nil, fmt.Errorf("error finding absolute path for PicsDir: %v", err) - } - - cliArgs.Port = fmt.Sprint(":", *port) - - cliArgs.RSSFile, err = filepath.Abs(*rssFile) - if err != nil { - return nil, fmt.Errorf("error finding absolute path for RSSFile: %v", err) - } - - cliArgs.WebDir, err = filepath.Abs(*webDir) - if err != nil { - return nil, fmt.Errorf("error finding absolute path for WebDir: %v", err) - } - - return cliArgs, nil -} diff --git a/cmd/control/config.go b/cmd/control/config.go new file mode 100644 index 0000000..e5ab394 --- /dev/null +++ b/cmd/control/config.go @@ -0,0 +1,131 @@ +package control + +import ( + "flag" + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/BurntSushi/toml" +) + +type Config struct { + DBName string + Description string + Domain string + KeyFile string + Link string + LogFile string + PicsDir string + Port string + RSSFile string + Title string + WebDir string +} + +func newConfig() *Config { + return &Config{ + DBName: "cpolis", + KeyFile: "/var/www/cpolis/cpolis.key", + LogFile: "/var/log/cpolis.log", + PicsDir: "/var/www/cpolis/pics", + RSSFile: "/var/www/cpolis/cpolis.rss", + WebDir: "/var/www/cpolis/web", + } +} + +func (c *Config) readFile() error { + cfgFile, err := filepath.Abs(os.Getenv("HOME") + "/.config/cpolis/config.toml") + if err != nil { + return fmt.Errorf("error getting absolute path for config file: %v", err) + } + + _, err = os.Stat(cfgFile) + if os.IsNotExist(err) { + fileStrings := strings.Split(cfgFile, "/") + + dir := strings.Join(fileStrings[0:len(fileStrings)-1], "/") + if err = os.MkdirAll(dir, 0755); err != nil { + return fmt.Errorf("error creating config directory: %v", err) + } + + fileName := fileStrings[len(fileStrings)-1] + file, err := os.Create(dir + "/" + fileName) + if err != nil { + return fmt.Errorf("error creating config file: %v", err) + } + defer file.Close() + if err = file.Chmod(0644); err != nil { + return fmt.Errorf("error setting permissions for config file: %v", err) + } + } else { + _, err = toml.DecodeFile(cfgFile, c) + if err != nil { + return fmt.Errorf("error reading config file: %v", err) + } + } + + return nil +} + +func (c *Config) handleCliArgs() error { + var err error + port := 8080 + + flag.StringVar(&c.DBName, "db", c.DBName, "DB name") + flag.StringVar(&c.Description, "desc", c.Description, "Channel description") + flag.StringVar(&c.Domain, "domain", c.Domain, "domain name") + flag.StringVar(&c.KeyFile, "key", c.KeyFile, "key file") + flag.StringVar(&c.Link, "link", c.Link, "Channel Link") + flag.StringVar(&c.LogFile, "log", c.LogFile, "log file") + flag.StringVar(&c.PicsDir, "pics", c.PicsDir, "pictures directory") + flag.StringVar(&c.RSSFile, "rss", c.RSSFile, "RSS file") + flag.StringVar(&c.Title, "title", c.Title, "Channel title") + flag.StringVar(&c.WebDir, "web", c.WebDir, "web directory") + flag.IntVar(&port, "port", port, "port") + flag.Parse() + + c.KeyFile, err = filepath.Abs(c.KeyFile) + if err != nil { + return fmt.Errorf("error finding absolute path for key file: %v", err) + } + + c.LogFile, err = filepath.Abs(c.LogFile) + if err != nil { + return fmt.Errorf("error finding absolute path for log file: %v", err) + } + + c.PicsDir, err = filepath.Abs(c.PicsDir) + if err != nil { + return fmt.Errorf("error finding absolute path for pics dir: %v", err) + } + + c.Port = fmt.Sprint(":", port) + + c.RSSFile, err = filepath.Abs(c.RSSFile) + if err != nil { + return fmt.Errorf("error finding absolute path for RSS file: %v", err) + } + + c.WebDir, err = filepath.Abs(c.WebDir) + if err != nil { + return fmt.Errorf("error finding absolute path for web dir: %v", err) + } + + return nil +} + +func HandleConfig() (*Config, error) { + config := newConfig() + + if err := config.readFile(); err != nil { + return nil, fmt.Errorf("error reading config file: %v", err) + } + + if err := config.handleCliArgs(); err != nil { + return nil, fmt.Errorf("error handling cli arguments: %v", err) + } + + return config, nil +} diff --git a/cmd/control/rss.go b/cmd/control/rss.go index 867aa92..170c359 100644 --- a/cmd/control/rss.go +++ b/cmd/control/rss.go @@ -121,7 +121,9 @@ func SaveRSS(filename string, feed *string) error { return fmt.Errorf("error creating file for RSS feed: %v", err) } defer file.Close() - file.Chmod(0644) + if err = file.Chmod(0644); err != nil { + return fmt.Errorf("error setting permissions for RSS file: %v", err) + } if _, err = io.WriteString(file, *feed); err != nil { return fmt.Errorf("error writing to RSS file: %v", err) diff --git a/cmd/main.go b/cmd/main.go index 6904782..0528b88 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,69 +16,69 @@ func init() { } func main() { - args, err := control.HandleCliArgs() + config, err := control.HandleConfig() if err != nil { log.Fatalln(err) } - logFile, err := os.OpenFile(args.LogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) + logFile, err := os.OpenFile(config.LogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) if err != nil { log.Fatalln(err) } defer logFile.Close() log.SetOutput(logFile) - db, err := model.OpenDB(args.DBName) + db, err := model.OpenDB(config.DBName) if err != nil { log.Fatalln(err) } defer db.Close() - key, err := control.LoadKey(args.KeyFile) + key, err := control.LoadKey(config.KeyFile) if err != nil { key, err = control.NewKey() if err != nil { log.Fatalln(err) } - control.SaveKey(key, args.KeyFile) + control.SaveKey(key, config.KeyFile) } store := control.NewCookieStore(key) mux := http.NewServeMux() mux.Handle("/web/static/", http.StripPrefix("/web/static/", - http.FileServer(http.Dir(args.WebDir+"/static/")))) - mux.HandleFunc("/", view.HomePage(args, db, store)) + http.FileServer(http.Dir(config.WebDir+"/static/")))) + mux.HandleFunc("/", view.HomePage(config, db, store)) - mux.HandleFunc("GET /create-tag", view.CreateTag(args)) - mux.HandleFunc("GET /create-user", view.CreateUser(args)) - mux.HandleFunc("GET /edit-self", view.EditSelf(args, db, store)) - mux.HandleFunc("GET /edit-user/{id}", view.EditUser(args, db)) - mux.HandleFunc("GET /hub", view.ShowHub(args, db, store)) - mux.HandleFunc("GET /logout", view.Logout(args, store)) - mux.HandleFunc("GET /pics/{pic}", view.ServeImage(args, store)) - mux.HandleFunc("GET /publish-article/{id}", view.PublishArticle(args, db, store)) - mux.HandleFunc("GET /publish-issue", view.PublishLatestIssue(args, db, store)) - mux.HandleFunc("GET /reject-article/{id}", view.RejectArticle(args, db, store)) - mux.HandleFunc("GET /rejected-articles", view.ShowRejectedArticles(args, db, store)) - mux.HandleFunc("GET /review-rejected-article/{id}", view.ReviewRejectedArticle(args, db, store)) - mux.HandleFunc("GET /review-unpublished-article/{id}", view.ReviewUnpublishedArticle(args, db, store)) + mux.HandleFunc("GET /create-tag", view.CreateTag(config)) + mux.HandleFunc("GET /create-user", view.CreateUser(config)) + mux.HandleFunc("GET /edit-self", view.EditSelf(config, db, store)) + mux.HandleFunc("GET /edit-user/{id}", view.EditUser(config, db)) + mux.HandleFunc("GET /hub", view.ShowHub(config, db, store)) + mux.HandleFunc("GET /logout", view.Logout(config, store)) + mux.HandleFunc("GET /pics/{pic}", view.ServeImage(config, store)) + mux.HandleFunc("GET /publish-article/{id}", view.PublishArticle(config, db, store)) + mux.HandleFunc("GET /publish-issue", view.PublishLatestIssue(config, db, store)) + mux.HandleFunc("GET /reject-article/{id}", view.RejectArticle(config, db, store)) + mux.HandleFunc("GET /rejected-articles", view.ShowRejectedArticles(config, db, store)) + mux.HandleFunc("GET /review-rejected-article/{id}", view.ReviewRejectedArticle(config, db, store)) + mux.HandleFunc("GET /review-unpublished-article/{id}", view.ReviewUnpublishedArticle(config, db, store)) mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, args.RSSFile) + http.ServeFile(w, r, config.RSSFile) }) - mux.HandleFunc("GET /show-all-users", view.ShowAllUsers(args, db)) - mux.HandleFunc("GET /this-issue", view.ShowCurrentArticles(args, db)) - mux.HandleFunc("GET /unpublished-articles", view.ShowUnpublishedArticles(args, db)) - mux.HandleFunc("GET /write-article", view.WriteArticle(args, db)) + mux.HandleFunc("GET /show-all-users", view.ShowAllUsers(config, db)) + mux.HandleFunc("GET /this-issue", view.ShowCurrentArticles(config, db)) + mux.HandleFunc("GET /unpublished-articles", view.ShowUnpublishedArticles(config, db)) + mux.HandleFunc("GET /write-article", view.WriteArticle(config, db)) - mux.HandleFunc("POST /add-first-user", view.AddFirstUser(args, db, store)) - mux.HandleFunc("POST /add-tag", view.AddTag(args, db, store)) - mux.HandleFunc("POST /add-user", view.AddUser(args, db, store)) - mux.HandleFunc("POST /login", view.Login(args, db, store)) - mux.HandleFunc("POST /resubmit-article/{id}", view.ResubmitArticle(args, db, store)) - mux.HandleFunc("POST /submit-article", view.SubmitArticle(args, db, store)) - mux.HandleFunc("POST /update-self", view.UpdateSelf(args, db, store)) - mux.HandleFunc("POST /update-user/{id}", view.UpdateUser(args, db, store)) - mux.HandleFunc("POST /upload-image", view.UploadImage(args)) + mux.HandleFunc("POST /add-first-user", view.AddFirstUser(config, db, store)) + mux.HandleFunc("POST /add-tag", view.AddTag(config, db, store)) + mux.HandleFunc("POST /add-user", view.AddUser(config, db, store)) + mux.HandleFunc("POST /login", view.Login(config, db, store)) + mux.HandleFunc("POST /resubmit-article/{id}", view.ResubmitArticle(config, db, store)) + mux.HandleFunc("POST /submit-article", view.SubmitArticle(config, db, store)) + mux.HandleFunc("POST /update-self", view.UpdateSelf(config, db, store)) + mux.HandleFunc("POST /update-user/{id}", view.UpdateUser(config, db, store)) + mux.HandleFunc("POST /upload-image", view.UploadImage(config)) - log.Fatalln(http.ListenAndServe(args.Port, mux)) + log.Fatalln(http.ListenAndServe(config.Port, mux)) } diff --git a/cmd/view/articles.go b/cmd/view/articles.go index 511d3e0..6faaae9 100644 --- a/cmd/view/articles.go +++ b/cmd/view/articles.go @@ -17,7 +17,7 @@ import ( "streifling.com/jason/cpolis/cmd/model" ) -func ShowHub(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func ShowHub(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { session, err := s.Get(r, "cookie") if err != nil { @@ -31,7 +31,7 @@ func ShowHub(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand } } -func WriteArticle(c *control.CliArgs, db *model.DB) http.HandlerFunc { +func WriteArticle(c *control.Config, db *model.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tags, err := db.GetTagList() if err != nil { @@ -45,7 +45,7 @@ func WriteArticle(c *control.CliArgs, db *model.DB) http.HandlerFunc { } } -func SubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func SubmitArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { session, err := s.Get(r, "cookie") if err != nil { @@ -93,7 +93,7 @@ func SubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) htt } } -func ResubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func ResubmitArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { id, err := strconv.ParseInt(r.PathValue("id"), 10, 64) if err != nil { @@ -147,7 +147,7 @@ func ResubmitArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) h } } -func ShowUnpublishedArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc { +func ShowUnpublishedArticles(c *control.Config, db *model.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { unpublishedArticles, err := db.GetCertainArticles(false, false) if err != nil { @@ -162,7 +162,7 @@ func ShowUnpublishedArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc } } -func ShowRejectedArticles(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func ShowRejectedArticles(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { type htmlData struct { MyIDs map[int64]bool @@ -197,7 +197,7 @@ func ShowRejectedArticles(c *control.CliArgs, db *model.DB, s *control.CookieSto } } -func ReviewUnpublishedArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func ReviewUnpublishedArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { type htmlData struct { Title string @@ -259,7 +259,7 @@ func ReviewUnpublishedArticle(c *control.CliArgs, db *model.DB, s *control.Cooki } } -func ReviewRejectedArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func ReviewRejectedArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { type htmlData struct { Selected map[int64]bool @@ -306,7 +306,7 @@ func ReviewRejectedArticle(c *control.CliArgs, db *model.DB, s *control.CookieSt } } -func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func PublishArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { id, err := strconv.ParseInt(r.PathValue("id"), 10, 64) if err != nil { @@ -356,7 +356,7 @@ func PublishArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) ht } } -func RejectArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func RejectArticle(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { id, err := strconv.ParseInt(r.PathValue("id"), 10, 64) if err != nil { @@ -386,7 +386,7 @@ func RejectArticle(c *control.CliArgs, db *model.DB, s *control.CookieStore) htt } } -func ShowCurrentArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc { +func ShowCurrentArticles(c *control.Config, db *model.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { articles, err := db.GetCurrentIssueArticles() if err != nil { @@ -400,7 +400,7 @@ func ShowCurrentArticles(c *control.CliArgs, db *model.DB) http.HandlerFunc { } } -func UploadImage(c *control.CliArgs) http.HandlerFunc { +func UploadImage(c *control.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { file, header, err := r.FormFile("article-image") if err != nil { diff --git a/cmd/view/editor.go b/cmd/view/editor.go index aa7fbdd..cf76960 100644 --- a/cmd/view/editor.go +++ b/cmd/view/editor.go @@ -8,14 +8,14 @@ import ( "streifling.com/jason/cpolis/cmd/model" ) -func CreateTag(c *control.CliArgs) http.HandlerFunc { +func CreateTag(c *control.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-tag.html") template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil) } } -func AddTag(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func AddTag(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { db.AddTag(r.PostFormValue("tag")) diff --git a/cmd/view/images.go b/cmd/view/images.go index 70cbc21..91bb2f5 100644 --- a/cmd/view/images.go +++ b/cmd/view/images.go @@ -8,7 +8,7 @@ import ( "streifling.com/jason/cpolis/cmd/control" ) -func ServeImage(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc { +func ServeImage(c *control.Config, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { absFilepath, err := filepath.Abs(c.PicsDir) if err != nil { diff --git a/cmd/view/issues.go b/cmd/view/issues.go index a23b11d..cf5f369 100644 --- a/cmd/view/issues.go +++ b/cmd/view/issues.go @@ -9,7 +9,7 @@ import ( "streifling.com/jason/cpolis/cmd/model" ) -func PublishLatestIssue(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func PublishLatestIssue(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { if err := db.PublishLatestIssue(); err != nil { log.Println(err) diff --git a/cmd/view/sessions.go b/cmd/view/sessions.go index 2bb42d8..3d6163d 100644 --- a/cmd/view/sessions.go +++ b/cmd/view/sessions.go @@ -27,7 +27,7 @@ func saveSession(w http.ResponseWriter, r *http.Request, s *control.CookieStore, return nil } -func HomePage(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func HomePage(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { numRows, err := db.CountEntries("users") if err != nil { @@ -54,7 +54,7 @@ func HomePage(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Han } } -func Login(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func Login(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { userName := r.PostFormValue("username") password := r.PostFormValue("password") @@ -89,7 +89,7 @@ func Login(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Handle } } -func Logout(c *control.CliArgs, s *control.CookieStore) http.HandlerFunc { +func Logout(c *control.Config, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { session, err := s.Get(r, "cookie") if err != nil { diff --git a/cmd/view/users.go b/cmd/view/users.go index c67e96b..d4e8d93 100644 --- a/cmd/view/users.go +++ b/cmd/view/users.go @@ -31,14 +31,14 @@ func checkUserStrings(user *model.User) (string, int, bool) { } } -func CreateUser(c *control.CliArgs) http.HandlerFunc { +func CreateUser(c *control.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html") template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil) } } -func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func AddUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { role, err := strconv.Atoi(r.PostFormValue("role")) if err != nil { @@ -100,7 +100,7 @@ func AddUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Hand } } -func EditSelf(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func EditSelf(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { session, err := s.Get(r, "cookie") if err != nil { @@ -121,7 +121,7 @@ func EditSelf(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.Han } } -func UpdateSelf(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func UpdateSelf(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { session, err := s.Get(r, "cookie") if err != nil { @@ -191,7 +191,7 @@ func UpdateSelf(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.H } } -func AddFirstUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func AddFirstUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var err error @@ -266,7 +266,7 @@ func AddFirstUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http } } -func ShowAllUsers(c *control.CliArgs, db *model.DB) http.HandlerFunc { +func ShowAllUsers(c *control.Config, db *model.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { users, err := db.GetAllUsers() if err != nil { @@ -280,7 +280,7 @@ func ShowAllUsers(c *control.CliArgs, db *model.DB) http.HandlerFunc { } } -func EditUser(c *control.CliArgs, db *model.DB) http.HandlerFunc { +func EditUser(c *control.Config, db *model.DB) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { id, err := strconv.ParseInt(r.PathValue("id"), 10, 64) if err != nil { @@ -301,7 +301,7 @@ func EditUser(c *control.CliArgs, db *model.DB) http.HandlerFunc { } } -func UpdateUser(c *control.CliArgs, db *model.DB, s *control.CookieStore) http.HandlerFunc { +func UpdateUser(c *control.Config, db *model.DB, s *control.CookieStore) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { id, err := strconv.ParseInt(r.PathValue("id"), 10, 64) if err != nil { diff --git a/go.mod b/go.mod index 789ed0d..7fd87e0 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.22.0 require ( git.streifling.com/jason/rss v0.1.2 + github.com/BurntSushi/toml v1.3.2 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.6.0 github.com/gorilla/sessions v1.2.2 diff --git a/go.sum b/go.sum index 81666dc..84da03e 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.streifling.com/jason/rss v0.1.2 h1:UB3UHJXMt5WDDh9y8n0Z6nS1XortbPXjEr7QZTdovY4= git.streifling.com/jason/rss v0.1.2/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= 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=