Skip to content

Commit 483aab0

Browse files
KGronek-PubnubKGronek-Pubnub
committed
Small fixes
1 parent aa39aac commit 483aab0

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

‎Source/PubnubLibrary/Private/PubnubSubsystem.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -900,12 +900,12 @@ void UPubnubSubsystem::RemoveChannelMetadata(FString Channel, FOnRemoveChannelMe
900900
});
901901
}
902902

903-
void UPubnubSubsystem::GetMembershipsRaw(FString User, FOnGetMembershipsResponse OnGetMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count)
903+
void UPubnubSubsystem::GetMembershipsRaw(FString User, FOnGetMembershipsResponse OnGetMembershipsResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count)
904904
{
905905
FOnGetMembershipsResponseNative NativeCallback;
906-
NativeCallback.BindLambda([OnGetMembershipResponse](const FPubnubOperationResult& Result, const TArray<FPubnubMembershipData>& MembershipsData, FString PageNext, FString PagePrev)
906+
NativeCallback.BindLambda([OnGetMembershipsResponse](const FPubnubOperationResult& Result, const TArray<FPubnubMembershipData>& MembershipsData, FString PageNext, FString PagePrev)
907907
{
908-
OnGetMembershipResponse.ExecuteIfBound(Result, MembershipsData, PageNext, PagePrev);
908+
OnGetMembershipsResponse.ExecuteIfBound(Result, MembershipsData, PageNext, PagePrev);
909909
});
910910

911911
GetMembershipsRaw(User, NativeCallback, Include, UPubnubUtilities::RoundLimitForPubnubFunctions(Limit), Filter, Sort, PageNext, PagePrev, Count);
@@ -922,9 +922,9 @@ void UPubnubSubsystem::GetMembershipsRaw(FString User, FOnGetMembershipsResponse
922922
});
923923
}
924924

925-
void UPubnubSubsystem::GetMemberships(FString User, FOnGetMembershipsResponse OnGetMembershipResponse, FPubnubMembershipInclude Include, int Limit, FString Filter, FPubnubMembershipSort Sort, FString PageNext, FString PagePrev)
925+
void UPubnubSubsystem::GetMemberships(FString User, FOnGetMembershipsResponse OnGetMembershipsResponse, FPubnubMembershipInclude Include, int Limit, FString Filter, FPubnubMembershipSort Sort, FString PageNext, FString PagePrev)
926926
{
927-
GetMembershipsRaw(User, OnGetMembershipResponse, UPubnubUtilities::MembershipIncludeToString(Include), UPubnubUtilities::RoundLimitForPubnubFunctions(Limit), Filter, UPubnubUtilities::MembershipSortToString(Sort), PageNext, PagePrev, (EPubnubTribool)Include.IncludeTotalCount);
927+
GetMembershipsRaw(User, OnGetMembershipsResponse, UPubnubUtilities::MembershipIncludeToString(Include), UPubnubUtilities::RoundLimitForPubnubFunctions(Limit), Filter, UPubnubUtilities::MembershipSortToString(Sort), PageNext, PagePrev, (EPubnubTribool)Include.IncludeTotalCount);
928928
}
929929

930930
void UPubnubSubsystem::GetMemberships(FString User, FOnGetMembershipsResponseNative NativeCallback, FPubnubMembershipInclude Include, int Limit, FString Filter, FPubnubMembershipSort Sort, FString PageNext, FString PagePrev)
@@ -2683,7 +2683,7 @@ void UPubnubSubsystem::GetMemberships_JSON_priv(FString User, FOnPubnubResponse
26832683
});
26842684
}
26852685

2686-
void UPubnubSubsystem::GetMemberships_DATA_priv(FString User, FOnGetMembershipsResponseNative OnGetMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count)
2686+
void UPubnubSubsystem::GetMemberships_DATA_priv(FString User, FOnGetMembershipsResponseNative OnGetMembershipsResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count)
26872687
{
26882688
if(!CheckIsUserIDSet())
26892689
{return;}
@@ -2694,7 +2694,7 @@ void UPubnubSubsystem::GetMemberships_DATA_priv(FString User, FOnGetMembershipsR
26942694
FString JsonResponse = GetMemberships_pn(User, Include, Limit, Filter, Sort, PageNext, PagePrev, Count);
26952695

26962696
//Delegate needs to be executed back on Game Thread
2697-
AsyncTask(ENamedThreads::GameThread, [this, OnGetMembershipResponse, JsonResponse]()
2697+
AsyncTask(ENamedThreads::GameThread, [this, OnGetMembershipsResponse, JsonResponse]()
26982698
{
26992699
//Parse Json response into data
27002700
FPubnubOperationResult Result;
@@ -2704,7 +2704,7 @@ void UPubnubSubsystem::GetMemberships_DATA_priv(FString User, FOnGetMembershipsR
27042704
UPubnubJsonUtilities::GetMembershipsJsonToData(JsonResponse, Result, MembershipsData, PageNext, PagePrev);
27052705

27062706
//Broadcast bound delegate with parsed response
2707-
OnGetMembershipResponse.ExecuteIfBound(Result, MembershipsData, PageNext, PagePrev);
2707+
OnGetMembershipsResponse.ExecuteIfBound(Result, MembershipsData, PageNext, PagePrev);
27082708
});
27092709
}
27102710

‎Source/PubnubLibrary/Public/PubnubStructLibrary.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,9 @@ struct FPubnubMessageData
555555
/** Subscription match or the channel group */
556556
UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "Pubnub") FString MatchOrGroup = "";
557557
/** Region of the message - not interesting in most cases */
558-
int region = 0;
558+
UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "Pubnub") int region = 0;
559559
/** Message flags */
560-
int flags = 0;
560+
UPROPERTY(BlueprintReadWrite, VisibleAnywhere, Category = "Pubnub") int flags = 0;
561561
};
562562

