vaporvee/discord-rpc-godot
1
2
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases 20 Wiki Activity

Update v1.3

Browse Source
This commit is contained in:
Yannik
2023-05-12 12:03:48 +02:00
parent 28a61a539b
commit 4992948be5
21 changed files with 511 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/discordgodot.cpp
View File

@@ -7,80 +7,84 @@
using namespace godot;
Discord_SDK *Discord_SDK::singleton = nullptr;
Discord_Activity *Discord_Activity::singleton = nullptr;
discord::Core *core{};
discord::Result result;
discord::Activity activity{};
discord::User user{};
void Discord_SDK::_bind_methods()
void Discord_Activity::_bind_methods()
{
ClassDB::bind_method(D_METHOD("debug"), &Discord_SDK::debug);
ClassDB::bind_method(D_METHOD("coreupdate"), &Discord_SDK::coreupdate);
ClassDB::bind_method(D_METHOD("debug"), &Discord_Activity::debug);
ClassDB::bind_method(D_METHOD("coreupdate"), &Discord_Activity::coreupdate);
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);
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);
ADD_PROPERTY(PropertyInfo(Variant::INT, "app_id"), "set_app_id", "get_app_id");
ClassDB::bind_method(D_METHOD("get_state"), &Discord_SDK::get_state);
ClassDB::bind_method(D_METHOD("set_state", "state"), &Discord_SDK::set_state);
ClassDB::bind_method(D_METHOD("get_state"), &Discord_Activity::get_state);
ClassDB::bind_method(D_METHOD("set_state", "state"), &Discord_Activity::set_state);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "state"), "set_state", "get_state");
ClassDB::bind_method(D_METHOD("get_details"), &Discord_SDK::get_details);
ClassDB::bind_method(D_METHOD("set_details", "details"), &Discord_SDK::set_details);
ClassDB::bind_method(D_METHOD("get_details"), &Discord_Activity::get_details);
ClassDB::bind_method(D_METHOD("set_details", "details"), &Discord_Activity::set_details);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "details"), "set_details", "get_details");
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);
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);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "large_image"), "set_large_image", "get_large_image");
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);
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);
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_SDK::get_small_image);
ClassDB::bind_method(D_METHOD("set_small_image", "small_image"), &Discord_SDK::set_small_image);
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);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "small_image"), "set_small_image", "get_small_image");
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);
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);
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_SDK::get_start_timestamp);
ClassDB::bind_method(D_METHOD("set_start_timestamp", "start_timestamp"), &Discord_SDK::set_start_timestamp);
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);
ADD_PROPERTY(PropertyInfo(Variant::INT, "start_timestamp"), "set_start_timestamp", "get_start_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);
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);
ADD_PROPERTY(PropertyInfo(Variant::INT, "end_timestamp"), "set_end_timestamp", "get_end_timestamp");
ClassDB::bind_method(D_METHOD("refresh"), &Discord_SDK::refresh);
ClassDB::bind_method(D_METHOD("refresh"), &Discord_Activity::refresh);
ClassDB::bind_method(D_METHOD("get_is_discord_working"), &Discord_SDK::get_is_discord_working);
ClassDB::bind_method(D_METHOD("get_is_discord_working"), &Discord_Activity::get_is_discord_working);
ClassDB::bind_method(D_METHOD("get_result_int"), &Discord_SDK::get_result_int);
ClassDB::bind_method(D_METHOD("get_result_int"), &Discord_Activity::get_result_int);
}
Discord_SDK *Discord_SDK::get_singleton()
Discord_Activity *Discord_Activity::get_singleton()
{
return singleton;
}
Discord_SDK::Discord_SDK()
Discord_Activity::Discord_Activity()
{
ERR_FAIL_COND(singleton != nullptr);
singleton = this;
// intitalize core with discord's dummy application ID to make "is_discord_working" work anytime
app_id = 461618159171141643;
result = discord::Core::Create(app_id, DiscordCreateFlags_NoRequireDiscord, &core);
}
Discord_SDK::~Discord_SDK()
Discord_Activity::~Discord_Activity()
{
ERR_FAIL_COND(singleton != this);
singleton = nullptr;
}
void Discord_SDK::coreupdate()
void Discord_Activity::coreupdate()
{
if (result == discord::Result::Ok && app_id > 0)
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643)
{
::core->RunCallbacks();
}
}
void Discord_SDK::debug()
void Discord_Activity::debug()
{
result = discord::Core::Create(1080224638845591692, DiscordCreateFlags_NoRequireDiscord, &core);
activity.SetState("Test from Godot!");
@@ -100,38 +104,41 @@ void Discord_SDK::debug()
UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!");
}
void Discord_SDK::set_app_id(const int64_t &value)
void Discord_Activity::set_app_id(int64_t value)
{
app_id = value;
result = discord::Core::Create(value, DiscordCreateFlags_NoRequireDiscord, &core);
}
int64_t Discord_SDK::get_app_id() const
int64_t Discord_Activity::get_app_id()
{
return app_id;
if (app_id = 461618159171141643)
return NULL;
else
return app_id;
}
void Discord_SDK::set_state(const String &value)
void Discord_Activity::set_state(String value)
{
state = value;
activity.SetState(value.utf8().get_data());
}
String Discord_SDK::get_state() const
String Discord_Activity::get_state()
{
return state;
}
void Discord_SDK::set_details(const String &value)
void Discord_Activity::set_details(String value)
{
details = value;
activity.SetDetails(value.utf8().get_data());
}
String Discord_SDK::get_details() const
String Discord_Activity::get_details()
{
return details;
}
void Discord_SDK::refresh()
void Discord_Activity::refresh()
{
if (result == discord::Result::Ok && app_id > 0)
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643)
{
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
core->UserManager().OnCurrentUserUpdate.Connect([]()
@@ -141,68 +148,68 @@ void Discord_SDK::refresh()
UtilityFunctions::push_warning("Discord Activity couldn't be updated. It could be that Discord isn't running!");
}
void Discord_SDK::set_large_image(const String &value)
void Discord_Activity::set_large_image(String value)
{
large_image = value;
activity.GetAssets().SetLargeImage(value.utf8().get_data());
}
String Discord_SDK::get_large_image() const
String Discord_Activity::get_large_image()
{
return large_image;
}
void Discord_SDK::set_large_image_text(const String &value)
void Discord_Activity::set_large_image_text(String value)
{
large_image_text = value;
activity.GetAssets().SetLargeText(value.utf8().get_data());
}
String Discord_SDK::get_large_image_text() const
String Discord_Activity::get_large_image_text()
{
return large_image_text;
}
void Discord_SDK::set_small_image(const String &value)
void Discord_Activity::set_small_image(String value)
{
small_image = value;
activity.GetAssets().SetSmallImage(value.utf8().get_data());
}
String Discord_SDK::get_small_image() const
String Discord_Activity::get_small_image()
{
return small_image;
}
void Discord_SDK::set_small_image_text(const String &value)
void Discord_Activity::set_small_image_text(String value)
{
small_image_text = value;
activity.GetAssets().SetSmallText(value.utf8().get_data());
}
String Discord_SDK::get_small_image_text() const
String Discord_Activity::get_small_image_text()
{
return small_image_text;
}
void Discord_SDK::set_start_timestamp(const int64_t &value)
void Discord_Activity::set_start_timestamp(int64_t value)
{
start_timestamp = value;
activity.GetTimestamps().SetStart(value);
}
int64_t Discord_SDK::get_start_timestamp() const
int64_t Discord_Activity::get_start_timestamp()
{
return activity.GetTimestamps().GetStart();
}
void Discord_SDK::set_end_timestamp(const int64_t &value)
void Discord_Activity::set_end_timestamp(int64_t value)
{
end_timestamp = value;
activity.GetTimestamps().SetEnd(value);
}
int64_t Discord_SDK::get_end_timestamp() const
int64_t Discord_Activity::get_end_timestamp()
{
return activity.GetTimestamps().GetEnd();
}
bool Discord_SDK::get_is_discord_working() const
bool Discord_Activity::get_is_discord_working()
{
return result == discord::Result::Ok && app_id > 0;
}
int Discord_SDK::get_result_int() const
int Discord_Activity::get_result_int()
{
return static_cast<int>(result);
}

52
src/discordgodot.h
View File

@@ -8,11 +8,11 @@
using namespace godot;
class Discord_SDK : public Object
class Discord_Activity : public Object
{
GDCLASS(Discord_SDK, Object);
GDCLASS(Discord_Activity, Object);
static Discord_SDK *singleton;
static Discord_Activity *singleton;
protected:
static void _bind_methods();
@@ -32,39 +32,39 @@ private:
int64_t end_timestamp;
public:
static Discord_SDK *get_singleton();
static Discord_Activity *get_singleton();
Discord_SDK();
~Discord_SDK();
Discord_Activity();
~Discord_Activity();
void debug();
void coreupdate();
void refresh();
int64_t get_app_id() const;
int64_t get_app_id();
void set_app_id(const int64_t &value);
String get_state() const;
void set_state(const String &value);
String get_details() const;
void set_details(const String &value);
void set_app_id(int64_t value);
String get_state();
void set_state(String value);
String get_details();
void set_details(String value);
String get_large_image() const;
void set_large_image(const String &value);
String get_large_image_text() const;
void set_large_image_text(const String &value);
String get_small_image() const;
void set_small_image(const String &value);
String get_small_image_text() const;
void set_small_image_text(const String &value);
String get_large_image();
void set_large_image(String value);
String get_large_image_text();
void set_large_image_text(String value);
String get_small_image();
void set_small_image(String value);
String get_small_image_text();
void set_small_image_text(String value);
int64_t get_start_timestamp() const;
void set_start_timestamp(const int64_t &value);
int64_t get_end_timestamp() const;
void set_end_timestamp(const int64_t &value);
int64_t get_start_timestamp();
void set_start_timestamp(int64_t value);
int64_t get_end_timestamp();
void set_end_timestamp(int64_t value);
bool get_is_discord_working() const;
int get_result_int() const;
bool get_is_discord_working();
int get_result_int();
};
#endif

10
src/register_types.cpp
View File

@@ -9,15 +9,15 @@
#include "discordgodot.h"
using namespace godot;
static Discord_SDK *discordsdk;
static Discord_Activity *discordsdk;
void gdextension_initialize(ModuleInitializationLevel p_level)
{
if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE)
{
ClassDB::register_class<Discord_SDK>();
discordsdk = memnew(Discord_SDK);
Engine::get_singleton()->register_singleton("Discord_SDK", Discord_SDK::get_singleton());
ClassDB::register_class<Discord_Activity>();
discordsdk = memnew(Discord_Activity);
Engine::get_singleton()->register_singleton("Discord_Activity", Discord_Activity::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_SDK");
Engine::get_singleton()->unregister_singleton("Discord_Activity");
memdelete(discordsdk);
}
}