From Testing to Master

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
           - Ubuntu 18.04 Clang
           - Windows 2019 MSVC
           # - Windows 2019 GCC
-          - macOS 10.14 GCC
-          - macOS 10.14 Clang
+          - macOS 10.15 GCC
+          - macOS 10.15 Clang
         include:
           - name: Ubuntu 16.04 GCC
             os: ubuntu-16.04
@@ -52,13 +52,13 @@ jobs:
           #   cmake-args: -G Ninja
           #   packages: ninja
 
-          - name: macOS 10.14 GCC
-            os: macOS-10.14
+          - name: macOS 10.15 GCC
+            os: macOS-latest
             compiler: gcc
             cpp-compiler: g++
 
-          - name: macOS 10.14 Clang
-            os: macOS-10.14
+          - name: macOS 10.15 Clang
+            os: macOS-latest
             compiler: clang
             cpp-compiler: clang++
 
@@ -77,7 +77,7 @@ jobs:
           choco install ${{ matrix.packages }}
 
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Generate project files
         run: |

.github/workflows/release.yml

@@ -17,8 +17,8 @@ jobs:
           - Windows 2019 MSVC win32 +static
           - Windows 2019 MSVC win64
           - Windows 2019 MSVC win64 +static
-          - macOS 10.14 Clang
-          - macOS 10.14 Clang +static
+          - macOS 10.15 Clang
+          - macOS 10.15 Clang +static
         include:
           - name: Ubuntu 18.04 GCC+libcurl-gnutls
             os: ubuntu-18.04
@@ -49,12 +49,12 @@ jobs:
             cmake-args: -A x64 -DBUILD_SHARED_LIBS=OFF
             artifact-name: x86_64-windows-msvc+static
 
-          - name: macOS 10.14 Clang
-            os: macOS-10.14
+          - name: macOS 10.15 Clang
+            os: macOS-latest
             artifact-name: x86_64-apple-darwin
 
-          - name: macOS 10.14 Clang +static
-            os: macOS-10.14
+          - name: macOS 10.15 Clang +static
+            os: macOS-latest
             cmake-args: -DBUILD_SHARED_LIBS=OFF
             artifact-name: x86_64-apple-darwin+static
 
@@ -68,7 +68,7 @@ jobs:
           sudo apt-get install libcurl4-gnutls-dev
 
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Generate project files
         run: |
@@ -108,18 +108,18 @@ jobs:
         uses: peaceiris/actions-mdbook@v1
 
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Checkout wiki
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           repository: modio/SDK.wiki
-          ref: master
+          path: wiki
 
       - name: Build
         run: |
           mkdir -p book/src
