From 0e7b86017e95977549cc26d14225717acbf83196 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sat, 15 Apr 2023 21:09:26 -0700 Subject: [PATCH] Restore functionality of network_discord_id_from_local_index(0) --- src/pc/discord/discord.c | 4 ++++ src/pc/discord/discord.h | 1 + src/pc/lua/utils/smlua_deprecated.c | 12 +++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pc/discord/discord.c b/src/pc/discord/discord.c index 1dbef2374..00bacfe41 100644 --- a/src/pc/discord/discord.c +++ b/src/pc/discord/discord.c @@ -149,6 +149,10 @@ static void discord_initialize(void) { LOG_INFO("initialized"); } +u64 discord_get_user_id(void) { + return app.userId; +} + void discord_update(void) { if (!sDiscordInitialized) { discord_initialize(); diff --git a/src/pc/discord/discord.h b/src/pc/discord/discord.h index eb26fb690..9d8277cbd 100644 --- a/src/pc/discord/discord.h +++ b/src/pc/discord/discord.h @@ -34,3 +34,4 @@ void discord_fatal(int rc); void discord_activity_update_check(void); void discord_activity_update(void); struct IDiscordActivityEvents* discord_activity_initialize(void); +u64 discord_get_user_id(void); diff --git a/src/pc/lua/utils/smlua_deprecated.c b/src/pc/lua/utils/smlua_deprecated.c index 6bf111d74..d5ab47cbc 100644 --- a/src/pc/lua/utils/smlua_deprecated.c +++ b/src/pc/lua/utils/smlua_deprecated.c @@ -1,5 +1,15 @@ #include "types.h" +#ifdef DISCORD_SDK +#include "pc/discord/discord.h" +#endif -char* network_discord_id_from_local_index(UNUSED u8 localIndex) { +char* network_discord_id_from_local_index(u8 localIndex) { +#ifdef DISCORD_SDK + static char sDiscordId[64] = ""; + if (localIndex == 0) { + snprintf(sDiscordId, 64, "%" PRIu64 "", (uint64_t)discord_get_user_id()); + return sDiscordId; + } +#endif return NULL; }