nc compatible /send endpoint, DRY-ed dispatcher

README.md

@@ -38,10 +38,12 @@ IRC formatting is supported (see a full [list of codes](tcplistener/colours.go#L
     echo "Status is%GREEN OK %NORMAL" | nc irccat-host 12345
 
 ## HTTP → IRC
-There's a simple HTTP endpoint for sending messages:
+There's a similar HTTP endpoint for sending messages. You can use curl in lieu
+of netcat, with "-d @-" to read POST data from stdin, like so:
 
-    curl -X POST http://irccat-host:8045/send -d
-        '{"to": "#channel", "body": "Hello world"}'
+    echo "Hello world" | curl -d @- http://irccat-host/send
+
+Everything that works via netcat also works by POST to /send.
 
 There are also endpoints which support app-specific webhooks, currently:
 

tcplistener/colours.go → dispatcher/colours.go

@@ -1,4 +1,4 @@
-package tcplistener
+package dispatcher
 
 import "strings"
 

dispatcher/dispatcher.go

@@ -0,0 +1,46 @@
+package dispatcher
+
+import (
+	"github.com/juju/loggo"
+	"github.com/spf13/viper"
+	"github.com/thoj/go-ircevent"
+	"strings"
+)
+
+// Take a string, parse out the recipients, and send to IRC.
+//
+// eg:
+//  hello world                 [goes to default channel]
+//  #test hello world           [goes to #test, if joined]
+//  #test,@alice hello world    [goes to #test and alice]
+//  #* hello world              [goes to all channels bot is in]
+func Send(irc *irc.Connection, msg string, log loggo.Logger, origin string) {
+	channels := viper.GetStringSlice("irc.channels")
+
+	if msg[0] == '#' || msg[0] == '@' {
+		parts := strings.SplitN(msg, " ", 2)
+		if parts[0] == "#*" {
+			for _, channel := range channels {
+				irc.Privmsg(channel, replaceFormatting(parts[1]))
+			}
+		} else {
+			targets := strings.Split(parts[0], ",")
+			for _, target := range targets {
+				if target[0] == '@' {
+					target = target[1:]
+				}
+				irc.Privmsg(target, replaceFormatting(parts[1]))
+			}
+		}
+		log.Infof("from[%s] send[%s] %s", origin, parts[0], parts[1])
+	} else if len(msg) > 7 && msg[0:6] == "%TOPIC" {
+		parts := strings.SplitN(msg, " ", 3)
+		irc.SendRawf("TOPIC %s :%s", parts[1], replaceFormatting(parts[2]))
+		log.Infof("from[%s] topic[%s] %s", origin, parts[1], parts[2])
+	} else {
+		if len(channels) > 0 {
+			irc.Privmsg(channels[0], replaceFormatting(msg))
+			log.Infof("from[%s] send_default[%s] %s", origin, channels[0], msg)
+		}
+	}
+}

httplistener/generic.go

@@ -2,29 +2,28 @@ package httplistener
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/irccloud/irccat/dispatcher"
 	"net/http"
 )
 
-type genericMessage struct {
-	To   string
-	Body string
-}
-
+// Examples of using curl to post to /send.
+//
+// echo "Hello, world" | curl -d @- http://irccat.example.com/send
+// echo "#test,@alice Hello, world" | curl -d @- http://irccat.example.com/send
+//
 func (hl *HTTPListener) genericHandler(w http.ResponseWriter, request *http.Request) {
 	if request.Method != "POST" {
 		http.NotFound(w, request)
 		return
 	}
 
-	var message genericMessage
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(request.Body)
-	json.Unmarshal(buf.Bytes(), &message)
+	body := new(bytes.Buffer)
+	body.ReadFrom(request.Body)
+	message := body.String()
 
-	log.Infof("%s [%s] %s", request.RemoteAddr, message.To, message.Body)
-
-	if message.To != "" && message.Body != "" {
-		hl.irc.Privmsgf(message.To, message.Body)
+	if message == "" {
+		log.Warningf("%s - No message body in POST request", request.RemoteAddr)
+		return
 	}
+	dispatcher.Send(hl.irc, message, log, request.RemoteAddr)
 }

tcplistener/tcplistener.go

@@ -2,6 +2,7 @@ package tcplistener
 
 import (
 	"bufio"
+	"github.com/irccloud/irccat/dispatcher"
 	"github.com/juju/loggo"
 	"github.com/spf13/viper"
 	"github.com/thoj/go-ircevent"
@@ -54,37 +55,8 @@ func (l *TCPListener) handleConnection(conn net.Conn) {
 		}
 		msg = strings.Trim(msg, "\r\n")
 		if len(msg) > 0 {
-			log.Infof("[%s] message: %s", conn.RemoteAddr(), msg)
-			l.parseMessage(msg)
+			dispatcher.Send(l.irc, msg, log, conn.RemoteAddr().String())
 		}
 	}
 	conn.Close()
 }
-
-func (l *TCPListener) parseMessage(msg string) {
-	channels := viper.GetStringSlice("irc.channels")
-
-	if msg[0] == '#' || msg[0] == '@' {
-		parts := strings.SplitN(msg, " ", 2)
-		if parts[0] == "#*" {
-			for _, channel := range channels {
-				l.irc.Privmsg(channel, replaceFormatting(parts[1]))
-			}
-		} else {
-			targets := strings.Split(parts[0], ",")
-			for _, target := range targets {
-				if target[0] == '@' {
-					target = target[1:]
-				}
-				l.irc.Privmsg(target, replaceFormatting(parts[1]))
-			}
-		}
-	} else if len(msg) > 7 && msg[0:6] == "%TOPIC" {
-		parts := strings.SplitN(msg, " ", 3)
-		l.irc.SendRawf("TOPIC %s :%s", parts[1], replaceFormatting(parts[2]))
-	} else {
-		if len(channels) > 0 {
-			l.irc.Privmsg(channels[0], replaceFormatting(msg))
-		}
-	}
-}