carddav: honor address-data in addressbook-query

carddav/carddav.go

@@ -17,8 +17,7 @@ type AddressBook struct {
 }
 
 type AddressBookQuery struct {
-	Props   []string
-	AllProp bool
+	DataRequest AddressDataRequest
 
 	PropFilters []PropFilter
 	FilterTest  FilterTest // defaults to FilterAnyOf
@@ -26,6 +25,11 @@ type AddressBookQuery struct {
 	Limit int // <= 0 means unlimited
 }
 
+type AddressDataRequest struct {
+	Props   []string
+	AllProp bool
+}
+
 type PropFilter struct {
 	Name string
 	Test FilterTest // defaults to FilterAnyOf
@@ -68,9 +72,7 @@ const (
 
 type AddressBookMultiGet struct {
 	Paths []string
-
-	Props   []string
-	AllProp bool
+	DataRequest AddressDataRequest
 }
 
 type AddressObject struct {