From 4e905e85221664f533c175b3f3431ba615b08643 Mon Sep 17 00:00:00 2001
From: lyx0 <66651385+lyx0@users.noreply.github.com>
Date: Sun, 11 Feb 2024 15:48:32 +0100
Subject: [PATCH] add timers page for specific channels
---
cmd/nourybot/router.go | 82 ++++++++++++++-----------
web/templates/channeltimers.page.gohtml | 20 ++++++
web/templates/timers.page.gohtml | 2 +-
3 files changed, 66 insertions(+), 38 deletions(-)
create mode 100644 web/templates/channeltimers.page.gohtml
diff --git a/cmd/nourybot/router.go b/cmd/nourybot/router.go
index df98af3..8c158f8 100644
--- a/cmd/nourybot/router.go
+++ b/cmd/nourybot/router.go
@@ -34,6 +34,11 @@ type timersRouteData struct {
Timers []data.Timer
}
+type channelTimersRouteData struct {
+ Timers []data.Timer
+ Channel string
+}
+
func (app *application) timersRoute(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
t, err := template.ParseFiles("./web/templates/timers.page.gohtml")
if err != nil {
@@ -73,6 +78,46 @@ func (app *application) timersRoute(w http.ResponseWriter, r *http.Request, _ ht
}
}
+func (app *application) channelTimersRoute(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+ channel := ps.ByName("channel")
+ t, err := template.ParseFiles("./web/templates/channeltimers.page.gohtml")
+ if err != nil {
+ app.Log.Error(err)
+ return
+ }
+ var ts []data.Timer
+
+ timerData, err := app.Models.Timers.GetChannelTimer(channel)
+ if err != nil {
+ app.Log.Errorw("Error trying to retrieve all timer for a channel from database", err)
+ return
+ }
+ // The slice of timers is only used to log them at
+ // the start so it looks a bit nicer.
+
+ // Iterate over all timers and then add them onto the scheduler.
+ for i, v := range timerData {
+ // idk why this works but it does so no touchy touchy.
+ // https://github.com/robfig/cron/issues/420#issuecomment-940949195
+ i, v := i, v
+ _ = i
+ var t data.Timer
+ t.Name = v.Name
+ t.Text = v.Text
+ t.Repeat = v.Repeat
+
+ // Add new value to the slice
+ ts = append(ts, t)
+ }
+
+ data := &channelTimersRouteData{ts, channel}
+ err = t.Execute(w, data)
+ if err != nil {
+ app.Log.Error(err)
+ return
+ }
+}
+
type commandsRouteData struct {
Commands map[string]command
}
@@ -187,43 +232,6 @@ func (app *application) channelCommandsRoute(w http.ResponseWriter, r *http.Requ
}
-func (app *application) channelTimersRoute(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
- channel := ps.ByName("channel")
- var ts []string
- var text string
-
- timer, err := app.Models.Timers.GetChannelTimer(channel)
- if err != nil {
- app.Log.Errorw("Error trying to retrieve all timer for a channel from database", err)
- return
- }
- // The slice of timers is only used to log them at
- // the start so it looks a bit nicer.
-
- // Iterate over all timers and then add them onto the scheduler.
- for i, v := range timer {
- // idk why this works but it does so no touchy touchy.
- // https://github.com/robfig/cron/issues/420#issuecomment-940949195
- i, v := i, v
- _ = i
- var t string
-
- t = fmt.Sprintf(
- "Name: \t%v\n"+
- "Text: \t%v\n"+
- "Repeat: %v\n"+
- "\n",
- v.Name, v.Text, v.Repeat,
- )
-
- // Add new value to the slice
- ts = append(ts, t)
- }
-
- text = strings.Join(ts, "")
- fmt.Fprintf(w, fmt.Sprint(text))
-}
-
func (app *application) statusPageRoute(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
commit := common.GetVersion()
started := common.GetUptime().Format("2006-1-2 15:4:5")
diff --git a/web/templates/channeltimers.page.gohtml b/web/templates/channeltimers.page.gohtml
new file mode 100644
index 0000000..fc8d667
--- /dev/null
+++ b/web/templates/channeltimers.page.gohtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ nourybot - lidl twitch bot
+
+
+
+ Timers in {{ .Channel }}
+General commands:
+{{ with .Timers }}
+{{ range . }}
+
+ Name: {{ .Name }}
+ Text: {{ .Text }}
+ Repeat: {{ .Repeat }}
+
+{{ end }}
+{{ end }}
diff --git a/web/templates/timers.page.gohtml b/web/templates/timers.page.gohtml
index b547ac9..1b7ec77 100644
--- a/web/templates/timers.page.gohtml
+++ b/web/templates/timers.page.gohtml
@@ -7,7 +7,7 @@
-Commands
+Timers
General commands:
{{ with .Timers }}
{{ range . }}