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(community-permissions): Fixed failed event sending and fix method declaration 

Fixes: #10736
This commit is contained in:
Boris Melnik 2023-05-22 17:35:03 +03:00 committed by Iuri Matias
parent 0ba7f1d609
commit bd4bb0a566
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/main/module.nim
View File

@ -1010,7 +1010,7 @@ method onAcceptRequestToJoinLoading*[T](self: Module[T], communityId: string, me
if item.id != "": if item.id != "":
item.updatePendingRequestLoadingState(memberKey, true) item.updatePendingRequestLoadingState(memberKey, true)
method onAcceptRequestToJoinFailed*[T](self: Module[T], communityId: string, memberKey: string) = method onAcceptRequestToJoinFailed*[T](self: Module[T], communityId: string, memberKey: string, requestId: string) =
let item = self.view.model().getItemById(communityId) let item = self.view.model().getItemById(communityId)
if item.id != "": if item.id != "":
item.updatePendingRequestLoadingState(memberKey, false) item.updatePendingRequestLoadingState(memberKey, false)

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

@ -1388,11 +1388,14 @@ QtObject:
error "Error accepting request to join community", msg = e.msg error "Error accepting request to join community", msg = e.msg
proc onAsyncAcceptRequestToJoinCommunityDone*(self: Service, response: string) {.slot.} = proc onAsyncAcceptRequestToJoinCommunityDone*(self: Service, response: string) {.slot.} =
var communityId: string
var requestId: string
var userKey: string
try: try:
let rpcResponseObj = response.parseJson let rpcResponseObj = response.parseJson
let communityId = rpcResponseObj{"communityId"}.getStr communityId = rpcResponseObj{"communityId"}.getStr
let requestId = rpcResponseObj{"requestId"}.getStr requestId = rpcResponseObj{"requestId"}.getStr
let userKey = self.getUserPubKeyFromPendingRequest(communityId, requestId) userKey = self.getUserPubKeyFromPendingRequest(communityId, requestId)
if rpcResponseObj{"error"}.kind != JNull and rpcResponseObj{"error"}.getStr != "": if rpcResponseObj{"error"}.kind != JNull and rpcResponseObj{"error"}.getStr != "":
let errorMessage = rpcResponseObj{"error"}.getStr let errorMessage = rpcResponseObj{"error"}.getStr
@ -1416,7 +1419,7 @@ QtObject:
except Exception as e: except Exception as e:
let errMsg = e.msg let errMsg = e.msg
error "error accepting request to join: ", errMsg error "error accepting request to join: ", errMsg
self.events.emit(SIGNAL_ACCEPT_REQUEST_TO_JOIN_FAILED, Args()) self.events.emit(SIGNAL_ACCEPT_REQUEST_TO_JOIN_FAILED, CommunityMemberArgs(communityId: communityId, pubKey: userKey, requestId: requestId))
proc asyncLoadCuratedCommunities*(self: Service) = proc asyncLoadCuratedCommunities*(self: Service) =
self.events.emit(SIGNAL_CURATED_COMMUNITIES_LOADING, Args()) self.events.emit(SIGNAL_CURATED_COMMUNITIES_LOADING, Args())