Added mod event listener and updated plugin filters

modio · Oct 7, 2019 · 7e37e0f · 7e37e0f
1 parent a14c25a
commit 7e37e0f
Show file tree

Hide file tree

Showing 42 changed files with 110 additions and 0 deletions.
diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini
@@ -6,3 +6,6 @@
 ;    /README.txt
 ;    /Extras/...
 ;    /Binaries/ThirdParty/*.dll
+/Img/...
+/Resources/...
+/README.md
diff --git a/Source/ThirdParty/mod.io-sdk-v0.11.3-DEV/bin/visualc++/x64/modio.dll b/Source/ThirdParty/mod.io-sdk-v0.11.3-DEV/bin/visualc++/x64/modio.dll
diff --git a/Source/modio/Private/BlueprintCallbackProxies/CallbackProxy_SetModEventListener.cpp b/Source/modio/Private/BlueprintCallbackProxies/CallbackProxy_SetModEventListener.cpp
@@ -0,0 +1,49 @@
+// Copyright 2019 modio. All Rights Reserved.
+// Released under MIT.
+
+#include "BlueprintCallbackProxies/CallbackProxy_SetModEventListener.h"
+#include "ModioUE4Utility.h"
+#include "ModioSubsystem.h"
+#include "Engine/Engine.h"
+
+UCallbackProxy_SetModEventListener::UCallbackProxy_SetModEventListener(const FObjectInitializer &ObjectInitializer)
+    : Super(ObjectInitializer)
+{
+}
+
+UCallbackProxy_SetModEventListener *UCallbackProxy_SetModEventListener::SetModEventListener(UObject *WorldContext)
+{
+  UCallbackProxy_SetModEventListener *Proxy = NewObject<UCallbackProxy_SetModEventListener>();
+  Proxy->SetFlags(RF_StrongRefOnFrame);
+  Proxy->WorldContextObject = WorldContext;
+  return Proxy;
+}
+
+void UCallbackProxy_SetModEventListener::Activate()
+{
+  UWorld* World = GEngine->GetWorldFromContextObject( WorldContextObject, EGetWorldErrorMode::LogAndReturnNull );
+  FModioSubsystemPtr Modio = FModioSubsystem::Get( World );
+  if( Modio.IsValid() )
+  {
+    Modio->SetModEventListener( FModioModEventArrayDelegate::CreateUObject( this, &UCallbackProxy_SetModEventListener::OnModEventDelegate ) );
+  }
+  else
+  {
+    // @todonow: Make something more pretty than this
+    FModioResponse Response;
+    TArray<FModioModEvent> ModEvents;
+    OnFailure.Broadcast( Response, ModEvents );
+  }
+}
+
+void UCallbackProxy_SetModEventListener::OnModEventDelegate(FModioResponse Response, const TArray<FModioModEvent> &ModEvents)
+{
+  if (Response.Code >= 200 && Response.Code < 300)
+  {
+    OnSuccess.Broadcast(Response, ModEvents);
+  }
+  else
+  {
+    OnFailure.Broadcast(Response, ModEvents);
+  }
+}
diff --git a/Source/modio/Private/ModioSubsystem.cpp b/Source/modio/Private/ModioSubsystem.cpp
@@ -13,6 +13,7 @@
 
 FModioListenerDelegate FModioSubsystem::ModioOnModDownloadDelegate;
 FModioListenerDelegate FModioSubsystem::ModioOnModUploadDelegate;
+FModioModEventArrayDelegate FModioSubsystem::ModioOnModEventDelegate;
 
 FModioSubsystem::FModioSubsystem() :
   bInitialized(false)
@@ -687,6 +688,11 @@ void FModioSubsystem::SetModfileUploadListener(FModioListenerDelegate Delegate)
   FModioSubsystem::ModioOnModUploadDelegate = Delegate;
 }
 
+void FModioSubsystem::SetModEventListener(FModioModEventArrayDelegate Delegate)
+{
+  FModioSubsystem::ModioOnModEventDelegate = Delegate;
+}
+
 TEnumAsByte<EModioModState> FModioSubsystem::GetModState(int32 ModId)
 {
   u32 ModState = modioGetModState((u32)ModId);
@@ -714,6 +720,13 @@ void onModUpload(u32 response_code, u32 mod_id)
   FModioSubsystem::ModioOnModUploadDelegate.ExecuteIfBound( (int32)response_code, (int32)mod_id );
 }
 
+void onModEvent(ModioResponse ModioResponse, ModioModEvent* ModioEventsArray, u32 ModioEventsArraySize)
+{
+  FModioResponse Response;
+  InitializeResponse( Response, ModioResponse );
+  FModioSubsystem::ModioOnModEventDelegate.ExecuteIfBound( Response, ConvertToTArrayModEvents(ModioEventsArray, ModioEventsArraySize) );
+}
+
 void FModioSubsystem::Init( const FString& RootDirectory, uint32 GameId, const FString& ApiKey, bool bIsLiveEnvironment, bool bInstallOnModDownload, bool bRetrieveModsFromOtherGames )
 {
   check(!bInitialized);
@@ -729,6 +742,8 @@ void FModioSubsystem::Init( const FString& RootDirectory, uint32 GameId, const F
 
   modioSetUploadListener(&onModUpload);
 
+  modioSetEventListener(&onModEvent);
+
   bInitialized = true;
 }
 

diff --git a/Source/modio/Public/BlueprintCallbackProxies/CallbackProxy_SetModEventListener.h b/Source/modio/Public/BlueprintCallbackProxies/CallbackProxy_SetModEventListener.h
@@ -0,0 +1,39 @@
+// Copyright 2019 modio. All Rights Reserved.
+// Released under MIT.
+
+#pragma once
+
+#include "Schemas/ModioModEvent.h"
+#include "ModioSubsystem.h"
+#include "Net/OnlineBlueprintCallProxyBase.h"
+#include "CallbackProxy_SetModEventListener.generated.h"
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(
+    FOnModEventResult,
+    FModioResponse,
+    Response,
+    const TArray<FModioModEvent> &,
+    ModEvents);
+
+UCLASS()
+class MODIO_API UCallbackProxy_SetModEventListener : public UOnlineBlueprintCallProxyBase
+{
+  GENERATED_UCLASS_BODY()
+
+  // The world context object in which this call is taking place
+  UPROPERTY()
+  UObject* WorldContextObject;
+
+  UPROPERTY(BlueprintAssignable)
+  FOnModEventResult OnSuccess;
+
+  UPROPERTY(BlueprintAssignable)
+  FOnModEventResult OnFailure;
+
+  UFUNCTION(BlueprintCallable, Category = "mod.io", meta = (BlueprintInternalUseOnly = "true", DefaultToSelf="WorldContext"))
+  static UCallbackProxy_SetModEventListener *SetModEventListener(UObject *WorldContext);
+
+  virtual void Activate() override;
+
+  virtual void OnModEventDelegate(FModioResponse Response, const TArray<FModioModEvent> &ModEvents);
+};
diff --git a/Source/modio/Public/ModioSubsystem.h b/Source/modio/Public/ModioSubsystem.h
@@ -12,6 +12,7 @@
 #include "Schemas/ModioInstalledMod.h"
 #include "Schemas/ModioQueuedModDownload.h"
 #include "Schemas/ModioQueuedModfileUpload.h"
+#include "Schemas/ModioModEvent.h"
 #include "Enums/ModioModSortType.h"
 #include "Enums/ModioModState.h"
 #include "Enums/ModioRatingType.h"
@@ -143,6 +144,8 @@ struct MODIO_API FModioSubsystem : public TSharedFromThis<FModioSubsystem, ESPMo
   void SetModDownloadListener(FModioListenerDelegate Delegate);
   /** Callback triggered every time a local mod finished uploading to mod.io */
   void SetModfileUploadListener(FModioListenerDelegate Delegate);
