lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

MxId -> MxID

Browse Source
This commit is contained in:
Jason Robinson
2021-03-30 00:07:05 +03:00
parent 963ad64103
commit 3ec1a4070e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/config/config.go
View File

@@ -119,7 +119,7 @@ type Protocol struct {
MessageQueue int // IRC, size of message queue for flood control MessageQueue int // IRC, size of message queue for flood control
MessageSplit bool // IRC, split long messages with newlines on MessageLength instead of clipping MessageSplit bool // IRC, split long messages with newlines on MessageLength instead of clipping
Muc string // xmpp Muc string // xmpp
MxId string // matrix MxID string // matrix
Name string // all protocols Name string // all protocols
Nick string // all protocols Nick string // all protocols
NickFormatter string // mattermost, slack NickFormatter string // mattermost, slack

6
bridge/matrix/matrix.go
View File

@@ -75,11 +75,11 @@ func New(cfg *bridge.Config) bridge.Bridger {
func (b *Bmatrix) Connect() error { func (b *Bmatrix) Connect() error {
var err error var err error
b.Log.Infof("Connecting %s", b.GetString("Server")) 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.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") b.Log.Info("Using existing Matrix credentials")
} else { } else {
b.mc, err = matrix.NewClient(b.GetString("Server"), "", "") b.mc, err = matrix.NewClient(b.GetString("Server"), "", "")

2
matterbridge.toml.sample
View File

@@ -1238,7 +1238,7 @@ Server="https://matrix.org"
Login="yourlogin" Login="yourlogin"
Password="yourpass" Password="yourpass"
#OR #OR
MxId="@yourlogin:domain.tld" MxID="@yourlogin:domain.tld"
Token="tokenforthebotuser" Token="tokenforthebotuser"
#Whether to send the homeserver suffix. eg ":matrix.org" in @username:matrix.org #Whether to send the homeserver suffix. eg ":matrix.org" in @username:matrix.org