From 743cc82a875cd839409f15c4230d596334222490 Mon Sep 17 00:00:00 2001
From: lyx0 <66651385+lyx0@users.noreply.github.com>
Date: Sun, 11 Feb 2024 16:54:53 +0100
Subject: [PATCH] add command page for specific channels

---
 cmd/nourybot/router.go                    | 64 +++++++++++------------
 web/templates/channelcommands.page.gohtml | 20 +++++++
 web/templates/channeltimers.page.gohtml   |  3 +-
 3 files changed, 53 insertions(+), 34 deletions(-)
 create mode 100644 web/templates/channelcommands.page.gohtml

diff --git a/cmd/nourybot/router.go b/cmd/nourybot/router.go
index 8c158f8..e227f65 100644
--- a/cmd/nourybot/router.go
+++ b/cmd/nourybot/router.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"os"
 	"sort"
-	"strings"
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/lyx0/nourybot/internal/common"
@@ -17,8 +16,8 @@ func (app *application) startRouter() {
 	router := httprouter.New()
 	router.GET("/", app.homeRoute)
 	router.GET("/status", app.statusPageRoute)
-	router.GET("/commands/:channel", app.channelCommandsRoute)
 	router.GET("/commands", app.commandsRoute)
+	router.GET("/commands/:channel", app.channelCommandsRoute)
 	router.GET("/timer", app.timersRoute)
 	router.GET("/timer/:channel", app.channelTimersRoute)
 
@@ -34,11 +33,6 @@ 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 {
@@ -78,6 +72,11 @@ func (app *application) timersRoute(w http.ResponseWriter, r *http.Request, _ ht
 	}
 }
 
+type channelTimersRouteData struct {
+	Timers  []data.Timer
+	Channel string
+}
+
 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")
@@ -191,45 +190,46 @@ func (app *application) homeRoute(w http.ResponseWriter, r *http.Request, _ http
 
 }
 
+type channelCommandsRouteData struct {
+	Commands []data.Command
+	Channel  string
+}
+
 func (app *application) channelCommandsRoute(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	channel := ps.ByName("channel")
-	var cs []string
-	var text string
-
-	command, err := app.Models.Commands.GetAllChannel(channel)
+	t, err := template.ParseFiles("./web/templates/channelcommands.page.gohtml")
 	if err != nil {
-		app.Log.Errorw("Error trying to retrieve all commands for a channel from database", err)
+		app.Log.Error(err)
 		return
 	}
-	// The slice of timers is only used to log them at
-	// the start so it looks a bit nicer.
+	var cs []data.Command
 
-	heading := fmt.Sprintf("Commands in %s\n\n", channel)
-	cs = append(cs, heading)
-	// Iterate over all timers and then add them onto the scheduler.
-	for i, v := range command {
+	commandData, err := app.Models.Commands.GetAllChannel(channel)
+	if err != nil {
+		app.Log.Errorw("Error trying to retrieve all timer for a channel from database", err)
+		return
+	}
+
+	for i, v := range commandData {
 		// 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 c string
+		var c data.Command
+		c.Name = v.Name
+		c.Level = v.Level
+		c.Description = v.Description
+		c.Text = v.Text
 
-		c = fmt.Sprintf(
-			"Name: %v\n"+
-				"Description: %v\n"+
-				"Level: %v\n"+
-				"Text: %v\n"+
-				"\n",
-			v.Name, v.Description, v.Level, v.Text,
-		)
-
-		// Add new value to the slice
 		cs = append(cs, c)
 	}
 
-	text = strings.Join(cs, "")
-	fmt.Fprintf(w, fmt.Sprint(text))
-
+	data := &channelCommandsRouteData{cs, channel}
+	err = t.Execute(w, data)
+	if err != nil {
+		app.Log.Error(err)
+		return
+	}
 }
 
 func (app *application) statusPageRoute(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
diff --git a/web/templates/channelcommands.page.gohtml b/web/templates/channelcommands.page.gohtml
new file mode 100644
index 0000000..7e567ed
--- /dev/null
+++ b/web/templates/channelcommands.page.gohtml
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta content="width=device-width,initial-scale=1" name="viewport">
+    <title>nourybot - lidl twitch bot</title>
+    <meta property="og:title" content="nourybot - commands in {{ .Channel }}">
+    <meta property="og:description" content="nourybot">
+  </head>
+  <h1>Commands in {{ .Channel }}</h1>
+{{ with .Commands }} 
+{{ range . }}
+<p>
+    <b>Name:</b> {{ .Name }} </br>
+    <b>Level:</b> {{ .Level }} </br>
+    <b>Description:</b> {{ .Description }} </br>
+    <b>Text:</b> {{ .Text }} </br>
+</p>
+{{ end }}
+{{ end }}
diff --git a/web/templates/channeltimers.page.gohtml b/web/templates/channeltimers.page.gohtml
index fc8d667..4bfae84 100644
--- a/web/templates/channeltimers.page.gohtml
+++ b/web/templates/channeltimers.page.gohtml
@@ -4,11 +4,10 @@
     <meta charset="UTF-8">
     <meta content="width=device-width,initial-scale=1" name="viewport">
     <title>nourybot - lidl twitch bot</title>
-    <meta property="og:title" content="nourybot - timers">
+    <meta property="og:title" content="nourybot - timers in {{ .Channel }}">
     <meta property="og:description" content="nourybot">
   </head>
   <h1>Timers in {{ .Channel }}</h1>
-<p>General commands:</p>
 {{ with .Timers }} 
 {{ range . }}
 <p>