-          cp ../SDK.wiki/*.md book/src/
+          cp wiki/*.md book/src/
           rename.ul '::' '__' book/src/*
           cd book
           cat src/_Sidebar.md | ./linkfix.py summary > src/SUMMARY.md
@@ -144,7 +144,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Download Linux
         uses: actions/download-artifact@v1

README.md

@@ -3,7 +3,6 @@
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/modio/SDK/blob/master/LICENSE)
 [![Discord](https://img.shields.io/discord/389039439487434752.svg?label=Discord&logo=discord&color=7289DA&labelColor=2C2F33)](https://discord.mod.io)
 [![Master docs](https://img.shields.io/badge/docs-master-green.svg)](https://github.com/modio/SDK/wiki)
-[![Travis](https://img.shields.io/travis/modio/SDK.svg?logo=travis)](https://travis-ci.org/modio/SDK)
 [![GitHub Action](https://github.com/modio/SDK/workflows/ci/badge.svg)](https://github.com/modio/SDK/actions)
 
 Welcome to the [mod.io SDK](https://apps.mod.io/sdk) repository, built using C and C++. It allows game developers to host and automatically install user-created mods in their games. It connects to the [mod.io API](https://docs.mod.io), and [documentation for its functions](https://github.com/modio/SDK/wiki) can be viewed here.

include/c++/schemas/Error.h

@@ -12,6 +12,7 @@ class Error
 {
 public:
   u32 code;
+  u32 error_ref;
   std::string message;
   std::vector<std::string> errors;
 

include/c/ModioC.h

@@ -52,6 +52,7 @@ typedef int i32;
 #define MODIO_EVENT_USER_TEAM_LEAVE   6
 #define MODIO_EVENT_USER_SUBSCRIBE    7
 #define MODIO_EVENT_USER_UNSUBSCRIBE  8
+#define MODIO_EVENT_MOD_DELETED       9
 
 // Presentation Option Constants
 #define MODIO_GRID_VIEW   0
@@ -266,7 +267,7 @@ extern "C"
     char* thumb_640x360;
     char* thumb_1280x720;
   };
-  
+
   struct ModioIcon
   {
     char* filename;
@@ -304,6 +305,7 @@ extern "C"
   struct ModioError
   {
     u32 code;
+    u32 error_ref;
     char* message;
     char** errors_array;
     u32 errors_array_size;
@@ -469,7 +471,7 @@ extern "C"
 	  char* path;
 	  ModioMod mod;
   };
-  
+
   struct ModioQueuedModDownload
   {
     u32 state;
@@ -689,8 +691,8 @@ extern "C"
   void MODIO_DLL modioCancelModDownload(u32 mod_id);
   void MODIO_DLL modioResumeDownloads(void);
   void MODIO_DLL modioPrioritizeModDownload(u32 mod_id);
-  void MODIO_DLL modioSetDownloadListener(void (*callback)(u32 response_code, u32 mod_id));  
-  void MODIO_DLL modioSetUploadListener(void (*callback)(u32 response_code, u32 mod_id));  
+  void MODIO_DLL modioSetDownloadListener(void (*callback)(u32 response_code, u32 mod_id));
+  void MODIO_DLL modioSetUploadListener(void (*callback)(u32 response_code, u32 mod_id));
   u32 MODIO_DLL modioGetModDownloadQueueCount(void);
   void MODIO_DLL modioGetModDownloadQueue(ModioQueuedModDownload* download_queue);
   u32 MODIO_DLL modioGetModfileUploadQueueCount(void);
@@ -712,7 +714,7 @@ extern "C"
   //Comment Methods
   void MODIO_DLL modioGetAllModComments(void* object, u32 mod_id, ModioFilterCreator filter, void (*callback)(void* object, ModioResponse response, ModioComment comments[], u32 comments_size));
   void MODIO_DLL modioGetAllModCommentsFilterString(void* object, u32 mod_id, char const* filter_string, u32 cache_max_age_seconds, void (*callback)(void* object, ModioResponse response, ModioComment comments[], u32 comments_size));
-  void MODIO_DLL modioGetModComment(void* object, u32 mod_id, u32 comment_id, void (*callback)(void* object, ModioResponse response, ModioComment comment));  
+  void MODIO_DLL modioGetModComment(void* object, u32 mod_id, u32 comment_id, void (*callback)(void* object, ModioResponse response, ModioComment comment));
   void MODIO_DLL modioDeleteModComment(void* object, u32 mod_id, u32 comment_id, void(*callback)(void* object, ModioResponse response));
 
   //Reports Methods
@@ -728,7 +730,7 @@ extern "C"
   void MODIO_DLL modioFreeQueuedModDownload(ModioQueuedModDownload* queued_mod_download);
   void MODIO_DLL modioFreeQueuedModfileUpload(ModioQueuedModfileUpload* queued_modfile_upload);
 
-  // General Utility Methods 
+  // General Utility Methods
   void MODIO_DLL compressFiles(char const* root_directory, char const* const filenames[], u32 filenames_size, char const* zip_path);
   void MODIO_DLL extractFiles(char const* zip_path, char const* directory_path);
   void MODIO_DLL windowsUTF8ToAnsi(const char* UTF8_string, char* ansi_string);

include/c/methods/callbacks/MeCallbacks.h

@@ -18,10 +18,10 @@ struct GetAuthenticatedUserParams
 
 struct GetUserSubscriptionsParams
 {
-  void* object;
   std::string url;
   bool is_cache;
-  void (*callback)(void* object, ModioResponse response, ModioMod mods[], u32 mods_size);
+  std::vector<void*> objects;
+  std::vector<void(*)(void* object, ModioResponse response, ModioMod mods[], u32 mods_size)> callbacks;
 };
 
 struct GetUserEventsParams

include/wrappers/CurlWrapper.h

@@ -41,7 +41,7 @@ void downloadMod(QueuedModDownload *queued_mod_download);
 void queueModDownload(ModioMod& modio_mod);
 void uploadModfile(QueuedModfileUpload *queued_modfile_upload);
 void queueModfileUpload(u32 mod_id, ModioModfileCreator *modio_modfile_creator);
-void removeDownloadedModfile(u32 mod_id);
+void removeDownloadedMod(u32 mod_id);
 
 }
 }

src/Globals.cpp

@@ -3,7 +3,7 @@
 
 namespace modio
 {
-  std::string VERSION = "v0.12.14 DEV";
+  std::string VERSION = "v0.12.15 DEV";
   std::string API_KEY;
   std::string ACCESS_TOKEN = "";
   u32 GAME_ID;