From 3ec1a4070e8ecd434ddce852f852c7a0fb966272 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 30 Mar 2021 00:07:05 +0300 Subject: [PATCH] MxId -> MxID --- bridge/config/config.go | 2 +- bridge/matrix/matrix.go | 6 +++--- matterbridge.toml.sample | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bridge/config/config.go b/bridge/config/config.go index e8947b9b..276b40a4 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -119,7 +119,7 @@ type Protocol struct { MessageQueue int // IRC, size of message queue for flood control MessageSplit bool // IRC, split long messages with newlines on MessageLength instead of clipping Muc string // xmpp - MxId string // matrix + MxID string // matrix Name string // all protocols Nick string // all protocols NickFormatter string // mattermost, slack diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index ea0fb9ff..39326343 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -75,11 +75,11 @@ func New(cfg *bridge.Config) bridge.Bridger { func (b *Bmatrix) Connect() error { var err error b.Log.Infof("Connecting %s", b.GetString("Server")) - if b.GetString("MxId") != "" && b.GetString("Token") != "" { + if b.GetString("MxID") != "" && b.GetString("Token") != "" { b.mc, err = matrix.NewClient( - b.GetString("Server"), b.GetString("MxId"), b.GetString("Token"), + b.GetString("Server"), b.GetString("MxID"), b.GetString("Token"), ) - b.UserID = b.GetString("MxId") + b.UserID = b.GetString("MxID") b.Log.Info("Using existing Matrix credentials") } else { b.mc, err = matrix.NewClient(b.GetString("Server"), "", "") diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 4b2671dd..1db2d823 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -1238,7 +1238,7 @@ Server="https://matrix.org" Login="yourlogin" Password="yourpass" #OR -MxId="@yourlogin:domain.tld" +MxID="@yourlogin:domain.tld" Token="tokenforthebotuser" #Whether to send the homeserver suffix. eg ":matrix.org" in @username:matrix.org