From 099f2442d128a5a6792d666ea7b8a93b5fd08a97 Mon Sep 17 00:00:00 2001
From: Melvin Keskin <melvo@olomono.de>
Date: Wed, 27 Mar 2024 19:50:42 +0100
Subject: [PATCH] Add common chain function to return result or error

---
 src/base/QXmppFutureUtils_p.h  |  8 +++++
 src/client/QXmppMixManager.cpp | 53 ++++++++--------------------------
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/src/base/QXmppFutureUtils_p.h b/src/base/QXmppFutureUtils_p.h
index 61a5c4483..ac4f8a042 100644
--- a/src/base/QXmppFutureUtils_p.h
+++ b/src/base/QXmppFutureUtils_p.h
@@ -211,6 +211,14 @@ auto chainSuccess(QXmppTask<Input> &&source, QObject *context) -> QXmppTask<std:
     });
 }
 
+template<typename Result, typename Input, typename Converter>
+auto chainOnSuccess(QXmppTask<Input> &&source, QObject *context, Converter convert) -> QXmppTask<Result>
+{
+    return chain<Result>(std::move(source), context, [convert](Input &&input) {
+        return mapSuccess(std::move(input), convert);
+    });
+}
+
 }  // namespace QXmpp::Private
 
 #endif  // QXMPPFUTUREUTILS_P_H
