Merge pull request #3968 from nextcloud/bugfix/user-status-disabled

Check if the server has user status app enabled
This commit is contained in:
Matthieu Gallien 2021-11-16 09:53:37 +01:00 committed by GitHub
commit 703037cbfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 9 deletions

View file

@ -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

View file

@ -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")) {

View file

@ -63,7 +63,6 @@ public:
bool shareResharing() const;
int shareDefaultPermissions() const;
bool chunkingNg() const;
bool userStatusNotification() const;
bool userStatus() const;
bool userStatusSupportsEmoji() const;