Mirrors/Citron
1
0
Fork 0
mirror of https://git.citron-emu.org/Citron/Citron.git synced 2025-01-22 08:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

discord: Improve game image handling and UI presentation

Browse source 
Updates the Discord Rich Presence implementation to use Tinfoil's media
server for game images and improves the overall presentation.

Technical changes:
- Switch to Tinfoil media server for game images
- Add proper title ID handling and display
- Improve error handling for image requests
- Increase network timeout to 10 seconds
- Cache URL to prevent string destruction
- Update Discord client ID
- Clean up code formatting and organization

UI/UX improvements:
- Remove title ID from game state display
- Update default text to be more descriptive
- Improve error logging for failed image fetches
- Maintain image persistence between updates

This change provides better game image support and a cleaner Discord
presence display while improving reliability of the integration.
This commit is contained in:
Zephyron 2025-01-06 14:06:41 +10:00
parent 08f1ed4011
commit 3100d13fc0
No known key found for this signature in database
GPG key ID: 8DA271B6A74353F1
2 changed files with 95 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
src/citron/discord_impl.cpp
View file

@ -2,116 +2,120 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <chrono> #include <chrono>
#include <string> #include <string>
#include <QEventLoop> #include <QEventLoop>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <discord_rpc.h> #include <discord_rpc.h>
#include <fmt/format.h> #include <fmt/format.h>
#include "common/common_types.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/loader/loader.h"
#include "citron/discord_impl.h" #include "citron/discord_impl.h"
#include "citron/uisettings.h" #include "citron/uisettings.h"
#include "common/common_types.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/loader/loader.h"
namespace DiscordRPC { namespace DiscordRPC {
DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} { DiscordImpl::DiscordImpl(Core::System & system_): system {
DiscordEventHandlers handlers{}; system_
// The number is the client ID for citron, it's used for images and the } {
// application name DiscordEventHandlers handlers {};
Discord_Initialize("712465656758665259", &handlers, 1, nullptr); // The number is the client ID for citron, it's used for images and the
// application name
Discord_Initialize("1322413013248118888", & handlers, 1, nullptr);
} }
DiscordImpl::~DiscordImpl() { DiscordImpl::~DiscordImpl() {
Discord_ClearPresence(); Discord_ClearPresence();
Discord_Shutdown(); Discord_Shutdown();
} }
void DiscordImpl::Pause() { void DiscordImpl::Pause() {
Discord_ClearPresence(); Discord_ClearPresence();
}
std::string DiscordImpl::GetGameString(const std::string& title) {
// Convert to lowercase
std::string icon_name = Common::ToLower(title);
// Replace spaces with dashes
std::replace(icon_name.begin(), icon_name.end(), ' ', '-');
// Remove non-alphanumeric characters but keep dashes
std::erase_if(icon_name, [](char c) { return !std::isalnum(c) && c != '-'; });
// Remove dashes from the start and end of the string
icon_name.erase(icon_name.begin(), std::find_if(icon_name.begin(), icon_name.end(),
[](int ch) { return ch != '-'; }));
icon_name.erase(
std::find_if(icon_name.rbegin(), icon_name.rend(), [](int ch) { return ch != '-'; }).base(),
icon_name.end());
// Remove double dashes
icon_name.erase(std::unique(icon_name.begin(), icon_name.end(),
[](char a, char b) { return a == '-' && b == '-'; }),
icon_name.end());
return icon_name;
} }
void DiscordImpl::UpdateGameStatus(bool use_default) { void DiscordImpl::UpdateGameStatus(bool use_default) {
const std::string default_text = "citron is an emulator for the Nintendo Switch"; const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch";
const std::string default_image = "citron_logo"; const std::string default_image = "citron_logo";
const std::string url = use_default ? default_image : game_url; const std::string tinfoil_base_url = "https://tinfoil.media/ti/";
s64 start_time = std::chrono::duration_cast<std::chrono::seconds>( s64 start_time = std::chrono::duration_cast < std::chrono::seconds > (
std::chrono::system_clock::now().time_since_epoch()) std::chrono::system_clock::now().time_since_epoch())
.count(); .count();
DiscordRichPresence presence{}; DiscordRichPresence presence {};
presence.largeImageKey = url.c_str(); // Store the URL string to prevent it from being destroyed
presence.largeImageText = game_title.c_str(); if (!game_title_id.empty()) {
presence.smallImageKey = default_image.c_str(); game_url = fmt::format("{}{}/128/128", tinfoil_base_url, game_title_id);
presence.smallImageText = default_text.c_str(); // Make sure the string stays alive for the duration of the presence
presence.state = game_title.c_str(); cached_url = game_url;
presence.details = "Currently in game"; presence.largeImageKey = cached_url.c_str();
presence.startTimestamp = start_time; } else {
Discord_UpdatePresence(&presence); presence.largeImageKey = cached_url.c_str();
}
presence.largeImageText = game_title.c_str();
presence.smallImageKey = default_image.c_str();
presence.smallImageText = default_text.c_str();
// Remove title ID from display, only show game title
presence.state = game_title.c_str();
presence.details = "Currently in game";
presence.startTimestamp = start_time;
Discord_UpdatePresence( & presence);
} }
void DiscordImpl::Update() { void DiscordImpl::Update() {
const std::string default_text = "citron is an emulator for the Nintendo Switch"; const std::string default_text = "Citron Is A Homebrew Emulator For The Nintendo Switch";
const std::string default_image = "citron_logo"; const std::string default_image = "citron_logo";
if (system.IsPoweredOn()) { if (system.IsPoweredOn()) {
system.GetAppLoader().ReadTitle(game_title); system.GetAppLoader().ReadTitle(game_title);
system.GetAppLoader().ReadProgramId(program_id);
game_title_id = fmt::format("{:016X}", program_id);
// Used to format Icon URL for citron website game compatibility page fmt::print("Title ID: {}\n", game_title_id);
std::string icon_name = GetGameString(game_title);
game_url = fmt::format("https://citron-emu.org/images/game/boxart/{}.png", icon_name);
QNetworkAccessManager manager; QNetworkAccessManager manager;
QNetworkRequest request; QNetworkRequest request;
request.setUrl(QUrl(QString::fromStdString(game_url))); request.setUrl(QUrl(QString::fromStdString(
request.setTransferTimeout(3000); fmt::format("https://tinfoil.media/ti/{}/128/128", game_title_id))));
QNetworkReply* reply = manager.head(request); request.setTransferTimeout(10000);
QEventLoop request_event_loop; QNetworkReply * reply = manager.head(request);
QObject::connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit); QEventLoop request_event_loop;
request_event_loop.exec(); QObject::connect(reply, & QNetworkReply::finished, & request_event_loop, & QEventLoop::quit);
UpdateGameStatus(reply->error()); request_event_loop.exec();
return;
}
s64 start_time = std::chrono::duration_cast<std::chrono::seconds>( if (reply -> error()) {
std::chrono::system_clock::now().time_since_epoch()) fmt::print("Failed to fetch game image: {} ({})\n", reply -> errorString().toStdString(),
.count(); program_id);
}
DiscordRichPresence presence{}; UpdateGameStatus(reply -> error());
presence.largeImageKey = default_image.c_str(); reply -> deleteLater();
presence.largeImageText = default_text.c_str(); return;
presence.details = "Currently not in game"; }
presence.startTimestamp = start_time;
Discord_UpdatePresence(&presence); 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);
} }
} // namespace DiscordRPC } // namespace DiscordRPC

24
src/citron/discord_impl.h
View file

@ -11,22 +11,22 @@ class System;
namespace DiscordRPC { namespace DiscordRPC {
class DiscordImpl : public DiscordInterface { class DiscordImpl: public DiscordInterface {
public: public: DiscordImpl(Core::System & system_);
DiscordImpl(Core::System& system_); ~DiscordImpl() override;
~DiscordImpl() override;
void Pause() override; void Pause() override;
void Update() override; void Update() override;
private: private: void UpdateGameStatus(bool use_default);
std::string GetGameString(const std::string& title);
void UpdateGameStatus(bool use_default);
std::string game_url{}; std::string game_url {};
std::string game_title{}; std::string game_title {};
std::string game_title_id {};
std::string cached_url;
Core::System& system; Core::System & system;
u64 program_id = 0;
}; };
} // namespace DiscordRPC } // namespace DiscordRPC