Edit discord_impl.cpp

This commit is contained in:
collecting
2025-10-02 07:10:58 +00:00
parent 26f93ad8ad
commit af86d09b45

View File

@@ -2,121 +2,127 @@
// SPDX-FileCopyrightText: 2025 citron Emulator Project // SPDX-FileCopyrightText: 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <chrono>
#include <string>
#include <QEventLoop>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <discord_rpc.h> #include <discord_rpc.h>
#include <chrono>
#include <string>
#include <thread>
#include <QEventLoop>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <fmt/format.h> #include <fmt/format.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "citron/discord_impl.h" #include "citron/discord_impl.h"
#include "citron/uisettings.h" #include "citron/uisettings.h"
static void OnDiscordReady(const DiscordUser* request) {
fmt::print("\n[DISCORD CALLBACK] SUCCESS: Connected to Discord as {}#{}\n\n", request->username, request->discriminator);
}
static void OnDiscordDisconnected(int errcode, const char* message) {
fmt::print("\n[DISCORD CALLBACK] ERROR: Disconnected from Discord. Code: {}, Message: {}\n\n", errcode, message);
}
static void OnDiscordError(int errcode, const char* message) {
fmt::print("\n[DISCORD CALLBACK] ERROR: An error occurred. Code: {}, Message: {}\n\n", errcode, message);
}
namespace DiscordRPC { namespace DiscordRPC {
DiscordImpl::DiscordImpl(Core::System & system_): system { DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} {
system_ DiscordEventHandlers handlers{};
} { handlers.ready = OnDiscordReady;
DiscordEventHandlers handlers {}; handlers.disconnected = OnDiscordDisconnected;
// The number is the client ID for citron, it's used for images and the handlers.errored = OnDiscordError;
// application name
Discord_Initialize("1361252452329848892", & handlers, 1, nullptr);
}
DiscordImpl::~DiscordImpl() { Discord_Initialize("1361252452329848892", &handlers, 1, nullptr);
Discord_ClearPresence();
Discord_Shutdown();
}
void DiscordImpl::Pause() { discord_thread_running = true;
Discord_ClearPresence(); discord_thread = std::thread(&DiscordImpl::ThreadRun, this);
} }
void DiscordImpl::UpdateGameStatus(bool use_default) { DiscordImpl::~DiscordImpl() {
const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch"; if (discord_thread_running) {
const std::string default_image = "citron_logo"; discord_thread_running = false;
const std::string tinfoil_base_url = "https://tinfoil.media/ti/"; if (discord_thread.joinable()) {
s64 start_time = std::chrono::duration_cast < std::chrono::seconds > ( discord_thread.join();
std::chrono::system_clock::now().time_since_epoch()) }
.count(); }
DiscordRichPresence presence {}; Discord_ClearPresence();
Discord_Shutdown();
}
// Store the URL string to prevent it from being destroyed void DiscordImpl::Pause() {
if (!game_title_id.empty()) { Discord_ClearPresence();
game_url = fmt::format("{}{}/256/256", tinfoil_base_url, game_title_id); }
// Make sure the string stays alive for the duration of the presence
cached_url = game_url;
presence.largeImageKey = cached_url.c_str();
} else {
presence.largeImageKey = cached_url.c_str();
}
presence.largeImageText = game_title.c_str(); void DiscordImpl::UpdateGameStatus(bool use_default) {
presence.smallImageKey = default_image.c_str(); const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch";
presence.smallImageText = default_text.c_str(); const std::string default_image = "citron_logo";
// Remove title ID from display, only show game title s64 start_time = std::chrono::duration_cast<std::chrono::seconds>(
presence.state = game_title.c_str(); std::chrono::system_clock::now().time_since_epoch())
presence.details = "Currently in game"; .count();
presence.startTimestamp = start_time; DiscordRichPresence presence{};
Discord_UpdatePresence( & presence);
}
void DiscordImpl::Update() { if (!use_default && !game_title_id.empty()) {
const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch"; game_url = fmt::format("{}{}/256/256", "https://tinfoil.media/ti/", game_title_id);
const std::string default_image = "citron_logo"; cached_url = game_url;
presence.largeImageKey = cached_url.c_str();
} else {
presence.largeImageKey = default_image.c_str();
}
if (system.IsPoweredOn()) { presence.largeImageText = game_title.c_str();
system.GetAppLoader().ReadTitle(game_title); presence.smallImageKey = default_image.c_str();
system.GetAppLoader().ReadProgramId(program_id); presence.smallImageText = default_text.c_str();
game_title_id = fmt::format("{:016X}", program_id); presence.details = game_title.c_str();
presence.state = "Currently in game";
presence.startTimestamp = start_time;
Discord_UpdatePresence(&presence);
}
fmt::print("Title ID: {}\n", game_title_id); void DiscordImpl::Update() {
const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch";
const std::string default_image = "citron_logo";
QNetworkAccessManager manager; if (system.IsPoweredOn()) {
QNetworkRequest request; system.GetAppLoader().ReadTitle(game_title);
request.setUrl(QUrl(QString::fromStdString( system.GetAppLoader().ReadProgramId(program_id);
fmt::format("https://tinfoil.media/ti/{}/256/256", game_title_id)))); game_title_id = fmt::format("{:016X}", program_id);
request.setTransferTimeout(10000);
QNetworkReply * reply = manager.head(request);
QEventLoop request_event_loop;
QObject::connect(reply, & QNetworkReply::finished, & request_event_loop, & QEventLoop::quit);
request_event_loop.exec();
if (reply -> error()) { QNetworkAccessManager manager;
fmt::print("Failed to fetch game image: {} ({})\n", reply -> errorString().toStdString(), QNetworkRequest request;
program_id); request.setUrl(QUrl(QString::fromStdString(
} fmt::format("https://tinfoil.media/ti/{}/256/256", game_title_id))));
request.setTransferTimeout(5000); // 5 second timeout
QNetworkReply* reply = manager.head(request);
QEventLoop request_event_loop;
QObject::connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit);
request_event_loop.exec();
UpdateGameStatus(reply -> error()); UpdateGameStatus(reply->error() != QNetworkReply::NoError);
reply -> deleteLater(); reply->deleteLater();
return; } else {
} s64 start_time = std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
DiscordRichPresence presence{};
presence.largeImageKey = default_image.c_str();
presence.largeImageText = default_text.c_str();
presence.details = "Currently not in game";
presence.startTimestamp = start_time;
Discord_UpdatePresence(&presence);
}
}
s64 start_time = std::chrono::duration_cast < std::chrono::seconds > ( void DiscordImpl::ThreadRun() {
std::chrono::system_clock::now().time_since_epoch()) while (discord_thread_running) {
.count(); Update(); // This is the line that was likely missing.
Discord_RunCallbacks();
std::this_thread::sleep_for(std::chrono::seconds(15));
}
}
DiscordRichPresence presence {};
presence.largeImageKey = default_image.c_str();
presence.largeImageText = default_text.c_str();
presence.details = "Currently not in game";
presence.startTimestamp = start_time;
Discord_UpdatePresence( & presence);
}
} // namespace DiscordRPC } // namespace DiscordRPC