Discord real objects + bump deps

MafiaHub · Dec 28, 2024 · bfdef81 · bfdef81
1 parent 3d05468
commit bfdef81
Show file tree

Hide file tree

Showing 23 changed files with 981 additions and 472 deletions.
diff --git a/code/framework/src/external/discord/wrapper.cpp b/code/framework/src/external/discord/wrapper.cpp
@@ -5,7 +5,6 @@
  * This file comes from MafiaHub, hosted at https://github.com/MafiaHub/Framework.
  * See LICENSE file in the source repository for information regarding licensing.
  */
-
 #include "wrapper.h"
 
 #include <logging/logger.h>

diff --git a/code/framework/src/external/discord/wrapper.h b/code/framework/src/external/discord/wrapper.h
@@ -7,6 +7,7 @@
  */
 
 #pragma once
+#include <utils/safe_win32.h>
 
 #include "errors.h"
 

diff --git a/vendors/discord/lib/aarch64/discord_game_sdk.bundle b/vendors/discord/lib/aarch64/discord_game_sdk.bundle
diff --git a/vendors/discord/lib/x86/discord_game_sdk.dll b/vendors/discord/lib/x86/discord_game_sdk.dll
diff --git a/vendors/discord/lib/x86/discord_game_sdk.dll.lib b/vendors/discord/lib/x86/discord_game_sdk.dll.lib
diff --git a/vendors/discord/lib/x86_64/discord_game_sdk.bundle b/vendors/discord/lib/x86_64/discord_game_sdk.bundle
diff --git a/vendors/discord/lib/x86_64/discord_game_sdk.dll b/vendors/discord/lib/x86_64/discord_game_sdk.dll
diff --git a/vendors/discord/lib/x86_64/discord_game_sdk.dylib b/vendors/discord/lib/x86_64/discord_game_sdk.dylib
diff --git a/vendors/discord/lib/x86_64/discord_game_sdk.lib b/vendors/discord/lib/x86_64/discord_game_sdk.lib
diff --git a/vendors/discord/lib/x86_64/discord_game_sdk.so b/vendors/discord/lib/x86_64/discord_game_sdk.so
diff --git a/vendors/discord/src/achievement_manager.cpp b/vendors/discord/src/achievement_manager.cpp
@@ -13,7 +13,8 @@ namespace discord {
 
 class AchievementEvents final {
 public:
-    static void OnUserAchievementUpdate(void* callbackData, DiscordUserAchievement* userAchievement)
+    static void DISCORD_CALLBACK OnUserAchievementUpdate(void* callbackData,
+                                                         DiscordUserAchievement* userAchievement)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {

diff --git a/vendors/discord/src/activity_manager.cpp b/vendors/discord/src/activity_manager.cpp
@@ -13,7 +13,7 @@ namespace discord {
 
 class ActivityEvents final {
 public:
-    static void OnActivityJoin(void* callbackData, char const* secret)
+    static void DISCORD_CALLBACK OnActivityJoin(void* callbackData, char const* secret)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -24,7 +24,7 @@ class ActivityEvents final {
         module.OnActivityJoin(static_cast<const char*>(secret));
     }
 
-    static void OnActivitySpectate(void* callbackData, char const* secret)
+    static void DISCORD_CALLBACK OnActivitySpectate(void* callbackData, char const* secret)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -35,7 +35,7 @@ class ActivityEvents final {
         module.OnActivitySpectate(static_cast<const char*>(secret));
     }
 
-    static void OnActivityJoinRequest(void* callbackData, DiscordUser* user)
+    static void DISCORD_CALLBACK OnActivityJoinRequest(void* callbackData, DiscordUser* user)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -46,10 +46,10 @@ class ActivityEvents final {
         module.OnActivityJoinRequest(*reinterpret_cast<User const*>(user));
     }
 
-    static void OnActivityInvite(void* callbackData,
-                                 EDiscordActivityActionType type,
-                                 DiscordUser* user,
-                                 DiscordActivity* activity)
+    static void DISCORD_CALLBACK OnActivityInvite(void* callbackData,
+                                                  EDiscordActivityActionType type,
+                                                  DiscordUser* user,
+                                                  DiscordActivity* activity)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
      */
     #pragma once
+    #include <utils/safe_win32.h>
     #include "errors.h"
@@ Expand Down @@