From aadd2cb982f18e560ffaaa1196cfac50f94a7edb Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Fri, 12 May 2023 20:38:55 +0200 Subject: [PATCH] renamed `Discord_Activity` to `discord_sdk` --- README.md | 22 ++-- project/addons/discord-sdk-gd/example.gd | 22 ++-- project/addons/discord-sdk-gd/sdk_utility.gd | 2 +- project/export_presets.cfg | 2 +- project/main.gd | 22 ++-- src/discordgodot.cpp | 102 +++++++++---------- src/discordgodot.h | 12 +-- src/register_types.cpp | 10 +- 8 files changed, 97 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 2e1ee63..18eccd3 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ python setup.py extends Node func _ready(): - Discord_Activity.app_id = 1099618430065324082 # Application ID - print("Discord working: " + str(Discord_Activity.get_is_discord_working())) # A boolean if everything worked - Discord_Activity.details = "A demo activity by vaporvee#1231" - Discord_Activity.state = "Checkpoint 23/23" + discord_sdk.app_id = 1099618430065324082 # Application ID + print("Discord working: " + str(discord_sdk.get_is_discord_working())) # A boolean if everything worked + discord_sdk.details = "A demo activity by vaporvee#1231" + discord_sdk.state = "Checkpoint 23/23" - Discord_Activity.large_image = "game" # Image key from "Art Assets" - Discord_Activity.large_image_text = "Try it now!" - Discord_Activity.small_image = "boss" # Image key from "Art Assets" - Discord_Activity.small_image_text = "Fighting the end boss! D:" + discord_sdk.large_image = "game" # Image key from "Art Assets" + discord_sdk.large_image_text = "Try it now!" + discord_sdk.small_image = "boss" # Image key from "Art Assets" + discord_sdk.small_image_text = "Fighting the end boss! D:" - Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system()) # "02:46 elapsed" - # Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time / "01:00 remaining" + discord_sdk.start_timestamp = int(Time.get_unix_time_from_system()) # "02:46 elapsed" + # discord_sdk.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time / "01:00 remaining" - Discord_Activity.refresh() # Always refresh after changing the values! + discord_sdk.refresh() # Always refresh after changing the values! ``` #### Then it will look similar to this: diff --git a/project/addons/discord-sdk-gd/example.gd b/project/addons/discord-sdk-gd/example.gd index b15ebde..fc884da 100644 --- a/project/addons/discord-sdk-gd/example.gd +++ b/project/addons/discord-sdk-gd/example.gd @@ -9,17 +9,17 @@ extends Node #SELECT THE TEXT WITH YOUR MOUSE AND CTR + K TO UNCOMMENT THE FOLLOWING #func _ready(): -# Discord_Activity.app_id = 1099618430065324082 # Application ID -# print("Discord working: " + str(Discord_Activity.get_is_discord_working())) # A boolean if everything worked -# Discord_Activity.details = "A demo activity by vaporvee#1231" -# Discord_Activity.state = "Checkpoint 23/23" +# discord_sdk.app_id = 1099618430065324082 # Application ID +# print("Discord working: " + str(discord_sdk.get_is_discord_working())) # A boolean if everything worked +# discord_sdk.details = "A demo activity by vaporvee#1231" +# discord_sdk.state = "Checkpoint 23/23" # -# Discord_Activity.large_image = "game" # Image key from "Art Assets" -# Discord_Activity.large_image_text = "Try it now!" -# Discord_Activity.small_image = "boss" # Image key from "Art Assets" -# Discord_Activity.small_image_text = "Fighting the end boss! D:" +# discord_sdk.large_image = "game" # Image key from "Art Assets" +# discord_sdk.large_image_text = "Try it now!" +# discord_sdk.small_image = "boss" # Image key from "Art Assets" +# discord_sdk.small_image_text = "Fighting the end boss! D:" # -# Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system()) # "02:41 elapsed" -# Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time +# discord_sdk.start_timestamp = int(Time.get_unix_time_from_system()) # "02:41 elapsed" +# discord_sdk.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time # -# Discord_Activity.refresh() # Always refresh after changing the values! +# discord_sdk.refresh() # Always refresh after changing the values! diff --git a/project/addons/discord-sdk-gd/sdk_utility.gd b/project/addons/discord-sdk-gd/sdk_utility.gd index ce5e503..ccb4a0a 100644 --- a/project/addons/discord-sdk-gd/sdk_utility.gd +++ b/project/addons/discord-sdk-gd/sdk_utility.gd @@ -1,4 +1,4 @@ extends Node func _process(delta): - Discord_Activity.coreupdate() + discord_sdk.coreupdate() diff --git a/project/export_presets.cfg b/project/export_presets.cfg index b58e3cc..f45a49d 100644 --- a/project/export_presets.cfg +++ b/project/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../demo/Discord_Activity.exe" +export_path="../../demo/discord_sdk.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/project/main.gd b/project/main.gd index 1629f09..478a9cf 100644 --- a/project/main.gd +++ b/project/main.gd @@ -1,18 +1,18 @@ extends Node func _ready(): - Discord_Activity.app_id = 1099618430065324082 - Discord_Activity.details = "A demo activity by vaporvee#1231" - Discord_Activity.state = "Checkpoint 23/23" + discord_sdk.app_id = 1099618430065324082 + discord_sdk.details = "A demo activity by vaporvee#1231" + discord_sdk.state = "Checkpoint 23/23" - Discord_Activity.large_image = "game" - Discord_Activity.large_image_text = "Try it now!" - Discord_Activity.small_image = "boss" - Discord_Activity.small_image_text = "Fighting the end boss! D:" + discord_sdk.large_image = "game" + discord_sdk.large_image_text = "Try it now!" + discord_sdk.small_image = "boss" + discord_sdk.small_image_text = "Fighting the end boss! D:" - #Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system()) - Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time + #discord_sdk.start_timestamp = int(Time.get_unix_time_from_system()) + discord_sdk.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time - Discord_Activity.refresh() + discord_sdk.refresh() - $Info.text = $Info.text.replace("{discordinfo}",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)) + $Info.text = $Info.text.replace("{discordinfo}",str(discord_sdk.get_is_discord_working())).replace("{id}",str(discord_sdk.app_id)).replace("{details}",discord_sdk.details).replace("{state}",discord_sdk.state).replace("{lkey}",discord_sdk.large_image).replace("{ltext}",discord_sdk.large_image_text).replace("{skey}",discord_sdk.small_image).replace("{stext}",discord_sdk.small_image_text).replace("{stimestamp}",str(discord_sdk.start_timestamp)).replace("{etimestamp}",str(discord_sdk.end_timestamp)) diff --git a/src/discordgodot.cpp b/src/discordgodot.cpp index b4aba22..58d311f 100644 --- a/src/discordgodot.cpp +++ b/src/discordgodot.cpp @@ -7,80 +7,80 @@ using namespace godot; -Discord_Activity *Discord_Activity::singleton = nullptr; +discord_sdk *discord_sdk::singleton = nullptr; discord::Core *core{}; discord::Result result; discord::Activity activity{}; discord::User user{}; -void Discord_Activity::_bind_methods() +void discord_sdk::_bind_methods() { - ClassDB::bind_method(D_METHOD("debug"), &Discord_Activity::debug); - ClassDB::bind_method(D_METHOD("coreupdate"), &Discord_Activity::coreupdate); + ClassDB::bind_method(D_METHOD("debug"), &discord_sdk::debug); + ClassDB::bind_method(D_METHOD("coreupdate"), &discord_sdk::coreupdate); - ClassDB::bind_method(D_METHOD("get_app_id"), &Discord_Activity::get_app_id); - ClassDB::bind_method(D_METHOD("set_app_id", "app_id"), &Discord_Activity::set_app_id); + ClassDB::bind_method(D_METHOD("get_app_id"), &discord_sdk::get_app_id); + ClassDB::bind_method(D_METHOD("set_app_id", "app_id"), &discord_sdk::set_app_id); ADD_PROPERTY(PropertyInfo(Variant::INT, "app_id"), "set_app_id", "get_app_id"); - ClassDB::bind_method(D_METHOD("get_state"), &Discord_Activity::get_state); - ClassDB::bind_method(D_METHOD("set_state", "state"), &Discord_Activity::set_state); + ClassDB::bind_method(D_METHOD("get_state"), &discord_sdk::get_state); + ClassDB::bind_method(D_METHOD("set_state", "state"), &discord_sdk::set_state); ADD_PROPERTY(PropertyInfo(Variant::STRING, "state"), "set_state", "get_state"); - ClassDB::bind_method(D_METHOD("get_details"), &Discord_Activity::get_details); - ClassDB::bind_method(D_METHOD("set_details", "details"), &Discord_Activity::set_details); + ClassDB::bind_method(D_METHOD("get_details"), &discord_sdk::get_details); + ClassDB::bind_method(D_METHOD("set_details", "details"), &discord_sdk::set_details); ADD_PROPERTY(PropertyInfo(Variant::STRING, "details"), "set_details", "get_details"); - ClassDB::bind_method(D_METHOD("get_large_image"), &Discord_Activity::get_large_image); - ClassDB::bind_method(D_METHOD("set_large_image", "large_image"), &Discord_Activity::set_large_image); + ClassDB::bind_method(D_METHOD("get_large_image"), &discord_sdk::get_large_image); + ClassDB::bind_method(D_METHOD("set_large_image", "large_image"), &discord_sdk::set_large_image); ADD_PROPERTY(PropertyInfo(Variant::STRING, "large_image"), "set_large_image", "get_large_image"); - ClassDB::bind_method(D_METHOD("get_large_image_text"), &Discord_Activity::get_large_image_text); - ClassDB::bind_method(D_METHOD("set_large_image_text", "large_image_text"), &Discord_Activity::set_large_image_text); + ClassDB::bind_method(D_METHOD("get_large_image_text"), &discord_sdk::get_large_image_text); + ClassDB::bind_method(D_METHOD("set_large_image_text", "large_image_text"), &discord_sdk::set_large_image_text); ADD_PROPERTY(PropertyInfo(Variant::STRING, "large_image_text"), "set_large_image_text", "get_large_image_text"); - ClassDB::bind_method(D_METHOD("get_small_image"), &Discord_Activity::get_small_image); - ClassDB::bind_method(D_METHOD("set_small_image", "small_image"), &Discord_Activity::set_small_image); + ClassDB::bind_method(D_METHOD("get_small_image"), &discord_sdk::get_small_image); + ClassDB::bind_method(D_METHOD("set_small_image", "small_image"), &discord_sdk::set_small_image); ADD_PROPERTY(PropertyInfo(Variant::STRING, "small_image"), "set_small_image", "get_small_image"); - ClassDB::bind_method(D_METHOD("get_small_image_text"), &Discord_Activity::get_small_image_text); - ClassDB::bind_method(D_METHOD("set_small_image_text", "large_small_text"), &Discord_Activity::set_small_image_text); + ClassDB::bind_method(D_METHOD("get_small_image_text"), &discord_sdk::get_small_image_text); + ClassDB::bind_method(D_METHOD("set_small_image_text", "large_small_text"), &discord_sdk::set_small_image_text); ADD_PROPERTY(PropertyInfo(Variant::STRING, "small_image_text"), "set_small_image_text", "get_small_image_text"); - ClassDB::bind_method(D_METHOD("get_start_timestamp"), &Discord_Activity::get_start_timestamp); - ClassDB::bind_method(D_METHOD("set_start_timestamp", "start_timestamp"), &Discord_Activity::set_start_timestamp); + ClassDB::bind_method(D_METHOD("get_start_timestamp"), &discord_sdk::get_start_timestamp); + ClassDB::bind_method(D_METHOD("set_start_timestamp", "start_timestamp"), &discord_sdk::set_start_timestamp); ADD_PROPERTY(PropertyInfo(Variant::INT, "start_timestamp"), "set_start_timestamp", "get_start_timestamp"); - ClassDB::bind_method(D_METHOD("get_end_timestamp"), &Discord_Activity::get_end_timestamp); - ClassDB::bind_method(D_METHOD("set_end_timestamp", "end_timestamp"), &Discord_Activity::set_end_timestamp); + ClassDB::bind_method(D_METHOD("get_end_timestamp"), &discord_sdk::get_end_timestamp); + ClassDB::bind_method(D_METHOD("set_end_timestamp", "end_timestamp"), &discord_sdk::set_end_timestamp); 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("refresh"), &discord_sdk::refresh); - ClassDB::bind_method(D_METHOD("get_is_discord_working"), &Discord_Activity::get_is_discord_working); + ClassDB::bind_method(D_METHOD("get_is_discord_working"), &discord_sdk::get_is_discord_working); - ClassDB::bind_method(D_METHOD("get_result_int"), &Discord_Activity::get_result_int); + ClassDB::bind_method(D_METHOD("get_result_int"), &discord_sdk::get_result_int); } -Discord_Activity *Discord_Activity::get_singleton() +discord_sdk *discord_sdk::get_singleton() { return singleton; } -Discord_Activity::Discord_Activity() +discord_sdk::discord_sdk() { ERR_FAIL_COND(singleton != nullptr); singleton = this; } -Discord_Activity::~Discord_Activity() +discord_sdk::~discord_sdk() { ERR_FAIL_COND(singleton != this); singleton = nullptr; } -void Discord_Activity::coreupdate() +void discord_sdk::coreupdate() { if (result == discord::Result::Ok && app_id > 0) { ::core->RunCallbacks(); } } -void Discord_Activity::debug() +void discord_sdk::debug() { result = discord::Core::Create(1080224638845591692, DiscordCreateFlags_NoRequireDiscord, &core); activity.SetState("Test from Godot!"); @@ -100,36 +100,36 @@ void Discord_Activity::debug() UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!"); } -void Discord_Activity::set_app_id(int64_t value) +void discord_sdk::set_app_id(int64_t value) { app_id = value; result = discord::Core::Create(value, DiscordCreateFlags_NoRequireDiscord, &core); } -int64_t Discord_Activity::get_app_id() +int64_t discord_sdk::get_app_id() { return app_id; } -void Discord_Activity::set_state(String value) +void discord_sdk::set_state(String value) { state = value; activity.SetState(value.utf8().get_data()); } -String Discord_Activity::get_state() +String discord_sdk::get_state() { return state; } -void Discord_Activity::set_details(String value) +void discord_sdk::set_details(String value) { details = value; activity.SetDetails(value.utf8().get_data()); } -String Discord_Activity::get_details() +String discord_sdk::get_details() { return details; } -void Discord_Activity::refresh() +void discord_sdk::refresh() { if (result == discord::Result::Ok && app_id > 0) { @@ -141,68 +141,68 @@ void Discord_Activity::refresh() UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!"); } -void Discord_Activity::set_large_image(String value) +void discord_sdk::set_large_image(String value) { large_image = value; activity.GetAssets().SetLargeImage(value.utf8().get_data()); } -String Discord_Activity::get_large_image() +String discord_sdk::get_large_image() { return large_image; } -void Discord_Activity::set_large_image_text(String value) +void discord_sdk::set_large_image_text(String value) { large_image_text = value; activity.GetAssets().SetLargeText(value.utf8().get_data()); } -String Discord_Activity::get_large_image_text() +String discord_sdk::get_large_image_text() { return large_image_text; } -void Discord_Activity::set_small_image(String value) +void discord_sdk::set_small_image(String value) { small_image = value; activity.GetAssets().SetSmallImage(value.utf8().get_data()); } -String Discord_Activity::get_small_image() +String discord_sdk::get_small_image() { return small_image; } -void Discord_Activity::set_small_image_text(String value) +void discord_sdk::set_small_image_text(String value) { small_image_text = value; activity.GetAssets().SetSmallText(value.utf8().get_data()); } -String Discord_Activity::get_small_image_text() +String discord_sdk::get_small_image_text() { return small_image_text; } -void Discord_Activity::set_start_timestamp(int64_t value) +void discord_sdk::set_start_timestamp(int64_t value) { start_timestamp = value; activity.GetTimestamps().SetStart(value); } -int64_t Discord_Activity::get_start_timestamp() +int64_t discord_sdk::get_start_timestamp() { return activity.GetTimestamps().GetStart(); } -void Discord_Activity::set_end_timestamp(int64_t value) +void discord_sdk::set_end_timestamp(int64_t value) { end_timestamp = value; activity.GetTimestamps().SetEnd(value); } -int64_t Discord_Activity::get_end_timestamp() +int64_t discord_sdk::get_end_timestamp() { return activity.GetTimestamps().GetEnd(); } -bool Discord_Activity::get_is_discord_working() +bool discord_sdk::get_is_discord_working() { return result == discord::Result::Ok && app_id > 0; } -int Discord_Activity::get_result_int() +int discord_sdk::get_result_int() { return static_cast(result); } diff --git a/src/discordgodot.h b/src/discordgodot.h index b68bf1b..9f31a57 100644 --- a/src/discordgodot.h +++ b/src/discordgodot.h @@ -8,11 +8,11 @@ using namespace godot; -class Discord_Activity : public Object +class discord_sdk : public Object { - GDCLASS(Discord_Activity, Object); + GDCLASS(discord_sdk, Object); - static Discord_Activity *singleton; + static discord_sdk *singleton; protected: static void _bind_methods(); @@ -32,10 +32,10 @@ private: int64_t end_timestamp; public: - static Discord_Activity *get_singleton(); + static discord_sdk *get_singleton(); - Discord_Activity(); - ~Discord_Activity(); + discord_sdk(); + ~discord_sdk(); void debug(); void coreupdate(); diff --git a/src/register_types.cpp b/src/register_types.cpp index e9ff887..5ac453b 100644 --- a/src/register_types.cpp +++ b/src/register_types.cpp @@ -9,15 +9,15 @@ #include "discordgodot.h" using namespace godot; -static Discord_Activity *discordsdk; +static discord_sdk *discordsdk; void gdextension_initialize(ModuleInitializationLevel p_level) { if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { - ClassDB::register_class(); - discordsdk = memnew(Discord_Activity); - Engine::get_singleton()->register_singleton("Discord_Activity", Discord_Activity::get_singleton()); + ClassDB::register_class(); + discordsdk = memnew(discord_sdk); + Engine::get_singleton()->register_singleton("discord_sdk", discord_sdk::get_singleton()); } } @@ -25,7 +25,7 @@ void gdextension_terminate(ModuleInitializationLevel p_level) { if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { - Engine::get_singleton()->unregister_singleton("Discord_Activity"); + Engine::get_singleton()->unregister_singleton("discord_sdk"); memdelete(discordsdk); } }