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

feat: allow users to list muted chats and contacts 

Partially fixes #1280
This commit is contained in:
Pascal Precht 2020-11-19 15:59:31 +01:00
parent db0b765d74
commit af1f03dc7c
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
7 changed files with 183 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/chat/view.nim
View File

@ -621,16 +621,16 @@ QtObject:
if (self.chats.chats.len == 0): return
let selectedChannel = self.chats.getChannel(channelIndex)
if (selectedChannel == nil): return
self.status.chat.muteChat(selectedChannel.id)
selectedChannel.muted = true
self.status.chat.muteChat(selectedChannel)
self.chats.updateChat(selectedChannel, false)
proc unmuteChannel*(self: ChatsView, channelIndex: int) {.slot.} =
if (self.chats.chats.len == 0): return
let selectedChannel = self.chats.getChannel(channelIndex)
if (selectedChannel == nil): return
self.status.chat.unmuteChat(selectedChannel.id)
selectedChannel.muted = false
self.status.chat.unmuteChat(selectedChannel)
self.chats.updateChat(selectedChannel, false)
proc channelIsMuted*(self: ChatsView, channelIndex: int): bool {.slot.} =

1
src/app/chat/views/channels_list.nim
View File

@ -95,6 +95,7 @@ QtObject:
proc removeChatItemFromList*(self: ChannelsList, channel: string): int =
let idx = self.chats.findIndexById(channel)
if idx == -1: return
self.beginRemoveRows(newQModelIndex(), idx, idx)
self.chats.delete(idx)
self.endRemoveRows()

25
src/app/profile/core.nim
View File

@ -14,6 +14,7 @@ import ../../status/wallet
import ../../eventemitter
import view
import views/ens_manager
import ../chat/views/channels_list
import chronicles
type ProfileController* = ref object
@ -55,6 +56,30 @@ proc init*(self: ProfileController, account: Account) =
self.status.chat.updateContacts(contacts)
self.view.setContactList(contacts)
self.status.events.on("channelLoaded") do(e: Args):
var channel = ChannelArgs(e)
if channel.chat.muted:
if channel.chat.chatType.isOneToOne:
discard self.view.mutedContacts.addChatItemToList(channel.chat)
return
discard self.view.mutedChats.addChatItemToList(channel.chat)
self.status.events.on("channelJoined") do(e: Args):
var channel = ChannelArgs(e)
if channel.chat.muted:
if channel.chat.chatType.isOneToOne:
discard self.view.mutedContacts.addChatItemToList(channel.chat)
return
discard self.view.mutedChats.addChatItemToList(channel.chat)
self.status.events.on("chatsLoaded") do(e:Args):
self.view.mutedChatsListChanged()
self.view.mutedContactsListChanged()
self.status.events.on("chatUpdate") do(e: Args):
var evArgs = ChatUpdateArgs(e)
self.view.updateChats(evArgs.chats)
self.status.events.on("contactAdded") do(e: Args):
let contacts = self.status.contacts.getContacts()
self.view.setContactList(contacts)

56
src/app/profile/view.nim
View File

@ -1,5 +1,6 @@
import NimQml, sequtils, strutils, sugar, os, json
import views/[mailservers_list, ens_manager, contact_list, fleets, profile_info, device_list, dapp_list]
import ../chat/views/channels_list
import ../../status/profile/[mailserver, profile, devices]
import ../../status/profile as status_profile
import ../../status/contacts as status_contacts
@ -21,6 +22,8 @@ QtObject:
contactList*: ContactList
addedContacts*: ContactList
blockedContacts*: ContactList
mutedChats*: ChannelsList
mutedContacts*: ChannelsList
deviceList*: DeviceList
dappList*: DappList
fleets*: Fleets
@ -39,6 +42,8 @@ QtObject:
if not self.contactList.isNil: self.contactList.delete
if not self.addedContacts.isNil: self.addedContacts.delete
if not self.blockedContacts.isNil: self.blockedContacts.delete
if not self.mutedChats.isNil: self.mutedChats.delete
if not self.mutedContacts.isNil: self.mutedContacts.delete
if not self.deviceList.isNil: self.deviceList.delete
if not self.ens.isNil: self.ens.delete
if not self.profile.isNil: self.profile.delete
@ -54,6 +59,8 @@ QtObject:
result.contactList = newContactList()
result.addedContacts = newContactList()
result.blockedContacts = newContactList()
result.mutedChats = newChannelsList(status)
result.mutedContacts = newChannelsList(status)
result.deviceList = newDeviceList()
result.dappList = newDappList(status)
result.ens = newEnsManager(status)
@ -339,3 +346,52 @@ QtObject:
proc getLinkPreviewWhitelist*(self: ProfileView): string {.slot.} =
result = $(self.status.profile.getLinkPreviewWhitelist())
proc getMutedChatsList(self: ProfileView): QVariant {.slot.} =
newQVariant(self.mutedChats)
proc getMutedContactsList(self: ProfileView): QVariant {.slot.} =
newQVariant(self.mutedContacts)
proc mutedChatsListChanged*(self: ProfileView) {.signal.}
proc mutedContactsListChanged*(self: ProfileView) {.signal.}
QtProperty[QVariant] mutedChats:
read = getMutedChatsList
notify = mutedChatsListChanged
QtProperty[QVariant] mutedContacts:
read = getMutedContactsList
notify = mutedContactsListChanged
proc unmuteChannel*(self: ProfileView, chatId: string) {.slot.} =
if (self.mutedChats.chats.len == 0 and self.mutedContacts.chats.len == 0): return
var selectedChannel = self.mutedChats.getChannelById(chatId)
if (selectedChannel != nil):
discard self.mutedChats.removeChatItemFromList(chatId)
else:
selectedChannel = self.mutedContacts.getChannelById(chatId)
if (selectedChannel == nil): return
discard self.mutedContacts.removeChatItemFromList(chatId)
selectedChannel.muted = false
self.status.chat.unmuteChat(selectedChannel)
self.mutedChatsListChanged()
self.mutedContactsListChanged()
proc updateChats*(self: ProfileView, chats: seq[Chat]) =
for chat in chats:
if not chat.muted:
if chat.chatType.isOneToOne:
discard self.mutedContacts.removeChatItemFromList(chat.id)
else:
discard self.mutedChats.removeChatItemFromList(chat.id)
else:
if chat.chatType.isOneToOne:
discard self.mutedContacts.addChatItemToList(chat)
else:
discard self.mutedChats.addChatItemToList(chat)
self.mutedChatsListChanged()
self.mutedContactsListChanged()

