Add membership status and type. Add debugging symbols. (#29)

KGronek-Pubnub · web-flow · commit bed045c55a4d · 2025-04-29T12:34:02.000+02:00
add(membership): Membership Status and Type
Add dedicated structure to hold Membership CustomJson, Status and Type
add(build): Add debugging symbols
fix(membership): Fix bugs that sometimes Membership CustomData was set from Channel CustomData
diff --git a/PubnubChat.uplugin b/PubnubChat.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 15,
-	"VersionName": "0.3.2",
+	"Version": 16,
+	"VersionName": "0.4.0",
 	"FriendlyName": "Pubnub Chat SDK",
 	"Description": "Quickly and easily integrate a real-time text chat solution that is reliable, flexible, and scalable.",
 	"Category": "Code",
diff --git a/Source/PubnubChatSDK/Private/PubnubChannel.cpp b/Source/PubnubChatSDK/Private/PubnubChannel.cpp
@@ -133,8 +133,7 @@ void UPubnubChannel::Disconnect()
 		UE_LOG(PubnubChatLog, Error, TEXT("Channel Disconnect error: %s"), UTF8_TO_TCHAR(Exception.what()));
 	}
 }
-
-UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData)
+UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FPubnubChatMembershipData MembershipData)
 {
 	if(!IsInternalChannelValid()) {return nullptr;}
 
@@ -149,7 +148,7 @@ UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived Messag
 			});
 
 		};
-		auto CppCallbackStop = InternalChannel->join(lambda, UPubnubChatUtilities::FStringToPubnubString(CustomData));
+		auto CppCallbackStop = InternalChannel->join(lambda, MembershipData.GetCppChatMembershipData());
 		return UPubnubCallbackStop::Create(CppCallbackStop);
 	}
 	catch (std::exception& Exception)
@@ -158,6 +157,10 @@ UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived Messag
 		return nullptr;
 	}
 }
+UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData)
+{
+	return this->Join(MessageCallback, FPubnubChatMembershipData(CustomData, "", ""));
+}
 
 void UPubnubChannel::Leave()
 {
diff --git a/Source/PubnubChatSDK/Private/PubnubChat.cpp b/Source/PubnubChatSDK/Private/PubnubChat.cpp
@@ -59,14 +59,14 @@ UPubnubChannel* UPubnubChat::CreatePublicConversation(FString ChannelID, FPubnub
 	return nullptr;
 }
 
-FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)
+FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData)
 {
 	if(!IsInternalChatValid()) {return FPubnubCreatedChannelWrapper();}
 	
 	try
 	{
 		auto CppUsers = UPubnubChatUtilities::UnrealUsersToCppUsers(Users);
-		auto CppWrapper = InternalChat->create_group_conversation(CppUsers, UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), UPubnubChatUtilities::FStringToPubnubString(MembershipData));
+		auto CppWrapper = InternalChat->create_group_conversation(CppUsers, UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), MembershipData.GetCppChatMembershipData());
 		FPubnubCreatedChannelWrapper UEWrapper(CppWrapper);
 		return UEWrapper;
 	}
@@ -77,13 +77,23 @@ FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnub
 	return FPubnubCreatedChannelWrapper();
 }
 
-FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)
+FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)
+{
+	return this->CreateGroupConversation(Users, ChannelID, ChannelData, FPubnubChatMembershipData(MembershipData, "", ""));
+}
+
+FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData)
 {
 	if(!IsInternalChatValid()) {return FPubnubCreatedChannelWrapper();}
+	if(!User)
+	{
+		UE_LOG(PubnubChatLog, Error, TEXT("Create Direct Conversation error: User is invalid"));
+		return FPubnubCreatedChannelWrapper();
+	}
 	
 	try
 	{
-		auto CppWrapper = InternalChat->create_direct_conversation(*User->GetInternalUser(), UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), UPubnubChatUtilities::FStringToPubnubString(MembershipData));
+		auto CppWrapper = InternalChat->create_direct_conversation(*User->GetInternalUser(), UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), MembershipData.GetCppChatMembershipData());
 		FPubnubCreatedChannelWrapper UEWrapper(CppWrapper);
 		return UEWrapper;
 	}
