From de3df3f74dd376ee088770add56ae249f17fcd29 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 8 Feb 2020 19:10:03 +0000 Subject: allow whitespaces in regexes --- internal/server/handlers/readcommand.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/server') diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go index e4079e8..67f9572 100644 --- a/internal/server/handlers/readcommand.go +++ b/internal/server/handlers/readcommand.go @@ -27,7 +27,7 @@ func newReadCommand(server *ServerHandler, mode omode.Mode) *readCommand { func (r *readCommand) Start(ctx context.Context, argc int, args []string) { regex := "." if argc >= 4 { - regex = args[3] + regex = strings.Join(args[3:], " ") } if argc < 3 { r.server.sendServerMessage(logger.Warn(r.server.user, commandParseWarning, args, argc)) -- cgit v1.2.3 From 7f0f6e09948e188a6c3221d9eb77290d25a251e2 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 11 Feb 2020 07:02:26 +0000 Subject: more debug output --- internal/server/handlers/readcommand.go | 1 + internal/server/handlers/serverhandler.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'internal/server') diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go index 67f9572..6ab41cd 100644 --- a/internal/server/handlers/readcommand.go +++ b/internal/server/handlers/readcommand.go @@ -28,6 +28,7 @@ func (r *readCommand) Start(ctx context.Context, argc int, args []string) { regex := "." if argc >= 4 { regex = strings.Join(args[3:], " ") + logger.Debug("Joined regex", regex) } if argc < 3 { r.server.sendServerMessage(logger.Warn(r.server.user, commandParseWarning, args, argc)) diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go index 3f0d6ce..b840c77 100644 --- a/internal/server/handlers/serverhandler.go +++ b/internal/server/handlers/serverhandler.go @@ -172,7 +172,7 @@ func (h *ServerHandler) handleProtocolVersion(args []string) ([]string, int, err } func (h *ServerHandler) handleBase64(args []string, argc int) ([]string, int, error) { - err := errors.New("Unable to decode client message") + err := errors.New("Unable to decode client message, DTail server and client versions not compatible") if argc != 2 || args[0] != "base64" { return args, argc, err -- cgit v1.2.3