Check if mesh is enabled before reg info check

cli/cli_mesh_peers.go

@@ -11,7 +11,6 @@ import (
 	daemonpb "github.com/NordSecurity/nordvpn-linux/daemon/pb"
 	"github.com/NordSecurity/nordvpn-linux/fileshare"
 	"github.com/NordSecurity/nordvpn-linux/internal"
-	"github.com/NordSecurity/nordvpn-linux/meshnet"
 	"github.com/NordSecurity/nordvpn-linux/meshnet/pb"
 	"github.com/NordSecurity/nordvpn-linux/nstrings"
 	"github.com/fatih/color"
@@ -749,31 +748,31 @@ func (c *cmd) retrievePeerFromArgs(
 	}
 
 	// Get peer list to search by the identifier
-	peersResp, err := c.meshClient.GetPeers(
-		context.Background(),
-		&pb.Empty{},
-	)
-	if err != nil {
-		return nil, formatError(err)
-	}
-	peers, err := getPeersResponseToPeerList(peersResp)
-	if err != nil {
-		return nil, formatError(err)
-	}
-
-	peerPubkeyToPeer, peerNameToPeer := meshnet.MakePeerMaps(peers)
-	peer, ok := peerPubkeyToPeer[identifier]
-	if !ok {
-		peer, ok = peerNameToPeer[strings.ToLower(identifier)]
-		if !ok {
-			return nil, fmt.Errorf(
-				MsgMeshnetPeerUnknown,
-				identifier,
-			)
-		}
-	}
-
-	return peer, nil
+	// peersResp, err := c.meshClient.GetPeers(
+	// 	context.Background(),
+	// 	&pb.Empty{},
+	// )
+	// if err != nil {
+	// 	return nil, formatError(err)
+	// }
+	// peers, err := getPeersResponseToPeerList(peersResp)
+	// if err != nil {
+	// 	return nil, formatError(err)
+	// }
+
+	// peerPubkeyToPeer, peerNameToPeer := meshnet.MakePeerMaps(peers)
+	// peer, ok := peerPubkeyToPeer[identifier]
+	// if !ok {
+	// 	peer, ok = peerNameToPeer[strings.ToLower(identifier)]
+	// 	if !ok {
+	// 		return nil, fmt.Errorf(
+	// 			MsgMeshnetPeerUnknown,
+	// 			identifier,
+	// 		)
+	// 	}
+	// }
+
+	return &pb.Peer{}, nil
 }
 
 // MeshPeerAutoComplete queries the peer list from the meshnet service, and
@@ -899,6 +898,8 @@ func allowIncomingResponseToError(
 			resp.AllowIncomingErrorCode,
 			identifier,
 		)
+	case *pb.AllowIncomingResponse_MeshnetErrorCode:
+		return meshnetErrorToError(resp.MeshnetErrorCode)
 	default:
 		return errors.New(AccountInternalError)
 	}
@@ -929,6 +930,8 @@ func denyIncomingResponseToError(
 			resp.DenyIncomingErrorCode,
 			identifier,
 		)
+	case *pb.DenyIncomingResponse_MeshnetErrorCode:
+		return meshnetErrorToError(resp.MeshnetErrorCode)
 	default:
 		return errors.New(AccountInternalError)
 	}