Check if the server has user status app enabled

According to
https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-status-api.html#user-status-retrieve-statuses
we should check the user status capability, not the the end points.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 36016ead7e13e170a0328ed5fdeef88bc84b9971..c821a8b1ad110764f2314b6b7118590b0620329e 100644 (file)
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -658,7 +658,7 @@ QString User::statusEmoji() const
 
 bool User::serverHasUserStatus() const
 {
-    return _account->account()->capabilities().userStatusNotification();
+    return _account->account()->capabilities().userStatus();
 }
 
 QImage User::avatar() const

diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index d8fa1096a98d159bef50d1c0388bc7a3ab9ebb3e..cfffa403afef3865ffc5e6429b84920b41272898 100644 (file)
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -216,13 +216,6 @@ bool Capabilities::chunkingNg() const
     return _capabilities["dav"].toMap()["chunking"].toByteArray() >= "1.0";
 }
 
-bool Capabilities::userStatusNotification() const
-{
-    return _capabilities.contains("notifications") &&
-        _capabilities["notifications"].toMap().contains("ocs-endpoints") &&
-        _capabilities["notifications"].toMap()["ocs-endpoints"].toStringList().contains("user-status");
-}
-
 bool Capabilities::userStatus() const
 {
     if (!_capabilities.contains("user_status")) {

diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
index fb251e7e3a725c15427130d44ce82c2309274c0e..f91208d90bd8dd00c5dc736f67c7d8e3c264a09f 100644 (file)
--- a/src/libsync/capabilities.h
+++ b/src/libsync/capabilities.h
@@ -63,7 +63,6 @@ public:
     bool shareResharing() const;
     int shareDefaultPermissions() const;
     bool chunkingNg() const;
-    bool userStatusNotification() const;
     bool userStatus() const;
     bool userStatusSupportsEmoji() const;