lx
/
easybridge
0
0
Fork 0
Code Issues 1.6k Pull Requests Releases Activity

Whoops & refactor

This commit is contained in:
Alex 2020-02-26 16:32:58 +01:00
parent f3f1b8d981
commit facc375e8c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
account.go
View File

@ -87,13 +87,7 @@ func (a *Account) connect(config map[string]string, join_rooms []string) {
}
for _, room := range join_rooms {
var entry DbJoinedRoom
db.Where(&DbJoinedRoom{
MxUserID: a.MatrixUser,
Protocol: a.Protocol,
AccountName: a.AccountName,
RoomID: RoomID(room),
}).FirstOrCreate(&entry)
a.addAutojoin(RoomID(room))
}
var autojoin []DbJoinedRoom
@ -110,6 +104,16 @@ func (a *Account) connect(config map[string]string, join_rooms []string) {
}
}
func (a *Account) addAutojoin(roomId RoomID) {
var entry DbJoinedRoom
db.Where(&DbJoinedRoom{
MxUserID: a.MatrixUser,
Protocol: a.Protocol,
AccountName: a.AccountName,
RoomID: roomId,
}).FirstOrCreate(&entry)
}
// ---- Begin event handlers ----
func (a *Account) Joined(roomId RoomID) {
@ -118,13 +122,7 @@ func (a *Account) Joined(roomId RoomID) {
a.ezbrMessagef("Dropping Account.Joined %s: %s", roomId, err.Error())
}
var entry DbJoinedRoom
db.Where(&DbJoinedRoom{
MxUserID: a.MatrixUser,
Protocol: a.Protocol,
AccountName: a.AccountName,
RoomID: roomId,
}).FirstOrCreate(&entry)
a.addAutojoin(roomId)
}
func (a *Account) joinedInternal(roomId RoomID) error {

2
connector/xmpp/xmpp.go
View File

@ -82,7 +82,7 @@ func (xm *XMPP) Configure(c Configuration) error {
}
xm.jid_localpart = jid_parts[0]
xm.nickname = c.GetString("nickname", xm.jid_locakpart)
xm.nickname, _ = c.GetString("nickname", xm.jid_localpart)
xm.password, err = c.GetString("password")
if err != nil {