Fix/invitation bubble

src/app/modules/main/communities/controller.nim

@@ -62,6 +62,10 @@ proc init*(self: Controller) =
     let args = CommunityMutedArgs(e)
     self.delegate.communityMuted(args.communityId, args.muted)
 
+  self.events.on(SIGNAL_COMMUNITY_MY_REQUEST_ADDED) do(e:Args):
+    let args = CommunityRequestArgs(e)
+    self.delegate.communityAccessRequested(args.communityRequest.communityId)
+
   self.events.on(SIGNAL_DISCORD_CATEGORIES_AND_CHANNELS_EXTRACTED) do(e:Args):
     let args = DiscordCategoriesAndChannelsArgs(e)
     self.delegate.discordCategoriesAndChannelsExtracted(args.categories, args.channels, args.oldestMessageTimestamp, args.errors, args.errorsCount)

src/app/modules/main/communities/io_interface.nim

@@ -109,6 +109,9 @@ method viewDidLoad*(self: AccessInterface) {.base.} =
 method communityMuted*(self: AccessInterface, communityId: string, muted: bool) {.base.} =
   raise newException(ValueError, "No implementation available")
 
+method communityAccessRequested*(self: AccessInterface, communityId: string) {.base.} =
+  raise newException(ValueError, "No implementation available")
+
 method requestExtractDiscordChannelsAndCategories*(self: AccessInterface, filesToImport: seq[string]) {.base.} =
   raise newException(ValueError, "No implementation available")
 

src/app/modules/main/communities/module.nim

@@ -232,6 +232,9 @@ method reorderCommunityCategories*(self: Module, communityId: string, categoryId
 method communityMuted*(self: Module, communityId: string, muted: bool) =
   self.view.model().setMuted(communityId, muted)
 
+method communityAccessRequested*(self: Module, communityId: string) =
+  self.view.communityAccessRequested(communityId)
+
 method discordCategoriesAndChannelsExtracted*(self: Module, categories: seq[DiscordCategoryDto], channels: seq[DiscordChannelDto], oldestMessageTimestamp: int, errors: Table[string, DiscordImportError], errorsCount: int) =
 
   for filePath in errors.keys:

src/app/modules/main/communities/view.nim

@@ -76,6 +76,7 @@ QtObject:
   proc communityChanged*(self: View, communityId: string) {.signal.}
   proc discordOldestMessageTimestampChanged*(self: View) {.signal.}
   proc discordImportErrorsCountChanged*(self: View) {.signal.}
+  proc communityAccessRequested*(self: View, communityId: string) {.signal.}
 
   proc setCommunityTags*(self: View, communityTags: string) =
     self.communityTags = newQVariant(communityTags)

src/app_service/service/community/dto/community.nim

@@ -32,7 +32,7 @@ type CommunityMembershipRequestDto* = object
   chatId*: string
   communityId*: string
   state*: int
-  our*: string
+  our*: string #FIXME: should be bool
 
 type CommunitySettingsDto* = object
   id*: string

src/app_service/service/community/service.nim

@@ -1,4 +1,4 @@
-import NimQml, Tables, json, sequtils, std/algorithm, strformat, strutils, chronicles, json_serialization
+import NimQml, Tables, json, sequtils, std/algorithm, strformat, strutils, chronicles, json_serialization, sugar
 
 import ./dto/community as community_dto
 
@@ -265,6 +265,7 @@ QtObject:
     if(not self.joinedCommunities.hasKey(community.id)):
       if (community.joined and community.isMember):
         self.joinedCommunities[community.id] = community
+        keepIf(self.myCommunityRequests, request => request.communityId != community.id)
         self.events.emit(SIGNAL_COMMUNITY_JOINED, CommunityArgs(community: community, fromUserAction: false))
       return
 
@@ -516,6 +517,17 @@ QtObject:
       return false
     return self.allCommunities[communityId].canJoin
 
+  proc processRequestsToJoinCommunity(self: Service, responseResult: JsonNode): bool =
+    if responseResult{"requestsToJoinCommunity"} == nil or responseResult{"requestsToJoinCommunity"}.kind == JNull:
+      return false
+
+    for jsonCommunityReqest in responseResult["requestsToJoinCommunity"]:
+      let communityRequest = jsonCommunityReqest.toCommunityMembershipRequestDto()
+      self.myCommunityRequests.add(communityRequest)
+      self.events.emit(SIGNAL_COMMUNITY_MY_REQUEST_ADDED, CommunityRequestArgs(communityRequest: communityRequest))
+
+    return true
+
   proc joinCommunity*(self: Service, communityId: string): string =
     result = ""
     try:
@@ -540,6 +552,9 @@ QtObject:
         error "error: ", procName="joinCommunity", errDesription = "no 'communitiesSettings' key in response"
         return
 
+      if not self.processRequestsToJoinCommunity(response.result):
+        error "error: ", procName="joinCommunity", errDesription = "no 'requestsToJoinCommunity' key in response"
+
       var updatedCommunity = response.result["communities"][0].toCommunityDto()
       let communitySettings = response.result["communitiesSettings"][0].toCommunitySettingsDto()
 
@@ -569,11 +584,9 @@ QtObject:
     try:
       let response = status_go.requestToJoinCommunity(communityId, ensName)
 
-      if response.result{"requestsToJoinCommunity"} != nil and response.result{"requestsToJoinCommunity"}.kind != JNull:
-        for jsonCommunityReqest in response.result["requestsToJoinCommunity"]:
-          let communityRequest = jsonCommunityReqest.toCommunityMembershipRequestDto()
-          self.myCommunityRequests.add(communityRequest)
-          self.events.emit(SIGNAL_COMMUNITY_MY_REQUEST_ADDED, CommunityRequestArgs(communityRequest: communityRequest))
+      if not self.processRequestsToJoinCommunity(response.result):
+        error "error: ", procName="requestToJoinCommunity", errDesription = "no 'requestsToJoinCommunity' key in response"
+
     except Exception as e:
       error "Error requesting to join the community", msg = e.msg, communityId, ensName