Who even knows how this works anyway

This commit is contained in:
Mason Sciotti
2018-02-08 14:13:14 -08:00
parent 1ff9550d82
commit fdef61b101
3 changed files with 7 additions and 8 deletions

View File

@@ -61,7 +61,7 @@ static void JoinRequestHandler(const DiscordJoinRequest* request)
jr.avatar = ANSI_TO_TCHAR(request->avatar); jr.avatar = ANSI_TO_TCHAR(request->avatar);
UE_LOG(Discord, Log, TEXT("Discord join request from %s - %s#%s"), *jr.userId, *jr.username, *jr.discriminator); UE_LOG(Discord, Log, TEXT("Discord join request from %s - %s#%s"), *jr.userId, *jr.username, *jr.discriminator);
if (self) { if (self) {
self->OnJoinRequest.Broadcast(jr.userId); self->OnJoinRequest.Broadcast(jr);
} }
} }
@@ -149,9 +149,9 @@ void UDiscordRpc::ClearPresence()
Discord_ClearPresence(); Discord_ClearPresence();
} }
static void UDiscordRpc::Respond(const FString& userId) void UDiscordRpc::Respond(const FString& userId, int reply)
{ {
auto userid = StringCast<ANSICHAR>(*userId); UE_LOG(Discord, Log, TEXT("Responding %s to join request from %s"), reply, *userId);
UE_LOG(Discord, Log, TEXT("Responding %s to join request from %s"), 1, *userid) FTCHARToUTF8 utf8_userid(*userId);
Discord_Respond((const char*)userid.Get(), 1); Discord_Respond(utf8_userid.Get(), reply);
} }

View File

@@ -30,7 +30,6 @@ DECLARE_LOG_CATEGORY_EXTERN(Discord, Log, All);
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FDiscordConnected); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FDiscordConnected);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FDiscordDisconnected, int, errorCode, const FString&, errorMessage); DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FDiscordDisconnected, int, errorCode, const FString&, errorMessage);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FDiscordErrored, int, errorCode, const FString&, errorMessage); DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FDiscordErrored, int, errorCode, const FString&, errorMessage);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordRespond, const FString&, userId);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordJoin, const FString&, joinSecret); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordJoin, const FString&, joinSecret);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordSpectate, const FString&, spectateSecret); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordSpectate, const FString&, spectateSecret);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordJoinRequest, const FDiscordJoinRequestData&, joinRequest); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FDiscordJoinRequest, const FDiscordJoinRequestData&, joinRequest);
@@ -112,10 +111,10 @@ public:
Category = "Discord") Category = "Discord")
void ClearPresence(); void ClearPresence();
UPROPERTY(BlueprintAssignable, UFUNCTION(BlueprintCallable,
meta = (DisplayName = "Respond to join request", Keywords = "Discord rpc"), meta = (DisplayName = "Respond to join request", Keywords = "Discord rpc"),
Category = "Discord") Category = "Discord")
FDiscordRespond Respond; void Respond(const FString& userId, int reply);
UPROPERTY(BlueprintReadOnly, UPROPERTY(BlueprintReadOnly,
meta = (DisplayName = "Is Discord connected", Keywords = "Discord rpc"), meta = (DisplayName = "Is Discord connected", Keywords = "Discord rpc"),