diff options
author | Alex Auvolat <alex@adnab.me> | 2020-02-26 16:32:58 +0100 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2020-02-26 16:32:58 +0100 |
commit | facc375e8cf41f87f6b90fe5117754e2b639ce83 (patch) | |
tree | b4abf3e396e6f9ad37c6bfaca412028f2376f964 /account.go | |
parent | f3f1b8d981d818b38713fe84deb206720b0fcb10 (diff) | |
download | easybridge-facc375e8cf41f87f6b90fe5117754e2b639ce83.tar.gz easybridge-facc375e8cf41f87f6b90fe5117754e2b639ce83.zip |
Whoops & refactor
Diffstat (limited to 'account.go')
-rw-r--r-- | account.go | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -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 { |