@@ -94,6 +104,11 @@ FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser*
 	return FPubnubCreatedChannelWrapper();
 }
 
+FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)
+{
+	return this->CreateDirectConversation(User, ChannelID, ChannelData, FPubnubChatMembershipData(MembershipData, "", ""));
+}
+
 UPubnubChannel* UPubnubChat::GetChannel(FString ChannelID)
 {
 	if(!IsInternalChatValid()) {return nullptr;}
diff --git a/Source/PubnubChatSDK/Private/PubnubMembership.cpp b/Source/PubnubChatSDK/Private/PubnubMembership.cpp
@@ -25,7 +25,7 @@ FString UPubnubMembership::GetCustomData()
 
 	try
 	{
-		return UPubnubChatUtilities::PubnubStringToFString(InternalMembership->custom_data());
+		return UPubnubChatUtilities::PubnubStringToFString(InternalMembership->membership_data().custom_data_json);
 	}
 	catch (std::exception& Exception)
 	{
@@ -34,18 +34,38 @@ FString UPubnubMembership::GetCustomData()
 	return "";
 }
 
+FPubnubChatMembershipData UPubnubMembership::GetMembershipData()
+{
+	if(!IsInternalMembershipValid()) {return FPubnubChatMembershipData();}
+
+	try
+	{
+		return FPubnubChatMembershipData(InternalMembership->membership_data());
+	}
+	catch (std::exception& Exception)
+	{
+		UE_LOG(PubnubChatLog, Error, TEXT("Get Membership Data error: %s"), UTF8_TO_TCHAR(Exception.what()));
+	}
+	return FPubnubChatMembershipData();
+}
+
 UPubnubMembership* UPubnubMembership::Update(FString CustomData)
+{
+	return this->Update(FPubnubChatMembershipData{CustomData, "", ""});
+}
+
+UPubnubMembership* UPubnubMembership::Update(FPubnubChatMembershipData MembershipData)
 {
 	if(!IsInternalMembershipValid()) {return nullptr;}
 
 	try
 	{
-		auto CppMembership = InternalMembership->update(UPubnubChatUtilities::FStringToPubnubString(CustomData));
+		auto CppMembership = InternalMembership->update(MembershipData.GetCppChatMembershipData());
 		return Create(CppMembership);
 	}
 	catch (std::exception& Exception)
 	{
-		UE_LOG(PubnubChatLog, Error, TEXT("Membership Update error: %s"), UTF8_TO_TCHAR(Exception.what()));
+		UE_LOG(PubnubChatLog, Error, TEXT("Update Membership error: %s"), UTF8_TO_TCHAR(Exception.what()));
 	}
 	return nullptr;
 }
diff --git a/Source/PubnubChatSDK/Public/PubnubChannel.h b/Source/PubnubChatSDK/Public/PubnubChannel.h
@@ -105,7 +105,8 @@ class PUBNUBCHATSDK_API UPubnubChannel : public UObject
 	void Disconnect();
 	
 	UFUNCTION(BlueprintCallable, Category = "Pubnub Channel")
-	UPubnubCallbackStop* Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData = "");
+	UPubnubCallbackStop* Join(FOnPubnubChannelMessageReceived MessageCallback, FPubnubChatMembershipData MembershipData = FPubnubChatMembershipData());
+	UPubnubCallbackStop* Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData);
 
 	UFUNCTION(BlueprintCallable, Category = "Pubnub Channel")
 	void Leave();
