From 775fc7b2172a632587e82cd44b9d7400ca4f4f74 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 26 Feb 2020 21:36:35 +0100 Subject: Refactor --- main.go | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index a8a349c..5448e89 100644 --- a/main.go +++ b/main.go @@ -15,10 +15,6 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector" - "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/irc" - "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/mattermost" - "git.deuxfleurs.fr/Deuxfleurs/easybridge/connector/xmpp" "git.deuxfleurs.fr/Deuxfleurs/easybridge/mxlib" ) @@ -174,22 +170,9 @@ func main() { StartWeb() for user, accounts := range config.Accounts { + mxid := fmt.Sprintf("@%s:%s", user, config.MatrixDomain) for name, params := range accounts { - conn := createConnector(params.Protocol) - if conn == nil { - log.Fatalf("Could not create connector for protocol %s", params.Protocol) - } - account := &Account{ - MatrixUser: fmt.Sprintf("@%s:%s", user, config.MatrixDomain), - AccountName: name, - Protocol: params.Protocol, - Config: params.Config, - Conn: conn, - JoinedRooms: map[connector.RoomID]bool{}, - } - conn.SetHandler(account) - AddAccount(account) - go account.connect(params.Config) + SetAccount(mxid, name, params.Protocol, params.Config) } } @@ -198,16 +181,3 @@ func main() { log.Fatal(err) } } - -func createConnector(protocol string) connector.Connector { - switch protocol { - case "irc": - return &irc.IRC{} - case "xmpp": - return &xmpp.XMPP{} - case "mattermost": - return &mattermost.Mattermost{} - default: - return nil - } -} -- cgit v1.2.3