plugins/counter/api.go

@@ -7,7 +7,6 @@ import (
 	"github.com/velour/catbase/bot/user"
 	"io/ioutil"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 
@@ -40,8 +39,8 @@ func (p *CounterPlugin) registerWeb() {
 
 func (p *CounterPlugin) mkIncrementByNAPI(direction int) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userName, _ := url.QueryUnescape(chi.URLParam(r, "user"))
-		itemName, _ := url.QueryUnescape(chi.URLParam(r, "item"))
+		userName := chi.URLParam(r, "user")
+		itemName := chi.URLParam(r, "item")
 		delta, _ := strconv.Atoi(chi.URLParam(r, "delta"))
 
 		secret, pass, ok := r.BasicAuth()
@@ -86,11 +85,7 @@ func (p *CounterPlugin) mkIncrementByNAPI(direction int) func(w http.ResponseWri
 			personalMsg = fmt.Sprintf("\nMessage: %s", inputMsg)
 		}
 
-		chs := p.cfg.GetMap("counter.channelItems", map[string]string{})
-		ch, ok := chs[itemName]
-		if len(chs) == 0 || !ok {
-			return
-		}
+		chs := p.cfg.GetArray("channels", []string{p.cfg.Get("channels", "none")})
 		req := &bot.Request{
 			Conn: p.b.DefaultConnector(),
 			Kind: bot.Message,
@@ -98,7 +93,7 @@ func (p *CounterPlugin) mkIncrementByNAPI(direction int) func(w http.ResponseWri
 				User: &u,
 				// Noting here that we're only going to do goals in a "default"
 				// channel even if it should send updates to others.
-				Channel: ch,
+				Channel: chs[0],
 				Body:    fmt.Sprintf("%s += %d", itemName, delta),
 				Time:    time.Now(),
 			},
@@ -119,8 +114,8 @@ func (p *CounterPlugin) mkIncrementByNAPI(direction int) func(w http.ResponseWri
 
 func (p *CounterPlugin) mkIncrementAPI(delta int) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-		userName, _ := url.QueryUnescape(chi.URLParam(r, "user"))
-		itemName, _ := url.QueryUnescape(chi.URLParam(r, "item"))
+		userName := chi.URLParam(r, "user")
+		itemName := chi.URLParam(r, "item")
 
 		secret, pass, ok := r.BasicAuth()
 		if !ok || !p.b.CheckPassword(secret, pass) {
@@ -164,11 +159,7 @@ func (p *CounterPlugin) mkIncrementAPI(delta int) func(w http.ResponseWriter, r
 			personalMsg = fmt.Sprintf("\nMessage: %s", inputMsg)
 		}
 
-		chs := p.cfg.GetMap("counter.channelItems", map[string]string{})
-		ch, ok := chs[itemName]
-		if len(chs) == 0 || !ok {
-			return
-		}
+		chs := p.cfg.GetArray("channels", []string{p.cfg.Get("channels", "none")})
 		req := &bot.Request{
 			Conn: p.b.DefaultConnector(),
 			Kind: bot.Message,
@@ -176,7 +167,7 @@ func (p *CounterPlugin) mkIncrementAPI(delta int) func(w http.ResponseWriter, r
 				User: &u,
 				// Noting here that we're only going to do goals in a "default"
 				// channel even if it should send updates to others.
-				Channel: ch,
+				Channel: chs[0],
 				Body:    fmt.Sprintf("%s += %d", itemName, delta),
 				Time:    time.Now(),
 			},