status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(messaging): Sync with status-go content type enum 

Fixes: #9655
This commit is contained in:
Boris Melnik 2023-03-07 18:02:27 +06:00
parent c7e99365a1
commit 3a737f97a7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app_service/common/types.nim
View File

@ -14,7 +14,7 @@ type
Audio = 8 Audio = 8
Community = 9 Community = 9
Gap = 10 Gap = 10
Edit = 11 ContactRequest = 11
DiscordMessage = 12 DiscordMessage = 12
ContactIdentityVerification = 13 ContactIdentityVerification = 13

4
ui/imports/shared/views/chat/MessageView.qml
View File

@ -109,7 +109,7 @@ Loader {
property bool isStatusMessage: messageContentType === Constants.messageContentType.systemMessagePrivateGroupType property bool isStatusMessage: messageContentType === Constants.messageContentType.systemMessagePrivateGroupType
property bool isSticker: messageContentType === Constants.messageContentType.stickerType property bool isSticker: messageContentType === Constants.messageContentType.stickerType
property bool isDiscordMessage: messageContentType === Constants.messageContentType.discordMessageType property bool isDiscordMessage: messageContentType === Constants.messageContentType.discordMessageType
property bool isText: messageContentType === Constants.messageContentType.messageType || messageContentType === Constants.messageContentType.editType || isDiscordMessage property bool isText: messageContentType === Constants.messageContentType.messageType || messageContentType === Constants.messageContentType.contactRequestType || isDiscordMessage
property bool isMessage: isEmoji || isImage || isSticker || isText || isAudio property bool isMessage: isEmoji || isImage || isSticker || isText || isAudio
|| messageContentType === Constants.messageContentType.communityInviteType || messageContentType === Constants.messageContentType.transactionType || messageContentType === Constants.messageContentType.communityInviteType || messageContentType === Constants.messageContentType.transactionType
@ -249,6 +249,7 @@ Loader {
function convertContentType(value) { function convertContentType(value) {
switch (value) { switch (value) {
case Constants.messageContentType.contactRequestType:
case Constants.messageContentType.messageType: case Constants.messageContentType.messageType:
return StatusMessage.ContentType.Text; return StatusMessage.ContentType.Text;
case Constants.messageContentType.stickerType: case Constants.messageContentType.stickerType:
@ -271,7 +272,6 @@ Loader {
case Constants.messageContentType.statusType: case Constants.messageContentType.statusType:
case Constants.messageContentType.systemMessagePrivateGroupType: case Constants.messageContentType.systemMessagePrivateGroupType:
case Constants.messageContentType.gapType: case Constants.messageContentType.gapType:
case Constants.messageContentType.editType:
default: default:
return StatusMessage.ContentType.Unknown; return StatusMessage.ContentType.Unknown;
} }

2
ui/imports/utils/Constants.qml
View File

@ -404,7 +404,7 @@ QtObject {
readonly property int audioType: 8 readonly property int audioType: 8
readonly property int communityInviteType: 9 readonly property int communityInviteType: 9
readonly property int gapType: 10 readonly property int gapType: 10
readonly property int editType: 11 readonly property int contactRequestType: 11
readonly property int discordMessageType: 12 readonly property int discordMessageType: 12
} }