From 5d81866957ba6012f3f09501cdc5b6d1dbd746a9 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Tue, 7 Feb 2023 18:22:49 +0000 Subject: [PATCH] Add request to response when canceling request --- VERSION | 2 +- images/qr-assets.go | 4 ++-- protocol/communities/manager.go | 1 + protocol/communities_messenger_test.go | 2 ++ protocol/messenger_communities.go | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d3c4350bd..8e247eadc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.138.0 +0.138.1 diff --git a/images/qr-assets.go b/images/qr-assets.go index a9822ca08..911067640 100644 --- a/images/qr-assets.go +++ b/images/qr-assets.go @@ -276,8 +276,8 @@ var _bintree = &bintree{nil, map[string]*bintree{ "tests": {nil, map[string]*bintree{ "qr": {nil, map[string]*bintree{ "QRWithLogo.png": {_assetsTestsQrQrwithlogoPng, map[string]*bintree{}}, - "defaultQR.png": {_assetsTestsQrDefaultqrPng, map[string]*bintree{}}, - "status.png": {_assetsTestsQrStatusPng, map[string]*bintree{}}, + "defaultQR.png": {_assetsTestsQrDefaultqrPng, map[string]*bintree{}}, + "status.png": {_assetsTestsQrStatusPng, map[string]*bintree{}}, }}, }}, }}, diff --git a/protocol/communities/manager.go b/protocol/communities/manager.go index 91fc75b45..2101fc43d 100644 --- a/protocol/communities/manager.go +++ b/protocol/communities/manager.go @@ -1042,6 +1042,7 @@ func (m *Manager) CancelRequestToJoin(request *requests.CancelRequestToJoinCommu return nil, nil, err } + dbRequest.State = RequestToJoinStateCanceled if err := m.markRequestToJoinAsCanceled(pk, community); err != nil { return nil, nil, err } diff --git a/protocol/communities_messenger_test.go b/protocol/communities_messenger_test.go index f4688b75f..f9170c7e5 100644 --- a/protocol/communities_messenger_test.go +++ b/protocol/communities_messenger_test.go @@ -1183,6 +1183,8 @@ func (s *MessengerCommunitiesSuite) TestCancelRequestAccess() { response, err = s.alice.CancelRequestToJoinCommunity(requestToCancel) s.Require().NoError(err) s.Require().NotNil(response) + s.Require().Len(response.RequestsToJoinCommunity, 1) + s.Require().Equal(communities.RequestToJoinStateCanceled, response.RequestsToJoinCommunity[0].State) // pull to make sure it has been saved cancelRequestsToJoin, err := s.alice.MyCanceledRequestsToJoin() diff --git a/protocol/messenger_communities.go b/protocol/messenger_communities.go index 5741ea5de..710ece22e 100644 --- a/protocol/messenger_communities.go +++ b/protocol/messenger_communities.go @@ -685,6 +685,8 @@ func (m *Messenger) CancelRequestToJoinCommunity(request *requests.CancelRequest response := &MessengerResponse{} response.AddCommunity(community) + response.RequestsToJoinCommunity = append(response.RequestsToJoinCommunity, requestToJoin) + return response, nil }