rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suggest @room when @channel, @everyone, or @here is typed in composer (#6529) 

Signed-off-by: Prat T <pt2121@users.noreply.github.com>
This commit is contained in:
Prat T 2022-09-03 17:26:45 -07:00
parent bddb37ef7a
commit 6917e97f49
No known key found for this signature in database
GPG Key ID: 288BA40A64BD3461
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6529.feature Normal file
View File

@ -0,0 +1 @@
Suggest @room when @channel, @everyone, or @here is typed in composer

8
vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
View File

@ -145,7 +145,12 @@ class AutocompleteMemberPresenter @AssistedInject constructor(
private fun createEveryoneItem(query: CharSequence?) = private fun createEveryoneItem(query: CharSequence?) =
room.roomSummary() room.roomSummary()
?.takeIf { canNotifyEveryone() } ?.takeIf { canNotifyEveryone() }
?.takeIf { query.isNullOrBlank() || MatrixItem.NOTIFY_EVERYONE.startsWith("@$query") } ?.takeIf {
query.isNullOrBlank() ||
SUGGEST_ROOM_KEYWORDS.any {
it.startsWith("@$query")
}
}
?.let { ?.let {
AutocompleteMemberItem.Everyone(it) AutocompleteMemberItem.Everyone(it)
} }
@ -165,6 +170,7 @@ class AutocompleteMemberPresenter @AssistedInject constructor(
companion object { companion object {
private const val ID_HEADER_MEMBERS = "ID_HEADER_MEMBERS" private const val ID_HEADER_MEMBERS = "ID_HEADER_MEMBERS"
private const val ID_HEADER_EVERYONE = "ID_HEADER_EVERYONE" private const val ID_HEADER_EVERYONE = "ID_HEADER_EVERYONE"
private val SUGGEST_ROOM_KEYWORDS = setOf(MatrixItem.NOTIFY_EVERYONE, "@channel", "@everyone", "@here")
} }
} }