2 files changed, 56 insertions, 2 deletions
diff --git a/connector/mattermost/config.go b/connector/mattermost/config.go
new file mode 100644
index 0000000..b7c4ba8
--- /dev/null
+++ b/connector/mattermost/config.go
@@ -0,0 +1,52 @@
+package mattermost
+
+import (
+	. "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector"
+)
+
+func init() {
+	Register("mattermost", ConfigSchema{
+		&ConfigEntry{
+			Name:        "server",
+			Description: "Server",
+			Required:    true,
+		},
+		&ConfigEntry{
+			Name:        "username",
+			Description: "Username",
+			Required:    true,
+		},
+		&ConfigEntry{
+			Name:        "password",
+			Description: "Password",
+			IsPassword:  true,
+		},
+		&ConfigEntry{
+			Name:        "token",
+			Description: "Authentification token (replaces password if set)",
+		},
+		&ConfigEntry{
+			Name:        "teams",
+			Description: "Comma-separated list of teams to follow",
+			Required:    true,
+		},
+		&ConfigEntry{
+			Name:        "no_tls",
+			Description: "Disable SSL/TLS",
+			IsBoolean:   true,
+			Default:     "false",
+		},
+		&ConfigEntry{
+			Name:        "initial_backlog",
+			Description: "Maximum number of messages to load when joining a channel",
+			IsNumeric:   true,
+			Default:     "1000",
+		},
+		&ConfigEntry{
+			Name:        "initial_members",
+			Description: "Maximum number of members to load when joining a channel",
+			IsNumeric:   true,
+			Default:     "100",
+		},
+	})
+}
diff --git a/connector/mattermost/mattermost.go b/connector/mattermost/mattermost.go
index 0b863fb..e3a6429 100644
--- a/connector/mattermost/mattermost.go
+++ b/connector/mattermost/mattermost.go
@@ -69,7 +69,7 @@ func (mm *Mattermost) Configure(c Configuration) error {
 		return err
 	}
 
-	mm.initial_members, err = c.GetInt("initial_members", 1000)
+	mm.initial_members, err = c.GetInt("initial_members", 100)
 	if err != nil {
 		return err
 	}
@@ -312,7 +312,9 @@ func (mm *Mattermost) Send(event *Event) error {
 }
 
 func (mm *Mattermost) Close() {
-	mm.conn.WsQuit = true
+	if mm.conn != nil {
+		mm.conn.WsQuit = true
+	}
 	if mm.handlerStopChan != nil {
 		mm.handlerStopChan <- true
 		mm.handlerStopChan = nil