6 files changed, 104 insertions, 81 deletions
diff --git a/lib/application-service/definitions/location.cpp b/lib/application-service/definitions/location.cpp
index 973bcd22..958a55bf 100644
--- a/lib/application-service/definitions/location.cpp
+++ b/lib/application-service/definitions/location.cpp
@@ -8,24 +8,23 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const ThirdPartyLocation& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("alias"), pod.alias);
-    addParam<IfNotEmpty>(_json, QStringLiteral("protocol"), pod.protocol);
-    addParam<IfNotEmpty>(_json, QStringLiteral("fields"), pod.fields);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("alias"), pod.alias);
+    addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
+    addParam<>(jo, QStringLiteral("fields"), pod.fields);
+    return jo;
 }
 
-ThirdPartyLocation FromJson<ThirdPartyLocation>::operator()(const QJsonValue& jv)
+ThirdPartyLocation FromJsonObject<ThirdPartyLocation>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     ThirdPartyLocation result;
     result.alias =
-        fromJson<QString>(_json.value("alias"_ls));
+        fromJson<QString>(jo.value("alias"_ls));
     result.protocol =
-        fromJson<QString>(_json.value("protocol"_ls));
+        fromJson<QString>(jo.value("protocol"_ls));
     result.fields =
-        fromJson<QJsonObject>(_json.value("fields"_ls));
-    
+        fromJson<QJsonObject>(jo.value("fields"_ls));
+
     return result;
 }
 
diff --git a/lib/application-service/definitions/location.h b/lib/application-service/definitions/location.h
index 47d621e0..89b48a43 100644
--- a/lib/application-service/definitions/location.h
+++ b/lib/application-service/definitions/location.h
@@ -24,9 +24,9 @@ namespace QMatrixClient
 
     QJsonObject toJson(const ThirdPartyLocation& pod);
 
-    template <> struct FromJson<ThirdPartyLocation>
+    template <> struct FromJsonObject<ThirdPartyLocation>
     {
-        ThirdPartyLocation operator()(const QJsonValue& jv);
+        ThirdPartyLocation operator()(const QJsonObject& jo) const;
     };
 
 } // namespace QMatrixClient
diff --git a/lib/application-service/definitions/protocol.cpp b/lib/application-service/definitions/protocol.cpp
index 5e70ff16..04bb7dfc 100644
--- a/lib/application-service/definitions/protocol.cpp
+++ b/lib/application-service/definitions/protocol.cpp
@@ -8,67 +8,73 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const FieldType& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("regexp"), pod.regexp);
-    addParam<IfNotEmpty>(_json, QStringLiteral("placeholder"), pod.placeholder);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("regexp"), pod.regexp);
+    addParam<>(jo, QStringLiteral("placeholder"), pod.placeholder);
+    return jo;
 }
 
-FieldType FromJson<FieldType>::operator()(const QJsonValue& jv)
+FieldType FromJsonObject<FieldType>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     FieldType result;
     result.regexp =
-        fromJson<QString>(_json.value("regexp"_ls));
+        fromJson<QString>(jo.value("regexp"_ls));
     result.placeholder =
-        fromJson<QString>(_json.value("placeholder"_ls));
-    
+        fromJson<QString>(jo.value("placeholder"_ls));
+
     return result;
 }
 
-QJsonObject QMatrixClient::toJson(const FieldTypes& pod)
+QJsonObject QMatrixClient::toJson(const ProtocolInstance& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("fieldname"), pod.fieldname);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("desc"), pod.desc);
+    addParam<IfNotEmpty>(jo, QStringLiteral("icon"), pod.icon);
+    addParam<>(jo, QStringLiteral("fields"), pod.fields);
+    addParam<>(jo, QStringLiteral("network_id"), pod.networkId);
+    return jo;
 }
 
