diff --git a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll index 01a5d0a..92f73f6 100644 Binary files a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll and b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll differ diff --git a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll index cb9c7f0..3abb1c7 100644 Binary files a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll and b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll differ diff --git a/project/main.gd b/project/main.gd index eccee93..9990e5b 100644 --- a/project/main.gd +++ b/project/main.gd @@ -1,7 +1,6 @@ extends Node func _ready(): - #Discord_Activity.debug() Discord_Activity.app_id = 1099618430065324082 Discord_Activity.details = "A demo activity by vaporvee#1231" Discord_Activity.state = "Checkpoint 23/23" @@ -12,7 +11,8 @@ func _ready(): Discord_Activity.small_image_text = "Fighting the end boss! D:" Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system()) - #Discord_Activity.end_timestamp = 2492978400 #31. 12. 2048 in unix time + Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # + 1 extra hour Discord_Activity.refresh() - $Info.text = $Info.text.replace("{id}",str(Discord_Activity.app_id)).replace("{details}",Discord_Activity.details).replace("{state}",Discord_Activity.state).replace("{lkey}",Discord_Activity.large_image).replace("{ltext}",Discord_Activity.large_image_text).replace("{skey}",Discord_Activity.small_image).replace("{stext}",Discord_Activity.small_image_text).replace("{stimestamp}",str(Discord_Activity.start_timestamp)).replace("{etimestamp}",str(Discord_Activity.end_timestamp)) + + $Info.text = $Info.text.replace("{isdiscordworking}",str(Discord_Activity.get_is_discord_working())).replace("{id}",str(Discord_Activity.app_id)).replace("{details}",Discord_Activity.details).replace("{state}",Discord_Activity.state).replace("{lkey}",Discord_Activity.large_image).replace("{ltext}",Discord_Activity.large_image_text).replace("{skey}",Discord_Activity.small_image).replace("{stext}",Discord_Activity.small_image_text).replace("{stimestamp}",str(Discord_Activity.start_timestamp)).replace("{etimestamp}",str(Discord_Activity.end_timestamp)) diff --git a/project/main.tscn b/project/main.tscn index ace6d66..9eb5c86 100644 --- a/project/main.tscn +++ b/project/main.tscn @@ -46,7 +46,9 @@ offset_left = 7.0 offset_top = 6.0 offset_right = 514.0 offset_bottom = 722.0 -text = "Application ID : {id} +text = "Is Discord working: {isdiscordworking} + +Application ID : {id} Details: {details} State: {state} diff --git a/src/activity.cpp b/src/activity.cpp index e8f7792..6fd16f8 100644 --- a/src/activity.cpp +++ b/src/activity.cpp @@ -49,6 +49,8 @@ void Discord_Activity::_bind_methods() ADD_PROPERTY(PropertyInfo(Variant::INT, "end_timestamp"), "set_end_timestamp", "get_end_timestamp"); ClassDB::bind_method(D_METHOD("refresh"), &Discord_Activity::refresh); + + ClassDB::bind_method(D_METHOD("get_is_discord_working"), &Discord_Activity::get_is_discord_working); } Discord_Activity *Discord_Activity::get_singleton() @@ -70,21 +72,26 @@ Discord_Activity::~Discord_Activity() void Discord_Activity::debug() { - auto debugresult = discord::Core::Create(1080224638845591692, DiscordCreateFlags_NoRequireDiscord, &core); - discord::Activity debugactivity{}; - debugactivity.SetState("Test from Godot!"); - debugactivity.SetDetails("I worked months on this"); - debugactivity.GetAssets().SetLargeImage("test1"); - debugactivity.GetAssets().SetLargeText("wow test text for large image"); - debugactivity.GetAssets().SetSmallImage("godot"); - debugactivity.GetAssets().SetSmallText("wow test text for small image"); - debugactivity.GetTimestamps().SetStart(1682242800); - core->ActivityManager().UpdateActivity(debugactivity, [](discord::Result debugresult) {}); + result = discord::Core::Create(1080224638845591692, DiscordCreateFlags_NoRequireDiscord, &core); + activity.SetState("Test from Godot!"); + activity.SetDetails("I worked months on this"); + activity.GetAssets().SetLargeImage("test1"); + activity.GetAssets().SetLargeText("wow test text for large image"); + activity.GetAssets().SetSmallImage("godot"); + activity.GetAssets().SetSmallText("wow test text for small image"); + activity.GetTimestamps().SetStart(1682242800); + if (result == discord::Result::Ok) + { + core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {}); + } + else + UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!"); } void Discord_Activity::coreupdate() { - ::core->RunCallbacks(); + if (result == discord::Result::Ok) + ::core->RunCallbacks(); } void Discord_Activity::set_app_id(const int64_t &value) @@ -118,7 +125,10 @@ String Discord_Activity::get_details() const void Discord_Activity::refresh() { - core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {}); + if (result == discord::Result::Ok) + core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {}); + else + UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!"); } void Discord_Activity::set_large_image(const String &value) @@ -175,4 +185,9 @@ void Discord_Activity::set_end_timestamp(const int64_t &value) int64_t Discord_Activity::get_end_timestamp() const { return activity.GetTimestamps().GetEnd(); +} + +bool Discord_Activity::get_is_discord_working() const +{ + return result == discord::Result::Ok; } \ No newline at end of file diff --git a/src/activity.h b/src/activity.h index 3c57678..26c972b 100644 --- a/src/activity.h +++ b/src/activity.h @@ -61,6 +61,8 @@ public: void set_start_timestamp(const int64_t &value); int64_t get_end_timestamp() const; void set_end_timestamp(const int64_t &value); + + bool get_is_discord_working() const; }; #endif \ No newline at end of file diff --git a/src/register_types.cpp b/src/register_types.cpp index 8ab7f54..1fc0ea5 100644 --- a/src/register_types.cpp +++ b/src/register_types.cpp @@ -16,7 +16,6 @@ void gdextension_initialize(ModuleInitializationLevel p_level) if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { ClassDB::register_class(); - discordactivity = memnew(Discord_Activity); Engine::get_singleton()->register_singleton("Discord_Activity", Discord_Activity::get_singleton()); }