Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4138 from FearlessTobi/change-web-links

Browse source 
web_service: Unify links for web service endpoints
This commit is contained in:
Weiyi Wang 2018-09-12 16:31:59 -04:00 • committed by GitHub
commit 0a4d338ffa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/announce_multiplayer_session.cpp
View file

@ -21,9 +21,9 @@ static constexpr std::chrono::seconds announce_time_interval(15);
AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
#ifdef ENABLE_WEB_SERVICE
backend = std::make_unique<WebService::RoomJson>(
Settings::values.announce_multiplayer_room_endpoint_url, Settings::values.citra_username,
Settings::values.citra_token);
backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url + "/lobby",
Settings::values.citra_username,
Settings::values.citra_token);
#else
backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
#endif

4
src/core/settings.h
View file

@ -165,9 +165,7 @@ struct Values {
// WebService
bool enable_telemetry;
std::string telemetry_endpoint_url;
std::string verify_endpoint_url;
std::string announce_multiplayer_room_endpoint_url;
std::string web_api_url;
std::string citra_username;
std::string citra_token;
} extern values;

5
src/core/telemetry_session.cpp
View file

@ -82,7 +82,8 @@ u64 RegenerateTelemetryId() {
std::future<bool> VerifyLogin(std::string username, std::string token, std::function<void()> func) {
#ifdef ENABLE_WEB_SERVICE
return WebService::VerifyLogin(username, token, Settings::values.verify_endpoint_url, func);
return WebService::VerifyLogin(username, token, Settings::values.web_api_url + "/profile",
func);
#else
return std::async(std::launch::async, [func{std::move(func)}]() {
func();
@ -95,7 +96,7 @@ TelemetrySession::TelemetrySession() {
#ifdef ENABLE_WEB_SERVICE
if (Settings::values.enable_telemetry) {
backend = std::make_unique<WebService::TelemetryJson>(
Settings::values.telemetry_endpoint_url, Settings::values.citra_username,
Settings::values.web_api_url + "/telemetry", Settings::values.citra_username,
Settings::values.citra_token);
} else {
backend = std::make_unique<Telemetry::NullVisitor>();