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(communities): Adds mute community intervals 

Fixes: #9369
This commit is contained in:
Boris Melnik 2023-06-07 13:54:31 +03:00
parent 9be598ee32
commit cdac45010a
17 changed files with 103 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/modules/main/chat_section/controller.nim
View File

@ -636,8 +636,8 @@ proc muteCategory*(self: Controller, categoryId: string, interval: int) =
proc unmuteCategory*(self: Controller, categoryId: string) =
self.communityService.unmuteCategory(self.sectionId, categoryId)
proc setCommunityMuted*(self: Controller, muted: bool) =
self.communityService.setCommunityMuted(self.sectionId, muted)
proc setCommunityMuted*(self: Controller, mutedType: int) =
self.communityService.setCommunityMuted(self.sectionId, mutedType)
proc inviteUsersToCommunity*(self: Controller, pubKeys: string, inviteMessage: string): string =
result = self.communityService.inviteUsersToCommunityById(self.sectionId, pubKeys, inviteMessage)

2
src/app/modules/main/chat_section/io_interface.nim
View File

@ -304,7 +304,7 @@ method unbanUserFromCommunity*(self: AccessInterface, pubKey: string) {.base.} =
method exportCommunity*(self: AccessInterface): string {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, muted: bool) {.base.} =
method setCommunityMuted*(self: AccessInterface, mutedType: int) {.base.} =
raise newException(ValueError, "No implementation available")
method inviteUsersToCommunity*(self: AccessInterface, pubKeysJSON: string, inviteMessage: string): string {.base.} =

4
src/app/modules/main/chat_section/module.nim
View File