563563

‎Source/PubnubLibrary/Public/PubnubSubsystem.h

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -583,18 +583,6 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
583583
/**
584584
* Parses an access token and retrieves information about its permissions.
585585
*
586-
* @Note Requires the *Access Manager* add-on to be enabled for your key in the PubNub Admin Portal
587-
*
588-
* Permissions are written in bit mask int:
589-
* READ = 1
590-
* WRITE = 2
591-
* MANAGE = 4
592-
* DELETE = 8
593-
* CREATE = 16
594-
* GET = 32
595-
* UPDATE = 64
596-
* JOIN = 128
597-
*
598586
* @param Token The access token to parse.
599587
* @return Parsed token
600588
*/
@@ -1157,7 +1145,7 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
11571145
* @Note Requires the *App Context* add-on to be enabled for your key in the PubNub Admin Portal
11581146
*
11591147
* @param User The user ID for whom to retrieve memberships.
1160-
* @param OnGetMembershipResponse The callback function used to handle the result.
1148+
* @param OnGetMembershipsResponse The callback function used to handle the result.
11611149
* @param Include (Optional) A comma-separated list of property names to include in the response.
11621150
* @param Limit (Optional) The maximum number of results to return (default: 100).
11631151
* @param Filter (Optional) Expression used to filter the results. Check online documentation to see exact filter formulas;
@@ -1168,7 +1156,7 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
11681156
* @param Count (Optional) Whether to include a total count of users in the response (default: not set).
11691157
*/
11701158
UFUNCTION(BlueprintCallable, Category = "Pubnub|App Context", meta=(AdvancedDisplay="Filter,Sort,PageNext,PagePrev,Count"))
1171-
void GetMembershipsRaw(FString User, FOnGetMembershipsResponse OnGetMembershipResponse, FString Include = "", int Limit = 100, FString Filter = "", FString Sort = "", FString PageNext = "", FString PagePrev = "", EPubnubTribool Count = EPubnubTribool::PT_NotSet);
1159+
void GetMembershipsRaw(FString User, FOnGetMembershipsResponse OnGetMembershipsResponse, FString Include = "", int Limit = 100, FString Filter = "", FString Sort = "", FString PageNext = "", FString PagePrev = "", EPubnubTribool Count = EPubnubTribool::PT_NotSet);
11721160

11731161
/**
11741162
* Retrieves a list of memberships for a specified User in the PubNub App Context.
@@ -1195,7 +1183,7 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
11951183
* @Note Requires the *App Context* add-on to be enabled for your key in the PubNub Admin Portal
11961184
*
11971185
* @param User The user ID for whom to retrieve memberships.
1198-
* @param OnGetMembershipResponse The callback function used to handle the result.
1186+
* @param OnGetMembershipsResponse The callback function used to handle the result.
11991187
* @param Include (Optional) List of property names to include in the response.
12001188
* @param Limit (Optional) The maximum number of results to return (default: 100).
12011189
* @param Filter (Optional) Expression used to filter the results. Check online documentation to see exact filter formulas;
@@ -1204,7 +1192,7 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
12041192
* @param PagePrev (Optional) A string to retrieve the previous page of results (if applicable). Ignored if PageNext is provided.
12051193
*/
12061194
UFUNCTION(BlueprintCallable, Category = "Pubnub|App Context", meta=(AdvancedDisplay="Filter,Sort,PageNext,PagePrev"))
1207-
void GetMemberships(FString User, FOnGetMembershipsResponse OnGetMembershipResponse, FPubnubMembershipInclude Include = FPubnubMembershipInclude(), int Limit = 100, FString Filter = "", FPubnubMembershipSort Sort = FPubnubMembershipSort(), FString PageNext = "", FString PagePrev = "");
1195+
void GetMemberships(FString User, FOnGetMembershipsResponse OnGetMembershipsResponse, FPubnubMembershipInclude Include = FPubnubMembershipInclude(), int Limit = 100, FString Filter = "", FPubnubMembershipSort Sort = FPubnubMembershipSort(), FString PageNext = "", FString PagePrev = "");
12081196

12091197
/**
12101198
* Retrieves a list of memberships for a specified User in the PubNub App Context.
@@ -1889,7 +1877,7 @@ class PUBNUBLIBRARY_API UPubnubSubsystem : public UGameInstanceSubsystem
18891877
void RemoveChannelMetadata_priv(FString Channel, FOnRemoveChannelMetadataResponseNative OnRemoveChannelMetadataResponse);
18901878
FString GetMemberships_pn(FString User, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
18911879
void GetMemberships_JSON_priv(FString User, FOnPubnubResponse OnGetMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
1892-
void GetMemberships_DATA_priv(FString User, FOnGetMembershipsResponseNative OnGetMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
1880+
void GetMemberships_DATA_priv(FString User, FOnGetMembershipsResponseNative OnGetMembershipsResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
18931881
void SetMemberships_priv(FString User, FString SetObj, FOnSetMembershipsResponseNative OnSetMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
18941882
void RemoveMemberships_priv(FString User, FString RemoveObj, FOnRemoveMembershipsResponseNative OnRemoveMembershipResponse, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);
18951883
FString GetChannelMembers_pn(FString Channel, FString Include, int Limit, FString Filter, FString Sort, FString PageNext, FString PagePrev, EPubnubTribool Count);

0 commit comments

Comments
 (0)