Allow _ezbr_ to be put in suffix of usernames/room aliases instead of prefix

1 files changed, 13 insertions, 10 deletions

diff --git a/db.go b/db.go
index cdbdca1..42c9aee 100644
--- a/db.go
+++ b/db.go
@@ -213,18 +213,21 @@ func dbGetMxRoom(protocol string, roomId connector.RoomID) (string, error) {
 
 	if must_create {
 		alias := roomAlias(protocol, roomId)
-		// Lookup alias
-		mx_room_id, err := mx.DirectoryRoom(fmt.Sprintf("#%s:%s", alias, config.MatrixDomain))
 
-		// If no alias found, create room
-		if err != nil {
-			name := fmt.Sprintf("%s (%s)", roomId, protocol)
+		// Delete previous alias if it existed
+		prev_full_alias := fmt.Sprintf("#%s:%s", alias, config.MatrixDomain)
+		mx_room_id, err := mx.DirectoryRoom(prev_full_alias)
+		if err == nil {
+			mx.DirectoryDeleteRoom(prev_full_alias)
+		}
 
-			mx_room_id, err = mx.CreateRoom(name, alias, []string{})
-			if err != nil {
-				log.Warnf("Could not create room for %s: %s", name, err)
-				return "", err
-			}
+		// Create room
+		name := fmt.Sprintf("%s (%s)", roomId, protocol)
+
+		mx_room_id, err = mx.CreateRoom(name, alias, []string{})
+		if err != nil {
+			log.Warnf("Could not create room for %s: %s", name, err)
+			return "", err
 		}
 
 		room = DbRoomMap{