XEP-0398 support: avatar to vcard conversion

Author: Ri0n

src/xmpp/xmpp-im/client.cpp

@@ -286,7 +286,7 @@ void Client::setCapsOptimizationAllowed(bool allowed) { d->capsOptimization = al
 
 bool Client::capsOptimizationAllowed() const
 {
-    if (d->capsOptimization && d->active && d->serverInfoManager->features().hasCapsOptimize()) {
+    if (d->capsOptimization && d->active && d->serverInfoManager->server_features().hasCapsOptimize()) {
         auto it = d->resourceList.find(d->resource);
         return it != d->resourceList.end() && it->status().isAvailable();
     }

src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp

@@ -250,7 +250,7 @@ ExternalServiceDiscovery::ExternalServiceDiscovery(Client *client) : client_(cli
 
 bool ExternalServiceDiscovery::isSupported() const
 {
-    return client_->serverInfoManager()->features().test("urn:xmpp:extdisco:2");
+    return client_->serverInfoManager()->server_features().test("urn:xmpp:extdisco:2");
 }
 
 void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callback, std::chrono::minutes minTtl,

src/xmpp/xmpp-im/xmpp_features.cpp

@@ -214,6 +214,12 @@ bool Features::hasCapsOptimize() const { return test(QStringList() << QLatin1Str
 #define NS_DIRECT_MUC_INVITE "jabber:x:conference"
 bool Features::hasDirectMucInvite() const { return test(QStringList() << QLatin1String(NS_DIRECT_MUC_INVITE)); }
 
+#define FID_AVATAR_TO_VCARD_CONVERSION "urn:xmpp:pep-vcard-conversion:0"
+bool Features::hasAvatarConversion() const
+{
+    return test(QStringList() << QLatin1String(FID_AVATAR_TO_VCARD_CONVERSION));
+}
+
 // custom Psi actions
 #define FID_ADD "psi:add"
 

src/xmpp/xmpp-im/xmpp_features.h

@@ -59,6 +59,7 @@ class Features {
     bool        hasCaps() const;
     bool        hasCapsOptimize() const;
     bool        hasDirectMucInvite() const;
+    bool        hasAvatarConversion() const;
 
     [[deprecated]] inline bool canRegister() const { return hasRegister(); }
     [[deprecated]] inline bool canSearch() const { return hasSearch(); }

src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp

@@ -266,12 +266,12 @@ void ServerInfoManager::server_disco_finished()
 {
     JT_DiscoInfo *jt = static_cast<JT_DiscoInfo *>(sender());
     if (jt->success()) {
-        _features = jt->item().features();
+        _server_features = jt->item().features();
 
-        if (_features.hasMulticast())
+        if (_server_features.hasMulticast())
             _multicastService = _client->jid().domain();
 
-        _canMessageCarbons = _features.hasMessageCarbons();
+        _canMessageCarbons = _server_features.hasMessageCarbons();
 
         auto servInfo
             = jt->item().findExtension(XData::Data_Result, QLatin1String("http://jabber.org/network/serverinfo"));
@@ -297,6 +297,7 @@ void ServerInfoManager::account_disco_finished()
             if (i.category == "pubsub" && i.type == "pep")
                 _hasPEP = true;
         }
+        _account_features = jt->item().features();
 
         emit featuresChanged();
     }

src/xmpp/xmpp-im/xmpp_serverinfomanager.h

@@ -80,7 +80,8 @@ class ServerInfoManager : public QObject {
 
     const QString                           &multicastService() const;
     bool                                     hasPEP() const;
-    inline const Features                   &features() const { return _features; }
+    inline const Features                   &server_features() const { return _server_features; }
+    inline const Features                   &account_features() const { return _account_features; }
     bool                                     canMessageCarbons() const;
     inline const QMap<QString, QStringList> &extraServerInfo() const { return _extraServerInfo; }
 
@@ -126,7 +127,8 @@ private slots:
 private:
     XMPP::Client              *_client = nullptr;
     CapsSpec                   _caps;
-    Features                   _features;
+    Features                   _server_features;
+    Features                   _account_features;
     QString                    _multicastService;
     QMap<QString, QStringList> _extraServerInfo; // XEP-0128, XEP-0157