Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions 16

Merge pull request #3486 from element-hq/feature/bma/fixRoomAliasMatcch

Browse source 
Distinguish between roomId and roomAlias.
This commit is contained in:
Benoit Marty 2024-09-18 13:56:00 +02:00 • committed by GitHub
commit bf7a99d9cd
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
View file

@ -149,7 +149,12 @@ object MatrixPatterns {
add(MatrixPatternResult(MatrixPatternType.USER_ID, permalink.userId.toString(), match.range.first, match.range.last + 1)) add(MatrixPatternResult(MatrixPatternType.USER_ID, permalink.userId.toString(), match.range.first, match.range.last + 1))
} }
is PermalinkData.RoomLink -> { is PermalinkData.RoomLink -> {
add(MatrixPatternResult(MatrixPatternType.ROOM_ALIAS, permalink.roomIdOrAlias.identifier, match.range.first, match.range.last + 1)) when (permalink.roomIdOrAlias) {
is RoomIdOrAlias.Alias -> MatrixPatternType.ROOM_ALIAS
is RoomIdOrAlias.Id -> if (permalink.eventId == null) MatrixPatternType.ROOM_ID else null
}?.let { type ->
add(MatrixPatternResult(type, permalink.roomIdOrAlias.identifier, match.range.first, match.range.last + 1))
}
} }
else -> Unit else -> Unit
} }