mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
expose discoverability changes to js
This commit is contained in:
parent
6d900d5a40
commit
cd382eeea5
4 changed files with 34 additions and 4 deletions
|
@ -66,8 +66,6 @@ void DiscoverabilityManager::updateLocation() {
|
||||||
accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::PutOperation,
|
accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::PutOperation,
|
||||||
JSONCallbackParameters(), QJsonDocument(rootObject).toJson());
|
JSONCallbackParameters(), QJsonDocument(rootObject).toJson());
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
qDebug() << "not updating discoverability since it is currently set to none!";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +74,7 @@ void DiscoverabilityManager::removeLocation() {
|
||||||
accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::DeleteOperation);
|
accountManager.authenticatedRequest(API_USER_LOCATION_PATH, QNetworkAccessManager::DeleteOperation);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DiscoverabilityManager::setDiscoverability(Discoverability::Mode discoverabilityMode) {
|
void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discoverabilityMode) {
|
||||||
if (_mode.get() != discoverabilityMode) {
|
if (_mode.get() != discoverabilityMode) {
|
||||||
|
|
||||||
// update the setting to the new value
|
// update the setting to the new value
|
||||||
|
|
|
@ -33,7 +33,8 @@ public slots:
|
||||||
void updateLocation();
|
void updateLocation();
|
||||||
void removeLocation();
|
void removeLocation();
|
||||||
|
|
||||||
void setDiscoverability(Discoverability::Mode discoverabilityMode);
|
Discoverability::Mode getDiscoverabilityMode() { return _mode.get(); }
|
||||||
|
void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DiscoverabilityManager();
|
DiscoverabilityManager();
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
#include "AccountManager.h"
|
#include "AccountManager.h"
|
||||||
#include "Application.h"
|
#include "Application.h"
|
||||||
|
#include "DiscoverabilityManager.h"
|
||||||
#include "ResourceCache.h"
|
#include "ResourceCache.h"
|
||||||
|
|
||||||
#include "GlobalServicesScriptingInterface.h"
|
#include "GlobalServicesScriptingInterface.h"
|
||||||
|
@ -44,6 +45,32 @@ void GlobalServicesScriptingInterface::loggedOut() {
|
||||||
emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
|
emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString GlobalServicesScriptingInterface::getFindableBy() const {
|
||||||
|
auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
|
||||||
|
|
||||||
|
if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::None) {
|
||||||
|
return "none";
|
||||||
|
} else if (discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends) {
|
||||||
|
return "friends";
|
||||||
|
} else {
|
||||||
|
return "all";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
|
||||||
|
auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
|
||||||
|
|
||||||
|
if (discoverabilityMode.toLower() == "none") {
|
||||||
|
discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
|
||||||
|
} else if (discoverabilityMode.toLower() == "friends") {
|
||||||
|
discoverabilityManager->setDiscoverabilityMode(Discoverability::Friends);
|
||||||
|
} else if (discoverabilityMode.toLower() == "all") {
|
||||||
|
discoverabilityManager->setDiscoverabilityMode(Discoverability::All);
|
||||||
|
} else {
|
||||||
|
qDebug() << "GlobalServices setFindableBy called with an unrecognized value. Did not change discoverability.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DownloadInfoResult::DownloadInfoResult() :
|
DownloadInfoResult::DownloadInfoResult() :
|
||||||
downloading(QList<float>()),
|
downloading(QList<float>()),
|
||||||
pending(0.0f)
|
pending(0.0f)
|
||||||
|
|
|
@ -35,6 +35,7 @@ class GlobalServicesScriptingInterface : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY(QString username READ getUsername)
|
Q_PROPERTY(QString username READ getUsername)
|
||||||
|
Q_PROPERTY(QString findableBy READ getFindableBy WRITE setFindableBy)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static GlobalServicesScriptingInterface* getInstance();
|
static GlobalServicesScriptingInterface* getInstance();
|
||||||
|
@ -48,6 +49,9 @@ public slots:
|
||||||
private slots:
|
private slots:
|
||||||
void loggedOut();
|
void loggedOut();
|
||||||
void checkDownloadInfo();
|
void checkDownloadInfo();
|
||||||
|
|
||||||
|
QString getFindableBy() const;
|
||||||
|
void setFindableBy(const QString& discoverabilityMode);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void connected();
|
void connected();
|
||||||
|
|
Loading…
Reference in a new issue