-FieldTypes FromJson<FieldTypes>::operator()(const QJsonValue& jv)
+ProtocolInstance FromJsonObject<ProtocolInstance>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
-    FieldTypes result;
-    result.fieldname =
-        fromJson<FieldType>(_json.value("fieldname"_ls));
-    
+    ProtocolInstance result;
+    result.desc =
+        fromJson<QString>(jo.value("desc"_ls));
+    result.icon =
+        fromJson<QString>(jo.value("icon"_ls));
+    result.fields =
+        fromJson<QJsonObject>(jo.value("fields"_ls));
+    result.networkId =
+        fromJson<QString>(jo.value("network_id"_ls));
+
     return result;
 }
 
 QJsonObject QMatrixClient::toJson(const ThirdPartyProtocol& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("user_fields"), pod.userFields);
-    addParam<IfNotEmpty>(_json, QStringLiteral("location_fields"), pod.locationFields);
-    addParam<IfNotEmpty>(_json, QStringLiteral("icon"), pod.icon);
-    addParam<IfNotEmpty>(_json, QStringLiteral("field_types"), pod.fieldTypes);
-    addParam<IfNotEmpty>(_json, QStringLiteral("instances"), pod.instances);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("user_fields"), pod.userFields);
+    addParam<>(jo, QStringLiteral("location_fields"), pod.locationFields);
+    addParam<>(jo, QStringLiteral("icon"), pod.icon);
+    addParam<>(jo, QStringLiteral("field_types"), pod.fieldTypes);
+    addParam<>(jo, QStringLiteral("instances"), pod.instances);
+    return jo;
 }
 
-ThirdPartyProtocol FromJson<ThirdPartyProtocol>::operator()(const QJsonValue& jv)
+ThirdPartyProtocol FromJsonObject<ThirdPartyProtocol>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     ThirdPartyProtocol result;
     result.userFields =
-        fromJson<QStringList>(_json.value("user_fields"_ls));
+        fromJson<QStringList>(jo.value("user_fields"_ls));
     result.locationFields =
-        fromJson<QStringList>(_json.value("location_fields"_ls));
+        fromJson<QStringList>(jo.value("location_fields"_ls));
     result.icon =
-        fromJson<QString>(_json.value("icon"_ls));
+        fromJson<QString>(jo.value("icon"_ls));
     result.fieldTypes =
-        fromJson<FieldTypes>(_json.value("field_types"_ls));
+        fromJson<QHash<QString, FieldType>>(jo.value("field_types"_ls));
     result.instances =
-        fromJson<QVector<QJsonObject>>(_json.value("instances"_ls));
-    
+        fromJson<QVector<ProtocolInstance>>(jo.value("instances"_ls));
+
     return result;
 }
 
diff --git a/lib/application-service/definitions/protocol.h b/lib/application-service/definitions/protocol.h
index a25688e7..2aca7d66 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/lib/application-service/definitions/protocol.h
@@ -6,9 +6,10 @@
 
 #include "converters.h"
 
+#include <QtCore/QHash>
 #include <QtCore/QJsonObject>
-#include <QtCore/QVector>
 #include "converters.h"