@ -1164,8 +1164,8 @@ method editCommunity*(self: Module, name: string,
method exportCommunity*(self: Module): string =
self.controller.exportCommunity()
method setCommunityMuted*(self: Module, muted: bool) =
self.controller.setCommunityMuted(muted)
method setCommunityMuted*(self: Module, mutedType: int) =
self.controller.setCommunityMuted(mutedType)
method inviteUsersToCommunity*(self: Module, pubKeysJSON: string, inviteMessage: string): string =
result = self.controller.inviteUsersToCommunity(pubKeysJSON, inviteMessage)

4
src/app/modules/main/chat_section/view.nim
View File

@ -324,8 +324,8 @@ QtObject:
proc exportCommunity*(self: View): string {.slot.} =
self.delegate.exportCommunity()
proc setCommunityMuted*(self: View, muted: bool) {.slot.} =
self.delegate.setCommunityMuted(muted)
proc setCommunityMuted*(self: View, mutedType: int) {.slot.} =
self.delegate.setCommunityMuted(mutedType)
proc inviteUsersToCommunity*(self: View, pubKeysJSON: string, inviteMessage: string): string {.slot.} =
result = self.delegate.inviteUsersToCommunity(pubKeysJSON, inviteMessage)

4
src/app/modules/main/communities/controller.nim
View File

@ -210,8 +210,8 @@ proc requestCommunityInfo*(self: Controller, communityId: string, importing: boo
proc importCommunity*(self: Controller, communityKey: string) =
self.communityService.importCommunity(communityKey)
proc setCommunityMuted*(self: Controller, communityId: string, muted: bool) =
self.communityService.setCommunityMuted(communityId, muted)
proc setCommunityMuted*(self: Controller, communityId: string, mutedType: int) =
self.communityService.setCommunityMuted(communityId, mutedType)
proc getContactNameAndImage*(self: Controller, contactId: string):
tuple[name: string, image: string, largeImage: string] =

4
src/app/modules/main/profile_section/communities/controller.nim
View File

@ -23,6 +23,6 @@ proc inviteUsersToCommunity*(self: Controller, communityID: string, pubKeys: str
proc leaveCommunity*(self: Controller, communityID: string) =
self.communityService.leaveCommunity(communityID)
method setCommunityMuted*(self: Controller, communityID: string, muted: bool) =
self.communityService.setCommunityMuted(communityID, muted)
method setCommunityMuted*(self: Controller, communityID: string, mutedType: int) =
self.communityService.setCommunityMuted(communityID, mutedType)

2
src/app/modules/main/profile_section/communities/io_interface.nim
View File

@ -28,6 +28,6 @@ method inviteUsersToCommunity*(self: AccessInterface, communityID: string, pubKe
method leaveCommunity*(self: AccessInterface, communityID: string) {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, communityID: string, muted: bool) {.base.} =
method setCommunityMuted*(self: AccessInterface, communityID: string, mutedType: int) {.base.} =
raise newException(ValueError, "No implementation available")

4
src/app/modules/main/profile_section/communities/module.nim
View File

@ -48,5 +48,5 @@ method inviteUsersToCommunity*(self: Module, communityID: string, pubKeysJSON: s
method leaveCommunity*(self: Module, communityID: string) =
self.controller.leaveCommunity(communityID)
method setCommunityMuted*(self: Module, communityID: string, muted: bool) =
self.controller.setCommunityMuted(communityID, muted)
method setCommunityMuted*(self: Module, communityID: string, mutedType: int) =
self.controller.setCommunityMuted(communityID, mutedType)

4
src/app/modules/main/profile_section/communities/view.nim
View File

@ -25,5 +25,5 @@ QtObject:
method leaveCommunity*(self: View, communityID: string) {.slot.} =
self.delegate.leaveCommunity(communityID)
method setCommunityMuted*(self: View, communityID: string, muted: bool) {.slot.} =
self.delegate.setCommunityMuted(communityID, muted)
method setCommunityMuted*(self: View, communityID: string, mutedType: int) {.slot.} =
self.delegate.setCommunityMuted(communityID, mutedType)

9
src/app_service/service/community/dto/community.nim
View File

@ -16,6 +16,15 @@ type RequestToJoinType* {.pure.}= enum
Accepted = 3,
Canceled = 4
type MutedType* {.pure.}= enum
For15min = 1,
For1hr = 2,
For8hr = 3,
For1week = 4,
TillUnmuted = 5,
For1min = 6,
Unmuted = 7
type CommunityMembershipRequestDto* = object
id*: string
publicKey*: string

8
src/app_service/service/community/service.nim
View File

@ -1813,10 +1813,14 @@ QtObject:
except Exception as e:
error "Error banning user from community", msg = e.msg
proc setCommunityMuted*(self: Service, communityId: string, muted: bool) =
proc setCommunityMuted*(self: Service, communityId: string, mutedType: int) =
try:
discard status_go.setCommunityMuted(communityId, muted)
let response = status_go.setCommunityMuted(communityId, mutedType)
if not response.error.isNil:
error "error muting the community", msg = response.error.message
return
let muted = if (MutedType(mutedType) == MutedType.Unmuted): false else: true
self.events.emit(SIGNAL_COMMUNITY_MUTED,
CommunityMutedArgs(communityId: communityId, muted: muted))
except Exception as e:

7
src/backend/communities.nim
View File

@ -370,8 +370,11 @@ proc unbanUserFromCommunity*(communityId: string, pubKey: string): RpcResponse[J
"user": pubKey
}])
proc setCommunityMuted*(communityId: string, muted: bool): RpcResponse[JsonNode] {.raises: [Exception].} =
return callPrivateRPC("setCommunityMuted".prefix, %*[communityId, muted])
proc setCommunityMuted*(communityId: string, mutedType: int): RpcResponse[JsonNode] {.raises: [Exception].} =
return callPrivateRPC("setCommunityMuted".prefix, %*[{
"communityId": communityId,
"mutedType": mutedType
}])
proc inviteUsersToCommunity*(communityId: string, pubKeys: seq[string]): RpcResponse[JsonNode] {.raises: [Exception].} =
return callPrivateRPC("inviteUsersToCommunity".prefix, %*[{

64
ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
View File

@ -9,15 +9,20 @@ import StatusQ.Popups 0.1
import utils 1.0
import shared.controls.chat.menuItems 1.0
StatusListView {
id: root
property bool hasAddedContacts: false
signal inviteFriends(var communityData)
signal closeCommunityClicked(string communityId)
signal leaveCommunityClicked(string community, string communityId, string outroMessage)
signal setCommunityMutedClicked(string communityId, bool muted)
signal setCommunityMutedClicked(string communityId, int mutedType)
signal setActiveCommunityClicked(string communityId)
interactive: false
@ -43,27 +48,50 @@ StatusListView {
onClicked: setActiveCommunityClicked(model.id)
components: [
StatusFlatButton {
anchors.verticalCenter: parent.verticalCenter
objectName: "CommunitiesListPanel_leaveCommunityPopupButton"
size: StatusBaseButton.Size.Small
type: StatusBaseButton.Type.Danger
borderColor: "transparent"
enabled: model.memberRole !== Constants.memberRole.owner
icon.name: "dots-icon"
onClicked: menu.popup(0, height)
property StatusMenu menu: StatusMenu {
id: communityContextMenu
width: 180
StatusAction {
text: qsTr("Invite People")
icon.name: "share-ios"
enabled: model.canManageUsers
onTriggered: root.inviteFriends(model)
}
MuteChatMenuItem {
enabled: !model.muted
title: qsTr("Mute Community")
onMuteTriggered: {
root.setCommunityMutedClicked(model.id, interval)
communityContextMenu.close()
}
}
StatusAction {
enabled: model.muted
text: qsTr("Unmute Community")
icon.name: "notification-muted"
onTriggered: root.setCommunityMutedClicked(model.id, Constants.MutingVariations.Unmuted)
}
StatusMenuSeparator {}
StatusAction {
text: model.spectated ? qsTr("Close Community") : qsTr("Leave Community")
onClicked: model.spectated ? root.closeCommunityClicked(model.id) : root.leaveCommunityClicked(model.name, model.id, model.outroMessage)
},
StatusFlatButton {
anchors.verticalCenter: parent.verticalCenter
size: StatusBaseButton.Size.Small
icon.name: model.muted ? "notification-muted" : "notification"
onClicked: root.setCommunityMutedClicked(model.id, !model.muted)
},
StatusFlatButton {
anchors.verticalCenter: parent.verticalCenter
size: StatusBaseButton.Size.Small
icon.name: "invite-users"
onClicked: root.inviteFriends(model)
icon.name: "arrow-left"
type: StatusAction.Type.Danger
onTriggered: model.spectated ? root.closeCommunityClicked(model.id)
: root.leaveCommunityClicked(model.name, model.id, model.outroMessage)
}
}
}
]
}

2
ui/app/AppLayouts/Profile/views/CommunitiesView.qml
View File

@ -124,7 +124,7 @@ SettingsContentBase {
}
onSetCommunityMutedClicked: {
root.profileSectionStore.communitiesProfileModule.setCommunityMuted(communityId, muted)
root.profileSectionStore.communitiesProfileModule.setCommunityMuted(communityId, mutedType)
}
onSetActiveCommunityClicked: {

19
ui/app/mainui/AppMain.qml
View File

@ -17,6 +17,7 @@ import AppLayouts.CommunitiesPortal 1.0
import utils 1.0
import shared 1.0
import shared.controls 1.0
import shared.controls.chat.menuItems 1.0
import shared.panels 1.0
import shared.popups 1.0
import shared.popups.keycard 1.0
@ -327,7 +328,7 @@ Item {
popupMenu: Component {
StatusMenu {
id: communityContextMenu
width: 180
property var chatCommunitySectionModule
openHandler: function () {
@ -356,11 +357,21 @@ Item {
StatusMenuSeparator {}
MuteChatMenuItem {
enabled: !model.muted
title: qsTr("Mute Community")
onMuteTriggered: {
communityContextMenu.chatCommunitySectionModule.setCommunityMuted(interval)
communityContextMenu.close()
}
}
StatusAction {
text: model.muted ? qsTr("Unmute Community") : qsTr("Mute Community")
icon.name: model.muted ? "notification-muted" : "notification"
enabled: model.muted
text: qsTr("Unmute Community")
icon.name: "notification-muted"
onTriggered: {
communityContextMenu.chatCommunitySectionModule.setCommunityMuted(!model.muted)
communityContextMenu.chatCommunitySectionModule.setCommunityMuted(Constants.MutingVariations.Unmuted)
}
}

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

@ -1078,6 +1078,7 @@ QtObject {
For8hr = 3,
For1week = 4,
TillUnmuted = 5,
For1min = 6
For1min = 6,
Unmuted = 7
}
}

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit ea7a3890755b25856ec8f8da7bdda0189a3fcc68
Subproject commit 3e7d1a5f34183ea9f2ebf3b3d6a8143c98674d62