diff --git a/Source/PubnubChatSDK/Public/PubnubChat.h b/Source/PubnubChatSDK/Public/PubnubChat.h
@@ -228,10 +228,12 @@ class PUBNUBCHATSDK_API UPubnubChat : public UObject
 	UPubnubChannel* CreatePublicConversation(FString ChannelID, FPubnubChatChannelData ChannelData);
 
 	UFUNCTION(BlueprintCallable, Category="Pubnub Chat|Channel")
-	FPubnubCreatedChannelWrapper CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData = "");
+	FPubnubCreatedChannelWrapper CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData = FPubnubChatMembershipData());
+	FPubnubCreatedChannelWrapper CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData);
 
 	UFUNCTION(BlueprintCallable, Category="Pubnub Chat|Channel")
-	FPubnubCreatedChannelWrapper CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData = "");
+	FPubnubCreatedChannelWrapper CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData = FPubnubChatMembershipData());
+	FPubnubCreatedChannelWrapper CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData);
 
 	UFUNCTION(BlueprintCallable, Category="Pubnub Chat|Channel")
 	UPubnubChannel* GetChannel(FString ChannelID);
diff --git a/Source/PubnubChatSDK/Public/PubnubChatStructLibrary.h b/Source/PubnubChatSDK/Public/PubnubChatStructLibrary.h
@@ -107,6 +107,39 @@ struct FPubnubChatUserData
 	}
 };
 
+USTRUCT(BlueprintType)
+struct FPubnubChatMembershipData
+{
+	GENERATED_BODY()
+	
+	UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "PubnubChat") FString CustomDataJson = "";
+	UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "PubnubChat") FString Status = "";
+	UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "PubnubChat") FString Type = "";
+
+	FPubnubChatMembershipData() = default;
+	
+	FPubnubChatMembershipData(const FString& InCustomDataJson, const FString& InStatus, const FString& InType)
+	: CustomDataJson(InCustomDataJson), Status(InStatus), Type(InType)
+	{};
+	FPubnubChatMembershipData(Pubnub::ChatMembershipData ChatMembershipData) :
+	CustomDataJson(UPubnubChatUtilities::PubnubStringToFString(ChatMembershipData.custom_data_json)),
+	Status(UPubnubChatUtilities::PubnubStringToFString(ChatMembershipData.status)),
+	Type(UPubnubChatUtilities::PubnubStringToFString(ChatMembershipData.type))
+	{};
+
+	//Internal use only
+	Pubnub::ChatMembershipData GetCppChatMembershipData()
+	{
+		return Pubnub::ChatMembershipData(
+			{
+				UPubnubChatUtilities::FStringToPubnubString(CustomDataJson),
+				UPubnubChatUtilities::FStringToPubnubString(Status),
+				UPubnubChatUtilities::FStringToPubnubString(Type)
+		});
+	}
+};
+
+
 USTRUCT(BlueprintType)
 struct FPubnubMessageAction
 {
diff --git a/Source/PubnubChatSDK/Public/PubnubMembership.h b/Source/PubnubChatSDK/Public/PubnubMembership.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "UObject/NoExportTypes.h"
 #include <pubnub_chat/membership.hpp>
+#include "PubnubChatStructLibrary.h"
 #include "PubnubMembership.generated.h"
 
 class UPubnubChannel;
@@ -32,10 +33,15 @@ class PUBNUBCHATSDK_API UPubnubMembership : public UObject
 	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Pubnub Membership")
 	UPubnubUser* GetUser() {return User;};
 
-	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Pubnub Membership")
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Pubnub Membership", meta=(DeprecatedFunction,
+		DeprecationMessage="Function has been deprecated, Please use function GetMembershipData instead - it returns more Membership information"))
 	FString GetCustomData();
 
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Pubnub Membership")
+	FPubnubChatMembershipData GetMembershipData();
+	
 	UFUNCTION(BlueprintCallable, Category = "Pubnub Membership")
+	UPubnubMembership* Update(FPubnubChatMembershipData MembershipData);
 	UPubnubMembership* Update(FString CustomData);
 
 	UFUNCTION(BlueprintCallable, Category = "Pubnub Membership")