+#include <QtCore/QVector>
 
 namespace QMatrixClient
 {
@@ -17,7 +18,9 @@ namespace QMatrixClient
     /// Definition of valid values for a field.
     struct FieldType
     {
-        /// A regular expression for validation of a field's value.
+        /// A regular expression for validation of a field's value. This may be relatively
+        /// coarse to verify the value as the application service providing this protocol
+        /// may apply additional validation or filtering.
         QString regexp;
         /// An placeholder serving as a valid example of the field value.
         QString placeholder;
@@ -25,46 +28,62 @@ namespace QMatrixClient
 
     QJsonObject toJson(const FieldType& pod);
 
-    template <> struct FromJson<FieldType>
+    template <> struct FromJsonObject<FieldType>
     {
-        FieldType operator()(const QJsonValue& jv);
+        FieldType operator()(const QJsonObject& jo) const;
     };
 
-    /// All location or user fields should have an entry here.
-    struct FieldTypes
+    struct ProtocolInstance
     {
-        /// Definition of valid values for a field.
-        Omittable<FieldType> fieldname;
+        /// A human-readable description for the protocol, such as the name.
+        QString desc;
+        /// An optional content URI representing the protocol. Overrides the one provided
+        /// at the higher level Protocol object.
+        QString icon;
+        /// Preset values for ``fields`` the client may use to search by.
+        QJsonObject fields;
+        /// A unique identifier across all instances.
+        QString networkId;
     };
 
-    QJsonObject toJson(const FieldTypes& pod);
+    QJsonObject toJson(const ProtocolInstance& pod);
 
-    template <> struct FromJson<FieldTypes>
+    template <> struct FromJsonObject<ProtocolInstance>
     {
-        FieldTypes operator()(const QJsonValue& jv);
+        ProtocolInstance operator()(const QJsonObject& jo) const;
     };
 
     struct ThirdPartyProtocol
     {
-        /// Fields used to identify a third party user.
+        /// Fields which may be used to identify a third party user. These should be
+        /// ordered to suggest the way that entities may be grouped, where higher
+        /// groupings are ordered first. For example, the name of a network should be
+        /// searched before the nickname of a user.
         QStringList userFields;
-        /// Fields used to identify a third party location.
+        /// Fields which may be used to identify a third party location. These should be
+        /// ordered to suggest the way that entities may be grouped, where higher
+        /// groupings are ordered first. For example, the name of a network should be
+        /// searched before the name of a channel.
         QStringList locationFields;
-        /// An icon representing the third party protocol.
+        /// A content URI representing an icon for the third party protocol.
         QString icon;
-        /// All location or user fields should have an entry here.
-        Omittable<FieldTypes> fieldTypes;
+        /// The type definitions for the fields defined in the ``user_fields`` and 
+        /// ``location_fields``. Each entry in those arrays MUST have an entry here. The
+        /// ``string`` key for this object is field name itself.
+        /// 
+        /// May be an empty object if no fields are defined.
+        QHash<QString, FieldType> fieldTypes;
         /// A list of objects representing independent instances of configuration.
-        /// For instance multiple networks on IRC if multiple are bridged by the
-        /// same bridge.
-        QVector<QJsonObject> instances;
+        /// For example, multiple networks on IRC if multiple are provided by the
+        /// same application service.
+        QVector<ProtocolInstance> instances;
     };
 
     QJsonObject toJson(const ThirdPartyProtocol& pod);
 
-    template <> struct FromJson<ThirdPartyProtocol>
+    template <> struct FromJsonObject<ThirdPartyProtocol>
     {
-        ThirdPartyProtocol operator()(const QJsonValue& jv);
+        ThirdPartyProtocol operator()(const QJsonObject& jo) const;
     };
 
 } // namespace QMatrixClient
diff --git a/lib/application-service/definitions/user.cpp b/lib/application-service/definitions/user.cpp
index 17687cfd..ca334236 100644
--- a/lib/application-service/definitions/user.cpp
+++ b/lib/application-service/definitions/user.cpp
@@ -8,24 +8,23 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const ThirdPartyUser& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("userid"), pod.userid);
-    addParam<IfNotEmpty>(_json, QStringLiteral("protocol"), pod.protocol);
-    addParam<IfNotEmpty>(_json, QStringLiteral("fields"), pod.fields);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("userid"), pod.userid);
+    addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
+    addParam<>(jo, QStringLiteral("fields"), pod.fields);
+    return jo;
 }
 
-ThirdPartyUser FromJson<ThirdPartyUser>::operator()(const QJsonValue& jv)
+ThirdPartyUser FromJsonObject<ThirdPartyUser>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     ThirdPartyUser result;
     result.userid =
-        fromJson<QString>(_json.value("userid"_ls));
+        fromJson<QString>(jo.value("userid"_ls));
     result.protocol =
-        fromJson<QString>(_json.value("protocol"_ls));
+        fromJson<QString>(jo.value("protocol"_ls));
     result.fields =
-        fromJson<QJsonObject>(_json.value("fields"_ls));
-    
+        fromJson<QJsonObject>(jo.value("fields"_ls));
+
     return result;
 }
 
diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index 9c64a7ba..79ca7789 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -24,9 +24,9 @@ namespace QMatrixClient
 
     QJsonObject toJson(const ThirdPartyUser& pod);
 
-    template <> struct FromJson<ThirdPartyUser>
+    template <> struct FromJsonObject<ThirdPartyUser>
     {
-        ThirdPartyUser operator()(const QJsonValue& jv);
+        ThirdPartyUser operator()(const QJsonObject& jo) const;
     };
 
 } // namespace QMatrixClient