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

refactor(community): move community specific functions to chat_section 

Fixes #4489
This commit is contained in:
Jonathan Rainville 2022-01-19 15:07:02 -05:00 committed by Sale Djenic
parent e1deafa76b
commit bd2bb8952a
20 changed files with 116 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,3 +275,31 @@ method createCommunityChannel*(
method leaveCommunity*(self: Controller) =
self.communityService.leaveCommunity(self.sectionId)
method editCommunity*(
self: Controller,
name: string,
description: string,
access: int,
ensOnly: bool,
color: string,
imageUrl: string,
aX: int, aY: int, bX: int, bY: int) =
self.communityService.editCommunity(
self.sectionId,
name,
description,
access,
ensOnly,
color,
imageUrl,
aX, aY, bX, bY)
method exportCommunity*(self: Controller): string =
self.communityService.exportCommunity(self.sectionId)
method setCommunityMuted*(self: Controller, muted: bool) =
self.communityService.setCommunityMuted(self.sectionId, muted)
method inviteUsersToCommunity*(self: Controller, pubKeys: string): string =
result = self.communityService.inviteUsersToCommunityById(self.sectionId, pubKeys)

12
src/app/modules/main/chat_section/controller_interface.nim
View File

@ -128,3 +128,15 @@ method createCommunityChannel*(self: AccessInterface, name: string, description:
method leaveCommunity*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method editCommunity*(self: AccessInterface, name: string, description: string, access: int, ensOnly: bool, color: string, imageUrl: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method exportCommunity*(self: AccessInterface): string {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, muted: bool) {.base.} =
raise newException(ValueError, "No implementation available")
method inviteUsersToCommunity*(self: AccessInterface, pubKeys: string): string {.base.} =
raise newException(ValueError, "No implementation available")

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

@ -523,3 +523,18 @@ method createCommunityChannel*(self: Module, name, description: string,) =
method leaveCommunity*(self: Module) =
self.controller.leaveCommunity()
method editCommunity*(self: Module, name: string, description: string,
access: int, ensOnly: bool, color: string,
imagePath: string,
aX: int, aY: int, bX: int, bY: int) =
self.controller.editCommunity(name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
method exportCommunity*(self: Module): string =
self.controller.exportCommunity()
method setCommunityMuted*(self: Module, muted: bool) =
self.controller.setCommunityMuted(muted)
method inviteUsersToCommunity*(self: Module, pubKeysJSON: string): string =
result = self.controller.inviteUsersToCommunity(pubKeysJSON)

12
src/app/modules/main/chat_section/private_interfaces/module_view_delegate_interface.nim
View File

@ -96,3 +96,15 @@ method createCommunityChannel*(self: AccessInterface, name: string, description:
method leaveCommunity*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method editCommunity*(self: AccessInterface, name: string, description: string, access: int, ensOnly: bool, color: string, imagePath: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method exportCommunity*(self: AccessInterface): string {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, muted: bool) {.base.} =
raise newException(ValueError, "No implementation available")
method inviteUsersToCommunity*(self: AccessInterface, pubKeysJSON: string): string {.base.} =
raise newException(ValueError, "No implementation available")

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

@ -193,3 +193,15 @@ QtObject:
proc leaveCommunity*(self: View) {.slot.} =
self.delegate.leaveCommunity()
proc editCommunity*(self: View, name: string, description: string, access: int, ensOnly: bool, color: string, imagePath: string, aX: int, aY: int, bX: int, bY: int) {.slot.} =
self.delegate.editCommunity(name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
proc exportCommunity*(self: View): string {.slot.} =
self.delegate.exportCommunity()
proc setCommunityMuted*(self: View, muted: bool) {.slot.} =
self.delegate.setCommunityMuted(muted)
proc inviteUsersToCommunity*(self: View, pubKeysJSON: string): string {.slot.} =
result = self.delegate.inviteUsersToCommunity(pubKeysJSON)

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

@ -87,26 +87,6 @@ method createCommunity*(
imageUrl,
aX, aY, bX, bY)
method editCommunity*(
self: Controller,
id: string,
name: string,
description: string,
access: int,
ensOnly: bool,
color: string,
imageUrl: string,
aX: int, aY: int, bX: int, bY: int) =
self.communityService.editCommunity(
id,
name,
description,
access,
ensOnly,
color,
imageUrl,
aX, aY, bX, bY)
method editCommunityChannel*(
self: Controller,
communityId: string,
@ -168,17 +148,8 @@ method requestCommunityInfo*(self: Controller, communityId: string) =
method importCommunity*(self: Controller, communityKey: string) =
self.communityService.importCommunity(communityKey)
method exportCommunity*(self: Controller, communityId: string): string =
self.communityService.exportCommunity(communityId)
method inviteUsersToCommunityById*(self: Controller, communityId: string, pubKeys: string): string =
result = self.communityService.inviteUsersToCommunityById(communityId, pubKeys)
method removeUserFromCommunity*(self: Controller, communityId: string, pubKeys: string) =
self.communityService.removeUserFromCommunity(communityId, pubKeys)
method banUserFromCommunity*(self: Controller, communityId: string, pubKey: string) =
self.communityService.removeUserFromCommunity(communityId, pubKey)
method setCommunityMuted*(self: Controller, communityId: string, muted: bool) =
self.communityService.setCommunityMuted(communityId, muted)

12
src/app/modules/main/communities/controller_interface.nim
View File

@ -19,9 +19,6 @@ method requestToJoinCommunity*(self: AccessInterface, communityId: string, ensNa
method createCommunity*(self: AccessInterface, name: string, description: string, access: int, ensOnly: bool, color: string, imageUrl: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method editCommunity*(self: AccessInterface, id: string, name: string, description: string, access: int, ensOnly: bool, color: string, imageUrl: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method editCommunityChannel*(self: AccessInterface, communityId: string, chatId: string, name: string, description: string, categoryId: string, position: int) {.base.} =
raise newException(ValueError, "No implementation available")
@ -46,21 +43,12 @@ method requestCommunityInfo*(self: AccessInterface, communityId: string) {.base.
method importCommunity*(self: AccessInterface, communityKey: string) {.base.} =
raise newException(ValueError, "No implementation available")
method exportCommunity*(self: AccessInterface, communityId: string): string {.base.} =
raise newException(ValueError, "No implementation available")
method inviteUsersToCommunityById*(self: AccessInterface, communityId: string, pubKeys: string): string {.base.} =
raise newException(ValueError, "No implementation available")
method removeUserFromCommunity*(self: AccessInterface, communityId: string, pubKeys: string) {.base.} =
raise newException(ValueError, "No implementation available")
method banUserFromCommunity*(self: AccessInterface, communityId: string, pubKey: string) {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, communityId: string, muted: bool) {.base.} =
raise newException(ValueError, "No implementation available")
type
## Abstract class (concept) which must be implemented by object/s used in this
## module.

15
src/app/modules/main/communities/module.nim
View File

@ -129,12 +129,6 @@ method createCommunity*(self: Module, name: string, description: string,
aX: int, aY: int, bX: int, bY: int) =
self.controller.createCommunity(name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
method editCommunity*(self: Module, id: string, name: string, description: string,
access: int, ensOnly: bool, color: string,
imagePath: string,
aX: int, aY: int, bX: int, bY: int) =
self.controller.editCommunity(id, name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
method createCommunityCategory*(self: Module, communityId: string, name: string, channels: string) =
let channelsSeq = map(parseJson(channels).getElems(), proc(x:JsonNode):string = x.getStr())
self.controller.createCommunityCategory(communityId, name, channelsSeq)
@ -154,9 +148,6 @@ method removeUserFromCommunity*(self: Module, communityId: string, categoryId: s
# self.controller.reorderCommunityChannel(communityId, categoryId, chatId, position)
discard
method inviteUsersToCommunityById*(self: Module, communityId: string, pubKeysJSON: string): string =
result = self.controller.inviteUsersToCommunityById(communityId, pubKeysJSON)
method removeUserFromCommunity*(self: Module, communityId: string, pubKey: string) =
self.controller.removeUserFromCommunity(communityId, pubKey)
@ -172,11 +163,5 @@ method requestCommunityInfo*(self: Module, communityId: string) =
method deleteCommunityChat*(self: Module, communityId: string, channelId: string) =
self.controller.deleteCommunityChat(communityId, channelId)
method setCommunityMuted*(self: Module, communityId: string, muted: bool) =
self.controller.setCommunityMuted(communityId, muted)
method importCommunity*(self: Module, communityKey: string) =
self.controller.importCommunity(communityKey)
method exportCommunity*(self: Module, communityId: string): string =
self.controller.exportCommunity(communityId)

12
src/app/modules/main/communities/private_interfaces/module_access_interface.nim
View File

@ -25,9 +25,6 @@ method joinCommunity*(self: AccessInterface, communityId: string): string {.base
method createCommunity*(self: AccessInterface, name: string, description: string, access: int, ensOnly: bool, color: string, imagePath: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method editCommunity*(self: AccessInterface, id: string, name: string, description: string, access: int, ensOnly: bool, color: string, imagePath: string, aX: int, aY: int, bX: int, bY: int) {.base.} =
raise newException(ValueError, "No implementation available")
method createCommunityCategory*(self: AccessInterface, communityId: string, name: string, channels: string) {.base.} =
raise newException(ValueError, "No implementation available")
@ -43,9 +40,6 @@ method reorderCommunityCategories*(self: AccessInterface, communityId: string, c
method reorderCommunityChannel*(self: AccessInterface, communityId: string, categoryId: string, chatId: string, position: int) {.base} =
raise newException(ValueError, "No implementation available")
method inviteUsersToCommunityById*(self: AccessInterface, communityId: string, pubKeysJSON: string): string {.base.} =
raise newException(ValueError, "No implementation available")
method removeUserFromCommunity*(self: AccessInterface, communityId: string, pubKey: string) {.base.} =
raise newException(ValueError, "No implementation available")
@ -61,11 +55,5 @@ method requestCommunityInfo*(self: AccessInterface, communityId: string) {.base.
method deleteCommunityChat*(self: AccessInterface, communityId: string, channelId: string) {.base.} =
raise newException(ValueError, "No implementation available")
method setCommunityMuted*(self: AccessInterface, communityId: string, muted: bool) {.base.} =
raise newException(ValueError, "No implementation available")
method importCommunity*(self: AccessInterface, communityKey: string) {.base.} =
raise newException(ValueError, "No implementation available")
method exportCommunity*(self: AccessInterface, communityId: string): string {.base.} =
raise newException(ValueError, "No implementation available")

18
src/app/modules/main/communities/view.nim
View File

@ -67,9 +67,6 @@ QtObject:
aX: int, aY: int, bX: int, bY: int) {.slot.} =
self.delegate.createCommunity(name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
proc editCommunity*(self: View, id: string, name: string, description: string, access: int, ensOnly: bool, color: string, imagePath: string, aX: int, aY: int, bX: int, bY: int) {.slot.} =
self.delegate.editCommunity(id, name, description, access, ensOnly, color, imagePath, aX, aY, bX, bY)
proc createCommunityCategory*(self: View, communityId: string, name: string, channels: string) {.slot.} =
self.delegate.createCommunityCategory(communityId, name, channels)
@ -85,9 +82,6 @@ QtObject:
proc reorderCommunityChannel*(self: View, communityId: string, categoryId: string, chatId: string, position: int): string {.slot} =
self.delegate.reorderCommunityChannel(communityId, categoryId, chatId, position)
proc inviteUsersToCommunityById*(self: View, communityId: string, pubKeysJSON: string): string {.slot.} =
result = self.delegate.inviteUsersToCommunityById(communityId, pubKeysJSON)
proc removeUserFromCommunity*(self: View, communityId: string, pubKey: string) {.slot.} =
self.delegate.removeUserFromCommunity(communityId, pubKey)
@ -103,17 +97,5 @@ QtObject:
proc deleteCommunityChat*(self: View, communityId: string, channelId: string) {.slot.} =
self.delegate.deleteCommunityChat(communityId, channelId)
proc setCommunityMuted*(self: View, communityId: string, muted: bool) {.slot.} =
self.delegate.setCommunityMuted(communityId, muted)
# proc markNotificationsAsRead*(self: View, markAsReadProps: MarkAsReadNotificationProperties) =
# # todo
# discard
proc importCommunity*(self: View, communityKey: string) {.slot.} =
self.delegate.importCommunity(communityKey)
proc exportCommunity*(self: View, communityId: string): string {.slot.} =
self.delegate.exportCommunity(communityId)

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

@ -686,23 +686,23 @@ QtObject:
let response = status_go.inviteUsersToCommunity(communityId, pubKeys)
discard self.chatService.processMessageUpdateAfterSend(response)
except Exception as e:
error "Error exporting community", msg = e.msg
error "Error inviting to community", msg = e.msg
result = "Error exporting community: " & e.msg
proc removeUserFromCommunity*(self: Service, communityId: string, pubKeys: string) =
try:
discard status_go.removeUserFromCommunity(communityId, pubKeys)
except Exception as e:
error "Error exporting community", msg = e.msg
error "Error removing user from community", msg = e.msg
proc banUserFromCommunity*(self: Service, communityId: string, pubKey: string) =
try:
discard status_go.banUserFromCommunity(communityId, pubKey)
except Exception as e:
error "Error exporting community", msg = e.msg
error "Error banning user from community", msg = e.msg
proc setCommunityMuted*(self: Service, communityId: string, muted: bool) =
try:
discard status_go.setCommunityMuted(communityId, muted)
except Exception as e:
error "Error exporting community", msg = e.msg
error "Error setting community un/muted", msg = e.msg

3
ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml
View File

@ -19,11 +19,12 @@ Column {
property var rootStore
property var contactsStore
property var communitySectionModule
property var community
property alias contactListSearch: contactFieldAndList
function sendInvites(pubKeys) {
const error = root.rootStore.inviteUsersToCommunityById(root.community.id, JSON.stringify(pubKeys))
const error = communitySectionModule.inviteUsersToCommunity(JSON.stringify(pubKeys))
if (error) {
console.error('Error inviting', error)
contactFieldAndList.validationError = error

3
ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml
View File

@ -92,7 +92,8 @@ Rectangle {
anchors.bottomMargin: Style.current.halfPadding
onClicked: Global.openPopup(inviteFriendsToCommunityPopup, {
community: root.activeCommunity,
hasAddedContacts: root.hasAddedContacts
hasAddedContacts: root.hasAddedContacts,
communitySectionModule: root.communitySectionModule
})
}

14
ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml
View File

@ -14,6 +14,8 @@ StatusModal {
property var store
property var community
property var contactsStore
property bool hasAddedContacts
property var communitySectionModule
onClosed: {
@ -61,16 +63,15 @@ StatusModal {
community: root.community
onMembersListButtonClicked: root.contentItem.push(membersList)
onNotificationsButtonClicked: {
root.store.setCommunityMuted(root.community.id, checked);
}
onNotificationsButtonClicked: root.communitySectionModule.setCommunityMuted(checked)
onEditButtonClicked: Global.openPopup(editCommunityroot, {
store: root.store,
community: root.community,
communitySectionModule: root.communitySectionModule,
onSave: root.close
})
onTransferOwnershipButtonClicked: Global.openPopup(transferOwnershiproot, {
privateKey: root.store.exportCommunity(root.community.id),
privateKey: communitySectionModule.exportCommunity(root.community.id),
store: root.store
})
onLeaveButtonClicked: {
@ -127,13 +128,14 @@ StatusModal {
//% "Invite friends"
headerTitle: qsTrId("invite-friends")
community: root.community
communitySectionModule: root.communitySectionModule
contactsStore: root.contactsStore
contactListSearch.chatKey.text: ""
contactListSearch.pubKey: ""
contactListSearch.pubKeys: []
contactListSearch.ensUsername: ""
// Not Refactored Yet
// contactListSearch.existingContacts.visible: root.store.allContacts.hasAddedContacts()
contactListSearch.existingContacts.visible: root.hasAddedContacts
contactListSearch.noContactsRect.visible: !contactListSearch.existingContacts.visible
}
}

4
ui/app/AppLayouts/Chat/popups/community/CreateCommunityPopup.qml
View File

@ -19,6 +19,7 @@ StatusModal {
height: 509
property var store
property var communitySectionModule
property bool isEdit: false
// Not Refactored Yet
property QtObject community: null //popup.store.chatsModelInst.communities.activeCommunity
@ -408,8 +409,7 @@ StatusModal {
let error = false;
if(isEdit) {
error = popup.store.editCommunity(
community.id,
error = communitySectionModule.editCommunity(
Utils.filterXSS(popup.contentItem.communityName.input.text),
Utils.filterXSS(popup.contentItem.communityDescription.input.text),
membershipRequirementSettingPopup.checkedMembership,

2
ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml
View File

@ -18,6 +18,7 @@ StatusModal {
property var rootStore
property var contactsStore
property var community
property var communitySectionModule
property bool hasAddedContacts
onOpened: {
@ -38,6 +39,7 @@ StatusModal {
contentItem: CommunityProfilePopupInviteFriendsPanel {
id: contactFieldAndList
rootStore: popup.rootStore
communitySectionModule: popup.communitySectionModule
contactsStore: popup.contactsStore
community: popup.community
contactListSearch.onUserClicked: {

12
ui/app/AppLayouts/Chat/stores/RootStore.qml
View File

@ -139,10 +139,6 @@ QtObject {
communitiesModuleInst.createCommunity(communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY);
}
function editCommunity(communityId, communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY) {
communitiesModuleInst.editCommunity(communityId, communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY);
}
function createCommunityCategory(communityId, categoryName, channels) {
// Not Refactored Yet
// chatsModelInst.communities.createCommunityCategory(communityId, categoryName, channels);
@ -161,14 +157,6 @@ QtObject {
chatCommunitySectionModule.leaveCommunity();
}
function setCommunityMuted(communityId, checked) {
communitiesModuleInst.setCommunityMuted(communityId, checked);
}
function exportCommunity(communityId) {
return communitiesModuleInst.exportCommunity(communityId);
}
function createCommunityChannel(channelName, channelDescription) {
chatCommunitySectionModule.createCommunityChannel(channelName, channelDescription);
}

8
ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
View File

@ -81,7 +81,8 @@ Item {
enabled: communityData.canManageUsers
onTriggered: Global.openPopup(inviteFriendsToCommunityPopup, {
community: communityData,
hasAddedContacts: root.hasAddedContacts
hasAddedContacts: root.hasAddedContacts,
communitySectionModule: root.communitySectionModule
})
}
}
@ -200,7 +201,8 @@ Item {
enabled: communityData.canManageUsers
onTriggered: Global.openPopup(inviteFriendsToCommunityPopup, {
community: communityData,
hasAddedContacts: root.hasAddedContacts
hasAddedContacts: root.hasAddedContacts,
communitySectionModule: root.communitySectionModule
})
}
}
@ -373,7 +375,7 @@ Item {
activeCommunity: communityData
onBackupButtonClicked: {
Global.openPopup(transferOwnershipPopup, {
privateKey: root.store.exportCommunity(communityData.id),
privateKey: communitySectionModule.exportCommunity(communityData.id),
store: root.store
})
}

16
ui/app/AppLayouts/stores/RootStore.qml
View File

@ -39,26 +39,10 @@ QtObject {
communitiesModuleInst.setObservedCommunity(communityId);
}
function setCommunityMuted(communityId, checked) {
communitiesModuleInst.setCommunityMuted(communityId, checked);
}
function exportCommunity(communityId) {
return communitiesModuleInst.exportCommunity(communityId);
}
function createCommunity(communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY) {
communitiesModuleInst.createCommunity(communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY);
}
function editCommunity(communityId, communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY) {
communitiesModuleInst.editCommunity(communityId, communityName, communityDescription, checkedMembership, ensOnlySwitchChecked, communityColor, communityImage, imageCropperModalaX, imageCropperModalaY, imageCropperModalbX, imageCropperModalbY);
}
function inviteUsersToCommunityById(communityId, pubkeysJson) {
communitiesModuleInst.inviteUsersToCommunityById(communityId, pubkeysJson);
}
function copyToClipboard(text) {
globalUtils.copyToClipboard(text)
}

8
ui/app/AppMain.qml
View File

@ -265,7 +265,8 @@ Item {
enabled: model.canManageUsers
onTriggered: Global.openPopup(inviteFriendsToCommunityPopup, {
community: model,
hasAddedContacts: appMain.rootStore.hasAddedContacts
hasAddedContacts: appMain.rootStore.hasAddedContacts,
communitySectionModule: communityContextMenu.chatCommunitySectionModule
})
}
@ -287,7 +288,8 @@ Item {
icon.name: "edit"
onTriggered: Global.openPopup(editCommunityPopup, {
store: appMain.rootStore,
community: model
community: model,
communitySectionModule: communityContextMenu.chatCommunitySectionModule
})
}
@ -644,6 +646,8 @@ Item {
CommunityProfilePopup {
anchors.centerIn: parent
contactsStore: appMain.rootStore.contactStore
hasAddedContacts: appMain.rootStore.hasAddedContacts
onClosed: {
destroy()