Initial ability to configure accounts from web interface

2 files changed, 55 insertions, 1 deletions

diff --git a/connector/irc/config.go b/connector/irc/config.go
new file mode 100644
index 0000000..26d9a63
--- /dev/null
+++ b/connector/irc/config.go
@@ -0,0 +1,32 @@
+package irc
+
+import (
+	. "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector"
+)
+
+func init() {
+	Register("irc", ConfigSchema{
+		&ConfigEntry{
+			Name:        "nick",
+			Description: "Nickname",
+			Required:    true,
+		},
+		&ConfigEntry{
+			Name:        "server",
+			Description: "Server",
+			Required:    true,
+		},
+		&ConfigEntry{
+			Name:        "port",
+			Description: "Port",
+			IsNumeric:   true,
+			Default:     "6667",
+		},
+		&ConfigEntry{
+			Name:        "ssl",
+			Description: "Use SSL",
+			IsBoolean:   true,
+			Default:     "false",
+		},
+	})
+}
diff --git a/connector/irc/irc.go b/connector/irc/irc.go
index 2ed3923..d69884e 100644
--- a/connector/irc/irc.go
+++ b/connector/irc/irc.go
@@ -127,6 +127,10 @@ func (irc *IRC) SetUserInfo(info *UserInfo) error {
 }
 
 func (irc *IRC) SetRoomInfo(roomId RoomID, info *RoomInfo) error {
+	if irc.conn == nil {
+		return fmt.Errorf("Not connected")
+	}
+
 	ch, err := irc.checkRoomId(roomId)
 	if err != nil {
 		return err
@@ -145,6 +149,10 @@ func (irc *IRC) SetRoomInfo(roomId RoomID, info *RoomInfo) error {
 }
 
 func (irc *IRC) Join(roomId RoomID) error {
+	if irc.conn == nil {
+		return fmt.Errorf("Not connected")
+	}
+
 	ch, err := irc.checkRoomId(roomId)
 	if err != nil {
 		return err
@@ -155,6 +163,10 @@ func (irc *IRC) Join(roomId RoomID) error {
 }
 
 func (irc *IRC) Invite(userId UserID, roomId RoomID) error {
+	if irc.conn == nil {
+		return fmt.Errorf("Not connected")
+	}
+
 	who, err := irc.checkUserId(userId)
 	if err != nil {
 		return err
@@ -174,6 +186,10 @@ func (irc *IRC) Invite(userId UserID, roomId RoomID) error {
 }
 
 func (irc *IRC) Leave(roomId RoomID) {
+	if irc.conn == nil {
+		return
+	}
+
 	ch, err := irc.checkRoomId(roomId)
 	if err != nil {
 		return
@@ -183,6 +199,10 @@ func (irc *IRC) Leave(roomId RoomID) {
 }
 
 func (irc *IRC) Send(event *Event) error {
+	if irc.conn == nil {
+		return fmt.Errorf("Not connected")
+	}
+
 	// Workaround girc bug
 	if event.Text[0] == ':' {
 		event.Text = " " + event.Text
@@ -231,7 +251,9 @@ func (irc *IRC) Send(event *Event) error {
 func (irc *IRC) Close() {
 	conn := irc.conn
 	irc.conn = nil
-	conn.Close()
+	if conn != nil {
+		conn.Close()
+	}
 }
 
 func (irc *IRC) connectLoop(c *girc.Client) {