Handle matrix left events correctly (hopefully)

1 files changed, 13 insertions, 9 deletions

diff --git a/account.go b/account.go
index 59809e7..3ed1a61 100644
--- a/account.go
+++ b/account.go
@@ -205,6 +205,15 @@ func (a *Account) addAutojoin(roomId RoomID) {
 	}).FirstOrCreate(&entry)
 }
 
+func (a *Account) delAutojoin(roomId RoomID) {
+	db.Where(&DbJoinedRoom{
+		MxUserID:    a.MatrixUser,
+		Protocol:    a.Protocol,
+		AccountName: a.AccountName,
+		RoomID:      roomId,
+	}).Delete(&DbJoinedRoom{})
+}
+
 // ---- Begin event handlers ----
 
 func (a *Account) Joined(roomId RoomID) {
@@ -212,13 +221,13 @@ func (a *Account) Joined(roomId RoomID) {
 	if err != nil {
 		a.ezbrMessagef("Dropping Account.Joined %s: %s", roomId, err.Error())
 	}
-
-	a.addAutojoin(roomId)
 }
 
 func (a *Account) joinedInternal(roomId RoomID) error {
 	a.JoinedRooms[roomId] = true
 
+	a.addAutojoin(roomId)
+
 	mx_room_id, err := dbGetMxRoom(a.Protocol, roomId)
 	if err != nil {
 		return err
@@ -240,18 +249,13 @@ func (a *Account) Left(roomId RoomID) {
 	if err != nil {
 		a.ezbrMessagef("Dropping Account.Left %s: %s", roomId, err.Error())
 	}
-
-	db.Where(&DbJoinedRoom{
-		MxUserID:    a.MatrixUser,
-		Protocol:    a.Protocol,
-		AccountName: a.AccountName,
-		RoomID:      roomId,
-	}).Delete(&DbJoinedRoom{})
 }
 
 func (a *Account) leftInternal(roomId RoomID) error {
 	delete(a.JoinedRooms, roomId)
 
+	a.delAutojoin(roomId)
+
 	mx_room_id, err := dbGetMxRoom(a.Protocol, roomId)
 	if err != nil {
 		return err