diff --git a/protocol/communities/manager.go b/protocol/communities/manager.go index dcc637740..e3b56e102 100644 --- a/protocol/communities/manager.go +++ b/protocol/communities/manager.go @@ -1227,14 +1227,6 @@ func (m *Manager) AcceptRequestToJoin(request *requests.AcceptRequestToJoinCommu } if !hasPermission { - pk, err := common.HexToPubkey(dbRequest.PublicKey) - if err != nil { - return nil, err - } - err = m.markRequestToJoinAsCanceled(pk, community) - if err != nil { - return nil, err - } return community, ErrNoPermissionToJoin } diff --git a/protocol/messenger_communities.go b/protocol/messenger_communities.go index dd3f9e281..a44a02ae3 100644 --- a/protocol/messenger_communities.go +++ b/protocol/messenger_communities.go @@ -732,22 +732,10 @@ func (m *Messenger) AcceptRequestToJoinCommunity(request *requests.AcceptRequest } community, err := m.communitiesManager.AcceptRequestToJoin(request) - if err != nil && err != communities.ErrNoPermissionToJoin { + if err != nil { return nil, err } - if err == communities.ErrNoPermissionToJoin { - cancel := &requests.DeclineRequestToJoinCommunity{ - ID: requestToJoin.ID, - } - response, err := m.DeclineRequestToJoinCommunity(cancel) - if err != nil { - return nil, err - } - response.AddCommunity(community) - return response, nil - } - pk, err := common.HexToPubkey(requestToJoin.PublicKey) if err != nil { return nil, err