From 08a936f7e1f321bc4e2ba52b035df032f3e5e6e0 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Tue, 26 Mar 2024 09:13:15 -0700
Subject: [PATCH] Filter by client role too

---
 .../MeshtasticDataModelV 31.xcdatamodel/contents                | 2 ++
 Meshtastic/Views/Nodes/NodeList.swift                           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 31.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 31.xcdatamodel/contents
index 72ba98d4..9852b36b 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 31.xcdatamodel/contents	
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 31.xcdatamodel/contents	
@@ -189,6 +189,7 @@
         <attribute name="enabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="encryptionEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="jsonEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="mapReportingEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="password" optional="YES" attributeType="String" maxValueString="30"/>
         <attribute name="proxyToClientEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="root" optional="YES" attributeType="String" defaultValueString="msh"/>
@@ -230,6 +231,7 @@
     <entity name="NodeInfoEntity" representedClassName="NodeInfoEntity" syncable="YES" codeGenerationType="class">
         <attribute name="bleName" optional="YES" attributeType="String"/>
         <attribute name="channel" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="favorite" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="hopsAway" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="lastHeard" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index 4efad7a4..a06aa681 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -280,7 +280,7 @@ struct NodeList: View {
 			}
 		}
 		/// Role
-		if deviceRole > 0 {
+		if deviceRole > -1 {
 			let rolePredicate = NSPredicate(format: "user.role == %i", Int32(deviceRole))
 			predicates.append(rolePredicate)
 		}