|
@@ -162,10 +162,8 @@ class MessageActionsDialog(
|
|
}
|
|
}
|
|
|
|
|
|
private fun initEmojiBar(hasChatPermission: Boolean) {
|
|
private fun initEmojiBar(hasChatPermission: Boolean) {
|
|
- if (hasChatPermission &&
|
|
|
|
- CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") &&
|
|
|
|
- Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY !=
|
|
|
|
- currentConversation?.conversationReadOnlyState &&
|
|
|
|
|
|
+ if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") &&
|
|
|
|
+ isPermitted(hasChatPermission) &&
|
|
isReactableMessageType(message)
|
|
isReactableMessageType(message)
|
|
) {
|
|
) {
|
|
checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
|
|
checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
|
|
@@ -203,6 +201,11 @@ class MessageActionsDialog(
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private fun isPermitted(hasChatPermission: Boolean): Boolean {
|
|
|
|
+ return hasChatPermission && Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY !=
|
|
|
|
+ currentConversation?.conversationReadOnlyState
|
|
|
|
+ }
|
|
|
|
+
|
|
private fun isReactableMessageType(message: ChatMessage): Boolean {
|
|
private fun isReactableMessageType(message: ChatMessage): Boolean {
|
|
return !(message.isCommandMessage || message.isDeletedCommentMessage || message.isDeleted)
|
|
return !(message.isCommandMessage || message.isDeletedCommentMessage || message.isDeleted)
|
|
}
|
|
}
|