diff --git a/Source/ThirdParty/sdk/ChatSDKModule/ChatSDKModule.Build.cs b/Source/ThirdParty/sdk/ChatSDKModule/ChatSDKModule.Build.cs
@@ -23,13 +23,15 @@ public ChatSDKModule(ReadOnlyTargetRules Target) : base(Target)
 			
 			PublicDelayLoadDLLs.Add("pubnub-chat.dll");
 			
-			// Ensure that the DLL is staged along with the executable
+			// Ensure that the DLL is staged along with the executable and pdb in Debug/Development build
 			RuntimeDependencies.Add("$(BinaryOutputDir)/pubnub-chat.dll", "$(PluginDir)/Source/ThirdParty/sdk/lib/win64/pubnub-chat.dll");
+			RuntimeDependencies.Add("$(BinaryOutputDir)/pubnub-chat.pdb", "$(PluginDir)/Source/ThirdParty/sdk/lib/win64/pubnub-chat.pdb", StagedFileType.DebugNonUFS);
 		}
 		else if(Target.Platform == UnrealTargetPlatform.Mac)
 		{
 			PublicDelayLoadDLLs.Add(Path.Combine(SDKPath, "lib", "macos", "libpubnub-chat.dylib"));
 			RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.dylib", "$(PluginDir)/Source/ThirdParty/sdk/lib/macos/libpubnub-chat.dylib");
+			RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.dSYM", "$(PluginDir)/Source/ThirdParty/sdk/lib/macos/libpubnub-chat.dSYM", StagedFileType.DebugNonUFS);
 		}
 		else if(Target.Platform == UnrealTargetPlatform.Linux)
 		{
@@ -38,6 +40,7 @@ public ChatSDKModule(ReadOnlyTargetRules Target) : base(Target)
 			PublicAdditionalLibraries.Add(LibPath);
 			PublicDelayLoadDLLs.Add(LibPath);
 			RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.so", LibPath);
+			RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.so.debug", Path.Combine(SDKPath, "lib", "Linux", "libpubnub-chat.so.debug"), StagedFileType.DebugNonUFS);
 		}
 
 		PublicIncludePaths.AddRange(
diff --git a/Source/ThirdParty/sdk/include/pubnub_chat/channel.hpp b/Source/ThirdParty/sdk/include/pubnub_chat/channel.hpp
@@ -40,6 +40,7 @@ namespace Pubnub
     class User;
     class MessageDraft;
     struct EventsHistoryWrapper;
+    struct ChatMembershipData;
 
     struct ChatChannelData
     {
@@ -81,6 +82,7 @@ namespace Pubnub
             Pubnub::Channel update(const ChatChannelData& in_additional_channel_data) const;
             Pubnub::CallbackHandle connect(std::function<void(Message)> message_callback) const;
             Pubnub::CallbackHandle join(std::function<void(Message)> message_callback, const Pubnub::String& additional_params = "") const;
+            Pubnub::CallbackHandle join(std::function<void(Message)> message_callback, const Pubnub::ChatMembershipData& membership_data) const;
             void disconnect() const;
             void leave() const;
             void delete_channel() const;
diff --git a/Source/ThirdParty/sdk/include/pubnub_chat/chat.hpp b/Source/ThirdParty/sdk/include/pubnub_chat/chat.hpp
@@ -120,7 +120,9 @@ namespace Pubnub {
 
             PN_CHAT_EXPORT Pubnub::Channel create_public_conversation(const Pubnub::String& channel_id, const ChatChannelData& channel_data) const;
             PN_CHAT_EXPORT CreatedChannelWrapper create_direct_conversation(const Pubnub::User& user, const Pubnub::String& channel_id, const ChatChannelData& channel_data, const Pubnub::String& membership_data = "") const;
+            PN_CHAT_EXPORT CreatedChannelWrapper create_direct_conversation(const Pubnub::User& user, const Pubnub::String& channel_id, const ChatChannelData& channel_data, const Pubnub::ChatMembershipData& membership_data) const;
             PN_CHAT_EXPORT CreatedChannelWrapper create_group_conversation(Pubnub::Vector<Pubnub::User> users, const Pubnub::String& channel_id, const ChatChannelData& channel_data, const Pubnub::String& membership_data = "") const;
+            PN_CHAT_EXPORT CreatedChannelWrapper create_group_conversation(Pubnub::Vector<Pubnub::User> users, const Pubnub::String& channel_id, const ChatChannelData& channel_data, const Pubnub::ChatMembershipData& membership_data) const;
             PN_CHAT_EXPORT Channel get_channel(const Pubnub::String& channel_id) const;
             PN_CHAT_EXPORT ChannelsResponseWrapper get_channels(const Pubnub::String& filter = "", const Pubnub::String& sort = "", int limit = 0, const Pubnub::Page& page = Pubnub::Page()) const;
             PN_CHAT_EXPORT Pubnub::Channel update_channel(const Pubnub::String& channel_id, const ChatChannelData& channel_data) const;
diff --git a/Source/ThirdParty/sdk/include/pubnub_chat/membership.hpp b/Source/ThirdParty/sdk/include/pubnub_chat/membership.hpp
@@ -19,6 +19,13 @@ namespace Pubnub
 {
     class Message;
 
+    struct ChatMembershipData
+    {
+        Pubnub::String custom_data_json = "";
+        Pubnub::String status = "";
+        Pubnub::String type = "";
+    };
+
     PN_CHAT_EXPORT class Membership
     {
         public:
@@ -30,9 +37,12 @@ namespace Pubnub
 
             PN_CHAT_EXPORT Pubnub::Membership& operator =(const Pubnub::Membership& other);
 
+            [[deprecated("Replaced by membership_data() which contains more membership information")]]
             PN_CHAT_EXPORT Pubnub::String custom_data() const;
+            PN_CHAT_EXPORT Pubnub::ChatMembershipData membership_data() const;
 
             PN_CHAT_EXPORT Pubnub::Membership update(const Pubnub::String& custom_object_json) const;
+            PN_CHAT_EXPORT Pubnub::Membership update(const Pubnub::ChatMembershipData& membership_data) const;
             PN_CHAT_EXPORT Pubnub::String last_read_message_timetoken() const;
             PN_CHAT_EXPORT Pubnub::Membership set_last_read_message_timetoken(const Pubnub::String& timetoken) const;
             PN_CHAT_EXPORT Pubnub::Membership set_last_read_message(const Pubnub::Message& message) const;
diff --git a/Source/ThirdParty/sdk/include/pubnub_chat/string.hpp b/Source/ThirdParty/sdk/include/pubnub_chat/string.hpp
@@ -5,6 +5,7 @@
 #include <cstddef>
 #include <ostream>
 #include <string>
+#include <cstring>
 
 namespace Pubnub {
     /**
diff --git a/Source/ThirdParty/sdk/lib/Linux/libpubnub-chat.so b/Source/ThirdParty/sdk/lib/Linux/libpubnub-chat.so
diff --git a/Source/ThirdParty/sdk/lib/Linux/libpubnub-chat.so.debug b/Source/ThirdParty/sdk/lib/Linux/libpubnub-chat.so.debug
diff --git a/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Info.plist b/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.libpubnub-chat</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>
diff --git a/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/DWARF/libpubnub-chat.dylib b/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/DWARF/libpubnub-chat.dylib
diff --git a/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/Relocations/aarch64/libpubnub-chat.dylib.yml b/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/Relocations/aarch64/libpubnub-chat.dylib.yml
@@ -0,0 +1,5 @@
+---
+triple:          'arm64-apple-darwin'
+binary-path:     libpubnub-chat.dylib
+relocations:     []
+...
diff --git a/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/Relocations/x86_64/libpubnub-chat.dylib.yml b/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dSYM/Contents/Resources/Relocations/x86_64/libpubnub-chat.dylib.yml
@@ -0,0 +1,5 @@
+---
+triple:          'x86_64-apple-darwin'
+binary-path:     libpubnub-chat.dylib
+relocations:     []
+...
diff --git a/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dylib b/Source/ThirdParty/sdk/lib/MacOS/libpubnub-chat.dylib
diff --git a/Source/ThirdParty/sdk/lib/win64/pubnub-chat.dll b/Source/ThirdParty/sdk/lib/win64/pubnub-chat.dll
diff --git a/Source/ThirdParty/sdk/lib/win64/pubnub-chat.lib b/Source/ThirdParty/sdk/lib/win64/pubnub-chat.lib
diff --git a/Source/ThirdParty/sdk/lib/win64/pubnub-chat.pdb b/Source/ThirdParty/sdk/lib/win64/pubnub-chat.pdb

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ void UPubnubChannel::Disconnect()`
`133`	`133`	`UE_LOG(PubnubChatLog, Error, TEXT("Channel Disconnect error: %s"), UTF8_TO_TCHAR(Exception.what()));`
`134`	`134`	`}`
`135`	`135`	`}`
`136`		`-`
`137`		`-UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData)`
	`136`	`+UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FPubnubChatMembershipData MembershipData)`
`138`	`137`	`{`
`139`	`138`	`if(!IsInternalChannelValid()) {return nullptr;}`
`140`	`139`
`@@ -149,7 +148,7 @@ UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived Messag`
`149`	`148`	`});`
`150`	`149`
`151`	`150`	`};`
`152`		`- auto CppCallbackStop = InternalChannel->join(lambda, UPubnubChatUtilities::FStringToPubnubString(CustomData));`
	`151`	`+ auto CppCallbackStop = InternalChannel->join(lambda, MembershipData.GetCppChatMembershipData());`
`153`	`152`	`return UPubnubCallbackStop::Create(CppCallbackStop);`
`154`	`153`	`}`
`155`	`154`	`catch (std::exception& Exception)`
`@@ -158,6 +157,10 @@ UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived Messag`
`158`	`157`	`return nullptr;`
`159`	`158`	`}`
`160`	`159`	`}`
	`160`	`+UPubnubCallbackStop* UPubnubChannel::Join(FOnPubnubChannelMessageReceived MessageCallback, FString CustomData)`
	`161`	`+{`
	`162`	`+ return this->Join(MessageCallback, FPubnubChatMembershipData(CustomData, "", ""));`
	`163`	`+}`
`161`	`164`
`162`	`165`	`void UPubnubChannel::Leave()`
`163`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,14 @@ UPubnubChannel* UPubnubChat::CreatePublicConversation(FString ChannelID, FPubnub`
`59`	`59`	`return nullptr;`
`60`	`60`	`}`
`61`	`61`
`62`		`-FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)`
	`62`	`+FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData)`
`63`	`63`	`{`
`64`	`64`	`if(!IsInternalChatValid()) {return FPubnubCreatedChannelWrapper();}`
`65`	`65`
`66`	`66`	`try`
`67`	`67`	`{`
`68`	`68`	`auto CppUsers = UPubnubChatUtilities::UnrealUsersToCppUsers(Users);`
`69`		`- auto CppWrapper = InternalChat->create_group_conversation(CppUsers, UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), UPubnubChatUtilities::FStringToPubnubString(MembershipData));`
	`69`	`+ auto CppWrapper = InternalChat->create_group_conversation(CppUsers, UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), MembershipData.GetCppChatMembershipData());`
`70`	`70`	`FPubnubCreatedChannelWrapper UEWrapper(CppWrapper);`
`71`	`71`	`return UEWrapper;`
`72`	`72`	`}`
`@@ -77,13 +77,23 @@ FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnub`
`77`	`77`	`return FPubnubCreatedChannelWrapper();`
`78`	`78`	`}`
`79`	`79`
`80`		`-FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)`
	`80`	`+FPubnubCreatedChannelWrapper UPubnubChat::CreateGroupConversation(TArray<UPubnubUser*> Users, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)`
	`81`	`+{`
	`82`	`+ return this->CreateGroupConversation(Users, ChannelID, ChannelData, FPubnubChatMembershipData(MembershipData, "", ""));`
	`83`	`+}`
	`84`	`+`
	`85`	`+FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FPubnubChatMembershipData MembershipData)`
`81`	`86`	`{`
`82`	`87`	`if(!IsInternalChatValid()) {return FPubnubCreatedChannelWrapper();}`
	`88`	`+ if(!User)`
	`89`	`+ {`
	`90`	`+ UE_LOG(PubnubChatLog, Error, TEXT("Create Direct Conversation error: User is invalid"));`
	`91`	`+ return FPubnubCreatedChannelWrapper();`
	`92`	`+ }`
`83`	`93`
`84`	`94`	`try`
`85`	`95`	`{`
`86`		`- auto CppWrapper = InternalChat->create_direct_conversation(*User->GetInternalUser(), UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), UPubnubChatUtilities::FStringToPubnubString(MembershipData));`
	`96`	`+ auto CppWrapper = InternalChat->create_direct_conversation(*User->GetInternalUser(), UPubnubChatUtilities::FStringToPubnubString(ChannelID), ChannelData.GetCppChatChannelData(), MembershipData.GetCppChatMembershipData());`
`87`	`97`	`FPubnubCreatedChannelWrapper UEWrapper(CppWrapper);`
`88`	`98`	`return UEWrapper;`
`89`	`99`	`}`
`@@ -94,6 +104,11 @@ FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser*`
`94`	`104`	`return FPubnubCreatedChannelWrapper();`
`95`	`105`	`}`
`96`	`106`
	`107`	`+FPubnubCreatedChannelWrapper UPubnubChat::CreateDirectConversation(UPubnubUser* User, FString ChannelID, FPubnubChatChannelData ChannelData, FString MembershipData)`
	`108`	`+{`
	`109`	`+ return this->CreateDirectConversation(User, ChannelID, ChannelData, FPubnubChatMembershipData(MembershipData, "", ""));`
	`110`	`+}`
	`111`	`+`
`97`	`112`	`UPubnubChannel* UPubnubChat::GetChannel(FString ChannelID)`
`98`	`113`	`{`
`99`	`114`	`if(!IsInternalChatValid()) {return nullptr;}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ FString UPubnubMembership::GetCustomData()`
`25`	`25`
`26`	`26`	`try`
`27`	`27`	`{`
`28`		`- return UPubnubChatUtilities::PubnubStringToFString(InternalMembership->custom_data());`
	`28`	`+ return UPubnubChatUtilities::PubnubStringToFString(InternalMembership->membership_data().custom_data_json);`
`29`	`29`	`}`
`30`	`30`	`catch (std::exception& Exception)`
`31`	`31`	`{`
`@@ -34,18 +34,38 @@ FString UPubnubMembership::GetCustomData()`
`34`	`34`	`return "";`
`35`	`35`	`}`
`36`	`36`
	`37`	`+FPubnubChatMembershipData UPubnubMembership::GetMembershipData()`
	`38`	`+{`
	`39`	`+ if(!IsInternalMembershipValid()) {return FPubnubChatMembershipData();}`
	`40`	`+`
	`41`	`+ try`
	`42`	`+ {`
	`43`	`+ return FPubnubChatMembershipData(InternalMembership->membership_data());`
	`44`	`+ }`
	`45`	`+ catch (std::exception& Exception)`
	`46`	`+ {`
	`47`	`+ UE_LOG(PubnubChatLog, Error, TEXT("Get Membership Data error: %s"), UTF8_TO_TCHAR(Exception.what()));`
	`48`	`+ }`
	`49`	`+ return FPubnubChatMembershipData();`
	`50`	`+}`
	`51`	`+`
`37`	`52`	`UPubnubMembership* UPubnubMembership::Update(FString CustomData)`
	`53`	`+{`
	`54`	`+ return this->Update(FPubnubChatMembershipData{CustomData, "", ""});`
	`55`	`+}`
	`56`	`+`
	`57`	`+UPubnubMembership* UPubnubMembership::Update(FPubnubChatMembershipData MembershipData)`
`38`	`58`	`{`
`39`	`59`	`if(!IsInternalMembershipValid()) {return nullptr;}`
`40`	`60`
`41`	`61`	`try`
`42`	`62`	`{`
`43`		`- auto CppMembership = InternalMembership->update(UPubnubChatUtilities::FStringToPubnubString(CustomData));`
	`63`	`+ auto CppMembership = InternalMembership->update(MembershipData.GetCppChatMembershipData());`
`44`	`64`	`return Create(CppMembership);`
`45`	`65`	`}`
`46`	`66`	`catch (std::exception& Exception)`
`47`	`67`	`{`
`48`		`- UE_LOG(PubnubChatLog, Error, TEXT("Membership Update error: %s"), UTF8_TO_TCHAR(Exception.what()));`
	`68`	`+ UE_LOG(PubnubChatLog, Error, TEXT("Update Membership error: %s"), UTF8_TO_TCHAR(Exception.what()));`
`49`	`69`	`}`
`50`	`70`	`return nullptr;`
`51`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,15 @@ public ChatSDKModule(ReadOnlyTargetRules Target) : base(Target)`
`23`	`23`
`24`	`24`	`PublicDelayLoadDLLs.Add("pubnub-chat.dll");`
`25`	`25`
`26`		`- // Ensure that the DLL is staged along with the executable`
	`26`	`+ // Ensure that the DLL is staged along with the executable and pdb in Debug/Development build`
`27`	`27`	`RuntimeDependencies.Add("$(BinaryOutputDir)/pubnub-chat.dll", "$(PluginDir)/Source/ThirdParty/sdk/lib/win64/pubnub-chat.dll");`
	`28`	`+ RuntimeDependencies.Add("$(BinaryOutputDir)/pubnub-chat.pdb", "$(PluginDir)/Source/ThirdParty/sdk/lib/win64/pubnub-chat.pdb", StagedFileType.DebugNonUFS);`
`28`	`29`	`}`
`29`	`30`	`else if(Target.Platform == UnrealTargetPlatform.Mac)`
`30`	`31`	`{`
`31`	`32`	`PublicDelayLoadDLLs.Add(Path.Combine(SDKPath, "lib", "macos", "libpubnub-chat.dylib"));`
`32`	`33`	`RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.dylib", "$(PluginDir)/Source/ThirdParty/sdk/lib/macos/libpubnub-chat.dylib");`
	`34`	`+ RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.dSYM", "$(PluginDir)/Source/ThirdParty/sdk/lib/macos/libpubnub-chat.dSYM", StagedFileType.DebugNonUFS);`
`33`	`35`	`}`
`34`	`36`	`else if(Target.Platform == UnrealTargetPlatform.Linux)`
`35`	`37`	`{`
`@@ -38,6 +40,7 @@ public ChatSDKModule(ReadOnlyTargetRules Target) : base(Target)`
`38`	`40`	`PublicAdditionalLibraries.Add(LibPath);`
`39`	`41`	`PublicDelayLoadDLLs.Add(LibPath);`
`40`	`42`	`RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.so", LibPath);`
	`43`	`+ RuntimeDependencies.Add("$(BinaryOutputDir)/libpubnub-chat.so.debug", Path.Combine(SDKPath, "lib", "Linux", "libpubnub-chat.so.debug"), StagedFileType.DebugNonUFS);`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`PublicIncludePaths.AddRange(`