+  /** Callback triggered every time an event is found mod.io */
+  void SetModEventListener(FModioModEventArrayDelegate Delegate);
   /** Returns the state of the corresponding mod */  
   TEnumAsByte<EModioModState> GetModState(int32 ModId);
   /** Places the given mod at the top of the donload queue */
@@ -207,6 +210,7 @@ struct MODIO_API FModioSubsystem : public TSharedFromThis<FModioSubsystem, ESPMo
   /** Download and upload delegate listeners */
   static FModioListenerDelegate ModioOnModDownloadDelegate;
   static FModioListenerDelegate ModioOnModUploadDelegate;
+  static FModioModEventArrayDelegate ModioOnModEventDelegate;
 
 protected:
   friend class FModioModule;

diff --git a/img/BPExamples/email_exchange.png b/img/BPExamples/email_exchange.png
diff --git a/img/BPExamples/email_request.png b/img/BPExamples/email_request.png
diff --git a/img/BPExamples/get_all_installed_mods.png b/img/BPExamples/get_all_installed_mods.png
diff --git a/img/BPExamples/get_all_mods.png b/img/BPExamples/get_all_mods.png
diff --git a/img/BPExamples/get_download_queue.png b/img/BPExamples/get_download_queue.png
diff --git a/img/BPExamples/install_downloaded_mods.png b/img/BPExamples/install_downloaded_mods.png
diff --git a/img/BPExamples/is_logged_in.png b/img/BPExamples/is_logged_in.png
diff --git a/img/BPExamples/logout.png b/img/BPExamples/logout.png
diff --git a/img/BPExamples/on_mod_download.png b/img/BPExamples/on_mod_download.png
diff --git a/img/BPExamples/on_modfile_upload.png b/img/BPExamples/on_modfile_upload.png
diff --git a/img/BPExamples/process.png b/img/BPExamples/process.png
diff --git a/img/BPExamples/settings.png b/img/BPExamples/settings.png
diff --git a/img/Structs/ModioAvatar.png b/img/Structs/ModioAvatar.png
diff --git a/img/Structs/ModioDownload.png b/img/Structs/ModioDownload.png
diff --git a/img/Structs/ModioError.png b/img/Structs/ModioError.png
diff --git a/img/Structs/ModioFilehash.png b/img/Structs/ModioFilehash.png
diff --git a/img/Structs/ModioImage.png b/img/Structs/ModioImage.png
diff --git a/img/Structs/ModioInstalledMod.png b/img/Structs/ModioInstalledMod.png
diff --git a/img/Structs/ModioLogo.png b/img/Structs/ModioLogo.png
diff --git a/img/Structs/ModioMedia.png b/img/Structs/ModioMedia.png
diff --git a/img/Structs/ModioMetadataKVP.png b/img/Structs/ModioMetadataKVP.png
diff --git a/img/Structs/ModioMod.png b/img/Structs/ModioMod.png
diff --git a/img/Structs/ModioModCreator.png b/img/Structs/ModioModCreator.png
diff --git a/img/Structs/ModioModDependency.png b/img/Structs/ModioModDependency.png
diff --git a/img/Structs/ModioModEditor.png b/img/Structs/ModioModEditor.png
diff --git a/img/Structs/ModioModEvent.png b/img/Structs/ModioModEvent.png
diff --git a/img/Structs/ModioModTag.png b/img/Structs/ModioModTag.png
diff --git a/img/Structs/ModioModfile.png b/img/Structs/ModioModfile.png
diff --git a/img/Structs/ModioModfileCreator.png b/img/Structs/ModioModfileCreator.png
diff --git a/img/Structs/ModioQueuedModDownload.png b/img/Structs/ModioQueuedModDownload.png
diff --git a/img/Structs/ModioQueuedModfileUpload.png b/img/Structs/ModioQueuedModfileUpload.png
diff --git a/img/Structs/ModioRating.png b/img/Structs/ModioRating.png
diff --git a/img/Structs/ModioResponse.png b/img/Structs/ModioResponse.png
diff --git a/img/Structs/ModioStats.png b/img/Structs/ModioStats.png
diff --git a/img/Structs/ModioUser.png b/img/Structs/ModioUser.png
diff --git a/img/Structs/ModioUserEvent.png b/img/Structs/ModioUserEvent.png