diff --git a/src/client/QXmppMixManager.cpp b/src/client/QXmppMixManager.cpp
index 7863a6222..a3098fbf9 100644
--- a/src/client/QXmppMixManager.cpp
+++ b/src/client/QXmppMixManager.cpp
@@ -431,12 +431,7 @@ QXmppTask<QXmppMixManager::CreationResult> QXmppMixManager::createChannel(const
 ///
 QXmppTask<QXmppMixManager::ChannelJidResult> QXmppMixManager::requestChannelJids(const QString &serviceJid)
 {
-    return chain<ChannelJidResult>(d->discoveryManager->requestDiscoItems(serviceJid), this, [](QXmppDiscoveryManager::ItemsResult &&result) -> ChannelJidResult {
-        if (auto *error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        const auto &items = std::get<QList<QXmppDiscoveryIq::Item>>(result);
+    return chainOnSuccess<ChannelJidResult>(d->discoveryManager->requestDiscoItems(serviceJid), this, [](QList<QXmppDiscoveryIq::Item> &&items) {
         return transform<QVector<ChannelJid>>(items, [](const QXmppDiscoveryIq::Item &item) {
             return item.jid();
         });
@@ -452,17 +447,10 @@ QXmppTask<QXmppMixManager::ChannelJidResult> QXmppMixManager::requestChannelJids
 ///
 QXmppTask<QXmppMixManager::ChannelNodeResult> QXmppMixManager::requestChannelNodes(const QString &channelJid)
 {
-    return chain<ChannelNodeResult>(d->discoveryManager->requestDiscoItems(channelJid, MIX_SERVICE_DISCOVERY_NODE.toString()), this, [](QXmppDiscoveryManager::ItemsResult &&result) -> ChannelNodeResult {
-        if (auto *error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        const auto &items = std::get<QList<QXmppDiscoveryIq::Item>>(result);
-        const auto nodes = transform<QVector<QString>>(items, [](const QXmppDiscoveryIq::Item &item) {
+    return chainOnSuccess<ChannelNodeResult>(d->discoveryManager->requestDiscoItems(channelJid, MIX_SERVICE_DISCOVERY_NODE.toString()), this, [](QList<QXmppDiscoveryIq::Item> &&items) {
+        return listToMixNodes(transform<QVector<QString>>(items, [](const QXmppDiscoveryIq::Item &item) {
             return item.node();
-        });
-
-        return listToMixNodes(nodes);
+        }));
     });
 }
 
@@ -475,12 +463,8 @@ QXmppTask<QXmppMixManager::ChannelNodeResult> QXmppMixManager::requestChannelNod
 ///
 QXmppTask<QXmppMixManager::ConfigurationResult> QXmppMixManager::requestChannelConfiguration(const QString &channelJid)
 {
-    return chain<ConfigurationResult>(d->pubSubManager->requestItems<QXmppMixConfigItem>(channelJid, ns_mix_node_config.toString()), this, [](QXmppPubSubManager::ItemsResult<QXmppMixConfigItem> &&result) -> ConfigurationResult {
-        if (auto *error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        return std::get<QXmppPubSubManager::Items<QXmppMixConfigItem>>(result).items.takeFirst();
+    return chainOnSuccess<ConfigurationResult>(d->pubSubManager->requestItems<QXmppMixConfigItem>(channelJid, ns_mix_node_config.toString()), this, [](QXmppPubSubManager::Items<QXmppMixConfigItem> &&items) {
+        return items.items.takeFirst();
     });
 }
 
@@ -520,12 +504,8 @@ QXmppTask<QXmppClient::EmptyResult> QXmppMixManager::updateChannelConfiguration(
 ///
 QXmppTask<QXmppMixManager::InformationResult> QXmppMixManager::requestChannelInformation(const QString &channelJid)
 {
-    return chain<InformationResult>(d->pubSubManager->requestItems<QXmppMixInfoItem>(channelJid, ns_mix_node_info.toString()), this, [](QXmppPubSubManager::ItemsResult<QXmppMixInfoItem> &&result) -> InformationResult {
-        if (auto *error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        return std::get<QXmppPubSubManager::Items<QXmppMixInfoItem>>(result).items.takeFirst();
+    return chainOnSuccess<InformationResult>(d->pubSubManager->requestItems<QXmppMixInfoItem>(channelJid, ns_mix_node_info.toString()), this, [](QXmppPubSubManager::Items<QXmppMixInfoItem> &&items) {
+        return items.items.takeFirst();
     });
 }
 
@@ -885,12 +865,8 @@ QXmppTask<QXmppClient::EmptyResult> QXmppMixManager::unbanAllJids(const QString
 ///
 QXmppTask<QXmppMixManager::ParticipantResult> QXmppMixManager::requestParticipants(const QString &channelJid)
 {
-    return chain<ParticipantResult>(d->pubSubManager->requestItems<QXmppMixParticipantItem>(channelJid, ns_mix_node_participants.toString()), this, [](QXmppPubSubManager::ItemsResult<QXmppMixParticipantItem> &&result) -> ParticipantResult {
-        if (auto *error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        return std::get<QXmppPubSubManager::Items<QXmppMixParticipantItem>>(std::move(result)).items;
+    return chainOnSuccess<ParticipantResult>(d->pubSubManager->requestItems<QXmppMixParticipantItem>(channelJid, ns_mix_node_participants.toString()), this, [](QXmppPubSubManager::Items<QXmppMixParticipantItem> &&items) {
+        return items.items;
     });
 }
 
@@ -1187,13 +1163,8 @@ QXmppTask<QXmppMixManager::JoiningResult> QXmppMixManager::joinChannel(QXmppMixI
 ///
 QXmppTask<QXmppMixManager::JidResult> QXmppMixManager::requestJids(const QString &channelJid, const QString &node)
 {
-    return chain<JidResult>(d->pubSubManager->requestItems(channelJid, node), this, [](QXmppPubSubManager::ItemsResult<QXmppPubSubBaseItem> &&result) -> JidResult {
-        if (auto error = std::get_if<QXmppError>(&result)) {
-            return std::move(*error);
-        }
-
-        const auto &items = std::get<QXmppPubSubManager::Items<QXmppPubSubBaseItem>>(result).items;
-        return transform<QVector<Jid>>(items, [](const QXmppPubSubBaseItem &item) {
+    return chainOnSuccess<JidResult>(d->pubSubManager->requestItems(channelJid, node), this, [](QXmppPubSubManager::Items<QXmppPubSubBaseItem> &&items) {
+        return transform<QVector<Jid>>(items.items, [](const QXmppPubSubBaseItem &item) {
             return item.id();
         });
     });