10
src/status/chat.nim
View File

@ -302,11 +302,13 @@ proc makeAdmin*(self: ChatModel, chatId: string, pubKey: string) =
proc resendMessage*(self: ChatModel, messageId: string) =
discard status_chat.reSendChatMessage(messageId)
proc muteChat*(self: ChatModel, chatId: string) =
discard status_chat.muteChat(chatId)
proc muteChat*(self: ChatModel, chat: Chat) =
discard status_chat.muteChat(chat.id)
self.events.emit("chatUpdate", ChatUpdateArgs(messages: @[], chats: @[chat], contacts: @[]))
proc unmuteChat*(self: ChatModel, chatId: string) =
discard status_chat.unmuteChat(chatId)
proc unmuteChat*(self: ChatModel, chat: Chat) =
discard status_chat.unmuteChat(chat.id)
self.events.emit("chatUpdate", ChatUpdateArgs(messages: @[], chats: @[chat], contacts: @[]))
proc processUpdateForTransaction*(self: ChatModel, messageId: string, response: string) =
var (chats, messages) = self.processMessageUpdateAfterSend(response)

73
ui/app/AppLayouts/Profile/Sections/MutedChatsModal.qml Normal file
View File

@ -0,0 +1,73 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtGraphicalEffects 1.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
ModalPopup {
id: root
title: qsTr("Muted chats")
property bool showMutedContacts: false
onClosed: {
root.destroy()
}
ListView {
id: mutedChatsList
anchors.top: parent.top
visible: true
height: childrenRect.height
anchors.left: parent.left
anchors.right: parent.right
model: root.showMutedContacts ? profileModel.mutedContacts : profileModel.mutedChats
delegate: Rectangle {
height: contactImage.height + Style.current.smallPadding * 2
color: Style.current.transparent
StatusIdenticon {
id: contactImage
height: 40
width: 40
chatName: model.name
chatType: model.chatType
identicon: model.identicon
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
id: contactInfo
text: model.chatType !== Constants.chatTypePublic ?
Emoji.parse(Utils.removeStatusEns(Utils.filterXSS(model.name)), "26x26") :
"#" + Utils.filterXSS(model.name)
anchors.right: unmuteButton.left
anchors.rightMargin: Style.current.smallPadding
elide: Text.ElideRight
font.pixelSize: 17
anchors.left: contactImage.right
anchors.leftMargin: Style.current.padding
anchors.verticalCenter: parent.verticalCenter
}
StyledText {
id: unmuteButton
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: qsTr("Unmute")
font.pixelSize: 15
color: Style.current.primary
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
profileModel.unmuteChannel(model.id)
}
}
}
}
}
}

24
ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
View File

@ -13,7 +13,7 @@ ScrollView {
contentHeight: notificationsContainer.height
clip: true
Rectangle {
Item {
id: notificationsContainer
anchors.right: parent.right
anchors.rightMargin: contentMargin
@ -21,6 +21,9 @@ ScrollView {
anchors.leftMargin: contentMargin
height: this.childrenRect.height + 100
property Component mutedChatsModalComponent: MutedChatsModal {}
ButtonGroup {
id: notificationSetting
}
@ -358,7 +361,14 @@ ScrollView {
StatusSectionMenuItem {
//% "Muted users"
label: qsTrId("muted-users")
info: "2"
info: profileModel.mutedContacts.rowCount() > 0 ? profileModel.mutedContacts.rowCount() : qsTr("None")
onClicked: {
const mutedChatsModal = notificationsContainer.mutedChatsModalComponent.createObject(notificationsContainer, {
showMutedContacts: true
})
mutedChatsModal.title = qsTr("Muted contacts")
mutedChatsModal.open()
}
}
StatusSectionMenuItem {
@ -366,8 +376,14 @@ ScrollView {
label: qsTrId("muted-chats")
//% "You can limit what gets shown in notifications"
description: qsTrId("you-can-limit-what-gets-shown-in-notifications")
//% "None"
info: qsTrId("none")
info: profileModel.mutedChats.rowCount() > 0 ? profileModel.mutedChats.rowCount() : qsTr("None")
onClicked: {
const mutedChatsModal = notificationsContainer.mutedChatsModalComponent.createObject(notificationsContainer, {
showMutedContacts: false
})
mutedChatsModal.title = qsTr("Muted chats")
mutedChatsModal.open()
}
}
}