shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt

@@ -596,7 +596,7 @@ class Nostr {
             val kTag = SingleLetterTag.lowercase(Alphabet.K)
 
             // Get all events sent by the user
-            val filter = Filter().kind(kind).author(userPubkey).customTag(kTag, "dm")
+            val filter = Filter().kind(kind).author(userPubkey).customTag(kTag, "14")
             val events = client?.database()?.query(filter)
 
             // Collect rooms

shared/src/commonMain/kotlin/su/reya/coop/Room.kt

@@ -43,8 +43,11 @@ data class Room(
             val pubkeys: MutableSet<PublicKey> = mutableSetOf()
             pubkeys.add(rumor.author())
             pubkeys.addAll(rumor.tags().publicKeys())
+
             // Also remove the user's public key from the list, current user is always a member
+            if (pubkeys.size > 1 && pubkeys.contains(userPubkey)) {
                 pubkeys.remove(userPubkey)
+            }
 
             // Create a new Room instance
             return Room(