filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

/confetti /snow commands: send emote if text is blank (iso Element Web)

This commit is contained in:
Benoit Marty 2020-12-15 12:18:41 +01:00 committed by Benoit Marty
parent 6ddcd046d4
commit bb9a08d429
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/features/home/room/detail/ChatEffectManager.kt
View File

@ -113,6 +113,7 @@ class ChatEffectManager @Inject constructor() {
return when (content.msgType) { return when (content.msgType) {
MessageType.MSGTYPE_CONFETTI -> ChatEffect.CONFETTI MessageType.MSGTYPE_CONFETTI -> ChatEffect.CONFETTI
MessageType.MSGTYPE_SNOW -> ChatEffect.SNOW MessageType.MSGTYPE_SNOW -> ChatEffect.SNOW
MessageType.MSGTYPE_EMOTE,
MessageType.MSGTYPE_TEXT -> { MessageType.MSGTYPE_TEXT -> {
event.root.getClearContent().toModel<MessageContent>()?.body event.root.getClearContent().toModel<MessageContent>()?.body
?.let { text -> ?.let { text ->

15
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -716,7 +716,7 @@ class RoomDetailViewModel @AssistedInject constructor(
popDraft() popDraft()
} }
is ParsedCommand.SendChatEffect -> { is ParsedCommand.SendChatEffect -> {
room.sendTextMessage(slashCommandResult.message, slashCommandResult.chatEffect.toMessageType()) sendChatEffect(slashCommandResult)
_viewEvents.post(RoomDetailViewEvents.SlashCommandHandled()) _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
popDraft() popDraft()
} }
@ -808,6 +808,19 @@ class RoomDetailViewModel @AssistedInject constructor(
} }
} }
private fun sendChatEffect(sendChatEffect: ParsedCommand.SendChatEffect) {
// If message is blank, convert to an emote, with default message
if (sendChatEffect.message.isBlank()) {
val defaultMessage = stringProvider.getString(when (sendChatEffect.chatEffect) {
ChatEffect.CONFETTI -> R.string.default_message_emote_confetti
ChatEffect.SNOW -> R.string.default_message_emote_snow
})
room.sendTextMessage(defaultMessage, MessageType.MSGTYPE_EMOTE)
} else {
room.sendTextMessage(sendChatEffect.message, sendChatEffect.chatEffect.toMessageType())
}
}
private fun popDraft() = withState { private fun popDraft() = withState {
if (it.sendMode is SendMode.REGULAR && it.sendMode.fromSharing) { if (it.sendMode is SendMode.REGULAR && it.sendMode.fromSharing) {
// If we were sharing, we want to get back our last value from draft // If we were sharing, we want to get back our last value from draft

4
vector/src/main/res/values/strings.xml
View File

@ -2572,6 +2572,10 @@
<string name="command_confetti">Sends the given message with confetti</string> <string name="command_confetti">Sends the given message with confetti</string>
<string name="command_snow">Sends the given message with snow</string> <string name="command_snow">Sends the given message with snow</string>
<!-- Note to translator: please use the same emoji 🎉 in your translation -->
<string name="default_message_emote_confetti">sends confetti 🎉</string>
<!-- Note to translator: please use the same emoji ❄️ in your translation -->
<string name="default_message_emote_snow">sends snow ❄️</string>
<string name="unencrypted">Unencrypted</string> <string name="unencrypted">Unencrypted</string>
<string name="encrypted_unverified">Encrypted by an unverified device</string> <string name="encrypted_unverified">Encrypted by an unverified device</string>