Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-22 01:29:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[qt] fix Discord RPC by using httplib

Browse source 
Commit `a079a93645` inexplicably replaced
the httplib implementation of discord_impl.cpp with an inferior
Qt::Network version. This causes a lot of issues especially w.r.t CA
certs which are handled differently with bundled OpenSSL. Thus, this
just adds back the httplib implementation and makes discord RPC work
again.

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-23 19:14:08 -04:00
parent 05c721bb41
commit 8c7e28efb6
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
4 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/frontend_common/update_checker.cpp
View file

@ -10,10 +10,6 @@
#include "common/scm_rev.h"
#include <fmt/format.h>
#ifndef CPPHTTPLIB_OPENSSL_SUPPORT
#define CPPHTTPLIB_OPENSSL_SUPPORT
#endif
#include <httplib.h>
#ifdef YUZU_BUNDLED_OPENSSL

6
src/qt_common/CMakeLists.txt
View file

@ -36,7 +36,11 @@ if (USE_DISCORD_PRESENCE)
discord/discord_impl.cpp
discord/discord_impl.h
)
target_link_libraries(qt_common PUBLIC DiscordRPC::discord-rpc Qt6::Network)
target_link_libraries(qt_common PUBLIC DiscordRPC::discord-rpc httplib::httplib)
if (YUZU_USE_BUNDLED_OPENSSL)
target_link_libraries(qt_common PUBLIC OpenSSL::SSL)
target_compile_definitions(qt_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
endif()
target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)
endif()

40
src/qt_common/discord/discord_impl.cpp
View file

@ -8,17 +8,23 @@
#include <string>
#include <QEventLoop>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <boost/algorithm/string/replace.hpp>
#include <httplib.h>
#include <discord_rpc.h>
#include <fmt/format.h>
#include <qdebug.h>
#include "common/common_types.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/loader/loader.h"
#include "qt_common/discord/discord_impl.h"
#include "discord_impl.h"
#ifdef YUZU_BUNDLED_OPENSSL
#include <openssl/cert.h>
#endif
namespace DiscordRPC {
@ -44,6 +50,7 @@ std::string DiscordImpl::GetGameString(const std::string& title) {
// Replace spaces with dashes
std::replace(icon_name.begin(), icon_name.end(), ' ', '-');
boost::replace_all(icon_name, "é", "e");
// Remove non-alphanumeric characters but keep dashes
std::erase_if(icon_name, [](char c) { return !std::isalnum(c) && c != '-'; });
@ -81,6 +88,8 @@ void DiscordImpl::UpdateGameStatus(bool use_default) {
presence.details = "Currently in game";
presence.startTimestamp = start_time;
Discord_UpdatePresence(&presence);
qDebug() << "game status updated";
}
void DiscordImpl::Update() {
@ -97,15 +106,22 @@ void DiscordImpl::Update() {
"https://raw.githubusercontent.com/eden-emulator/boxart/refs/heads/master/img/{}.png",
icon_name);
QNetworkAccessManager manager;
QNetworkRequest request;
request.setUrl(QUrl(QString::fromStdString(game_url)));
request.setTransferTimeout(3000);
QNetworkReply* reply = manager.head(request);
QEventLoop request_event_loop;
reply->connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit);
request_event_loop.exec();
UpdateGameStatus(reply->error());
httplib::SSLClient client(game_url);
client.set_connection_timeout(3);
client.set_read_timeout(3);
client.set_follow_location(true);
#ifdef YUZU_BUNDLED_OPENSSL
client.load_ca_cert_store(kCert, sizeof(kCert));
#endif
httplib::Request request{
.method = "HEAD",
.path = game_url,
};
auto res = client.send(request);
UpdateGameStatus(res && res->status == 200);
return;
}