1 files changed, 6 insertions, 52 deletions

diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 7aba8b61..024d7a34 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -30,7 +30,7 @@ class GetPresenceJob::Private
         QString presence;
         Omittable<int> lastActiveAgo;
         QString statusMsg;
-        bool currentlyActive;
+        Omittable<bool> currentlyActive;
 };
 
 QUrl GetPresenceJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
@@ -65,7 +65,7 @@ const QString& GetPresenceJob::statusMsg() const
     return d->statusMsg;
 }
 
-bool GetPresenceJob::currentlyActive() const
+Omittable<bool> GetPresenceJob::currentlyActive() const
 {
     return d->currentlyActive;
 }
@@ -76,56 +76,10 @@ BaseJob::Status GetPresenceJob::parseJson(const QJsonDocument& data)
     if (!json.contains("presence"_ls))
         return { JsonParseError,
             "The key 'presence' not found in the response" };
-    d->presence = fromJson<QString>(json.value("presence"_ls));
-    d->lastActiveAgo = fromJson<int>(json.value("last_active_ago"_ls));
-    d->statusMsg = fromJson<QString>(json.value("status_msg"_ls));
-    d->currentlyActive = fromJson<bool>(json.value("currently_active"_ls));
-    return Success;
-}
-
-static const auto ModifyPresenceListJobName = QStringLiteral("ModifyPresenceListJob");
-
-ModifyPresenceListJob::ModifyPresenceListJob(const QString& userId, const QStringList& invite, const QStringList& drop)
-    : BaseJob(HttpVerb::Post, ModifyPresenceListJobName,
-        basePath % "/presence/list/" % userId)
-{
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("invite"), invite);
-    addParam<IfNotEmpty>(_data, QStringLiteral("drop"), drop);
-    setRequestData(_data);
-}
-
-class GetPresenceForListJob::Private
-{
-    public:
-        Events data;
-};
-
-QUrl GetPresenceForListJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
-{
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/presence/list/" % userId);
-}
-
-static const auto GetPresenceForListJobName = QStringLiteral("GetPresenceForListJob");
-
-GetPresenceForListJob::GetPresenceForListJob(const QString& userId)
-    : BaseJob(HttpVerb::Get, GetPresenceForListJobName,
-        basePath % "/presence/list/" % userId, false)
-    , d(new Private)
-{
-}
-
-GetPresenceForListJob::~GetPresenceForListJob() = default;
-
-Events&& GetPresenceForListJob::data()
-{
-    return std::move(d->data);
-}
-
-BaseJob::Status GetPresenceForListJob::parseJson(const QJsonDocument& data)
-{
-    d->data = fromJson<Events>(data);
+    fromJson(json.value("presence"_ls), d->presence);
+    fromJson(json.value("last_active_ago"_ls), d->lastActiveAgo);
+    fromJson(json.value("status_msg"_ls), d->statusMsg);
+    fromJson(json.value("currently_active"_ls), d->currentlyActive);
     return Success;
 }