Merge branch 'master' into develop

2 files changed, 3 insertions, 2 deletions

diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go
index e4079e8..6ab41cd 100644
--- a/internal/server/handlers/readcommand.go
+++ b/internal/server/handlers/readcommand.go
@@ -27,7 +27,8 @@ 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:], " ")
+	    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