mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[discord] show connection confirmation dialog

Browse Source
This commit is contained in:
radius 2018-10-16 23:50:17 -05:00
parent 325d85ed4b
commit 583273d81b
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
discord/discord.c
View File

@ -37,6 +37,11 @@
#include "../cheevos/cheevos.h" #include "../cheevos/cheevos.h"
#endif #endif
#ifdef HAVE_MENU
#include "../../menu/widgets/menu_input_dialog.h"
#endif
static int FrustrationLevel = 0; static int FrustrationLevel = 0;
static int64_t start_time = 0; static int64_t start_time = 0;
@ -48,6 +53,8 @@ static unsigned discord_status = 0;
struct netplay_room *room; struct netplay_room *room;
static char user_id[128];
DiscordRichPresence discord_presence; DiscordRichPresence discord_presence;
static void handle_discord_ready(const DiscordUser* connectedUser) static void handle_discord_ready(const DiscordUser* connectedUser)
@ -93,14 +100,42 @@ static void handle_discord_spectate(const char* secret)
RARCH_LOG("[Discord] spectate (%s)\n", secret); RARCH_LOG("[Discord] spectate (%s)\n", secret);
} }
static void handle_discord_join_response(void *ignore, const char *line)
{
if (strstr(line, "yes"))
Discord_Respond(user_id, DISCORD_REPLY_YES);
#ifdef HAVE_MENU
menu_input_dialog_end();
rarch_menu_running_finished();
#endif
}
static void handle_discord_join_request(const DiscordUser* request) static void handle_discord_join_request(const DiscordUser* request)
{ {
int response = -1;
char yn[4];
RARCH_LOG("[Discord] join request from %s#%s - %s\n", RARCH_LOG("[Discord] join request from %s#%s - %s\n",
request->username, request->username,
request->discriminator, request->discriminator,
request->userId); request->userId);
strlcpy(user_id, request->userId, sizeof(user_id));
#ifdef HAVE_MENU
char buf[PATH_MAX_LENGTH];
menu_input_ctx_line_t line;
rarch_menu_running();
memset(&line, 0, sizeof(line));
snprintf(buf, sizeof(buf), "%s %s?", msg_hash_to_str(MSG_DISCORD_CONNECTION_REQUEST), request->username);
line.label = buf;
line.label_setting = "no_setting";
line.cb = handle_discord_join_response;
/* To-Do: bespoke dialog, should show while in-game and have a hotkey to accept */
/* To-Do: show avatar of the user connecting */
if (!menu_input_dialog_start(&line))
return;
#endif
} }
void discord_update(enum discord_presence presence) void discord_update(enum discord_presence presence)
@ -230,8 +265,8 @@ void discord_init(void)
Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL); Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL);
char command[PATH_MAX_LENGTH]; char command[PATH_MAX_LENGTH];
strlcpy(command, _argv, sizeof(command)); strlcpy(command, _argv, sizeof(command));
RARCH_LOG("[Discord] registering startup command: %s\n", command); RARCH_LOG("[Discord] registering startup command: %s\n", command);
Discord_Register(settings->arrays.discord_app_id, command); Discord_Register(settings->arrays.discord_app_id, command);
discord_ready = true; discord_ready = true;

4
intl/msg_hash_us.h
View File

@ -129,6 +129,10 @@ MSG_HASH(
MSG_NETPLAY_ENTER_PASSWORD, MSG_NETPLAY_ENTER_PASSWORD,
"Enter netplay server password:" "Enter netplay server password:"
) )
MSG_HASH(
MSG_DISCORD_CONNECTION_REQUEST,
"Do you want to allow connection from user:"
)
MSG_HASH( MSG_HASH(
MSG_NETPLAY_INCORRECT_PASSWORD, MSG_NETPLAY_INCORRECT_PASSWORD,
"Incorrect password" "Incorrect password"

1
msg_hash.h
View File

@ -189,6 +189,7 @@ enum msg_hash_enums
MSG_RESAMPLER_QUALITY_NORMAL, MSG_RESAMPLER_QUALITY_NORMAL,
MSG_RESAMPLER_QUALITY_HIGHER, MSG_RESAMPLER_QUALITY_HIGHER,
MSG_RESAMPLER_QUALITY_HIGHEST, MSG_RESAMPLER_QUALITY_HIGHEST,
MSG_DISCORD_CONNECTION_REQUEST,
MSG_ADDED_TO_FAVORITES, MSG_ADDED_TO_FAVORITES,
MSG_RESET_CORE_ASSOCIATION, MSG_RESET_CORE_ASSOCIATION,
MSG_CORE_ASSOCIATION_RESET, MSG_CORE_ASSOCIATION_RESET,