Room autorejoin

1 files changed, 3 insertions, 19 deletions

diff --git a/main.go b/main.go
index d74e3d8..3cec532 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,7 @@ type ConfigAccount struct {
 }
 
 type ConfigFile struct {
-	HttpBindAddr string                              `json:"http_bind_addr"`
+	ASBindAddr   string                              `json:"appservice_bind_addr"`
 	Registration string                              `json:"registration"`
 	Server       string                              `json:"homeserver_url"`
 	DbType       string                              `json:"db_type"`
@@ -45,7 +45,7 @@ var registration *mxlib.Registration
 
 func readConfig() ConfigFile {
 	config_file := ConfigFile{
-		HttpBindAddr: "0.0.0.0:8321",
+		ASBindAddr:   "0.0.0.0:8321",
 		Registration: "./registration.yaml",
 		Server:       "http://localhost:8008",
 		DbType:       "sqlite3",
@@ -192,7 +192,7 @@ func main() {
 			}
 			conn.SetHandler(account)
 			AddAccount(account)
-			go connectAndJoin(account, params)
+			go account.connect(params.Config, params.Rooms)
 		}
 	}
 
@@ -201,19 +201,3 @@ func main() {
 		log.Fatal(err)
 	}
 }
-
-func connectAndJoin(account *Account, params ConfigAccount) {
-	log.Printf("Connecting to %s", params.Protocol)
-	err := account.Conn.Configure(params.Config)
-	if err != nil {
-		log.Printf("Could not connect to %s: %s", params.Protocol, err)
-	} else {
-		log.Printf("Connected to %s, now joining %#v", params.Protocol, params.Rooms)
-		for _, room := range params.Rooms {
-			err := account.Conn.Join(connector.RoomID(room))
-			if err != nil {
-				log.Printf("Could not join %s: %s", room, err)
-			}
-		}
-	}
-}