Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(message-type): rename messageType to type #447

Merged
merged 2 commits into from
Mar 30, 2023
Merged

refactor(message-type): rename messageType to type #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42cb5d9
refactor(message-type): rename `messageType` to `type`
parfeon Mar 28, 2023
0138702
refactor(message-type): remove class forwarding
parfeon Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions Framework/PubNub Framework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2493,21 +2493,6 @@
A5A7B0332349330F0060113B /* PNBaseMessageActionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A5A7AFF82349330F0060113B /* PNBaseMessageActionRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5A7B0342349330F0060113B /* PNBaseMessageActionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A5A7AFF82349330F0060113B /* PNBaseMessageActionRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5A7B0362349330F0060113B /* PNBaseMessageActionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A5A7AFF82349330F0060113B /* PNBaseMessageActionRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35612959C45B0038FD6F /* PNMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE355F2959C45B0038FD6F /* PNMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35622959C45B0038FD6F /* PNMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE355F2959C45B0038FD6F /* PNMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35632959C45B0038FD6F /* PNMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE355F2959C45B0038FD6F /* PNMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35642959C45B0038FD6F /* PNMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE355F2959C45B0038FD6F /* PNMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35652959C45B0038FD6F /* PNMessageType.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE355F2959C45B0038FD6F /* PNMessageType.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35662959C45B0038FD6F /* PNMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = A5CE35602959C45B0038FD6F /* PNMessageType.m */; };
A5CE35672959C45B0038FD6F /* PNMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = A5CE35602959C45B0038FD6F /* PNMessageType.m */; };
A5CE35682959C45B0038FD6F /* PNMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = A5CE35602959C45B0038FD6F /* PNMessageType.m */; };
A5CE35692959C45B0038FD6F /* PNMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = A5CE35602959C45B0038FD6F /* PNMessageType.m */; };
A5CE356A2959C45B0038FD6F /* PNMessageType.m in Sources */ = {isa = PBXBuildFile; fileRef = A5CE35602959C45B0038FD6F /* PNMessageType.m */; };
A5CE356C2959C9260038FD6F /* PNMessageType+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */; };
A5CE356D2959C9260038FD6F /* PNMessageType+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */; };
A5CE356E2959C9260038FD6F /* PNMessageType+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */; };
A5CE356F2959C9260038FD6F /* PNMessageType+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */; };
A5CE35702959C9260038FD6F /* PNMessageType+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */; };
A5CE35732959D1E80038FD6F /* PNSpaceId.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE35712959D1E80038FD6F /* PNSpaceId.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35742959D1E80038FD6F /* PNSpaceId.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE35712959D1E80038FD6F /* PNSpaceId.h */; settings = {ATTRIBUTES = (Public, ); }; };
A5CE35752959D1E80038FD6F /* PNSpaceId.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CE35712959D1E80038FD6F /* PNSpaceId.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -3068,9 +3053,6 @@
A5A7AFF62349330E0060113B /* PNRemoveMessageActionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PNRemoveMessageActionRequest.m; path = Message/PNRemoveMessageActionRequest.m; sourceTree = "<group>"; };
A5A7AFF72349330F0060113B /* PNRemoveMessageActionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNRemoveMessageActionRequest.h; path = Message/PNRemoveMessageActionRequest.h; sourceTree = "<group>"; };
A5A7AFF82349330F0060113B /* PNBaseMessageActionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PNBaseMessageActionRequest.h; path = Message/PNBaseMessageActionRequest.h; sourceTree = "<group>"; };
A5CE355F2959C45B0038FD6F /* PNMessageType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PNMessageType.h; sourceTree = "<group>"; };
A5CE35602959C45B0038FD6F /* PNMessageType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PNMessageType.m; sourceTree = "<group>"; };
A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PNMessageType+Private.h"; sourceTree = "<group>"; };
A5CE35712959D1E80038FD6F /* PNSpaceId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PNSpaceId.h; sourceTree = "<group>"; };
A5CE35722959D1E80038FD6F /* PNSpaceId.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PNSpaceId.m; sourceTree = "<group>"; };
A5FADC322490270E001D7704 /* PubNub+Files.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PubNub+Files.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3822,9 +3804,6 @@
A55A86A722FD817E002D0A72 /* PNUUIDMetadata+Private.h */,
A55A86A822FD817E002D0A72 /* PNUUIDMetadata.h */,
A55A86A422FD817E002D0A72 /* PNUUIDMetadata.m */,
A5CE356B2959C9260038FD6F /* PNMessageType+Private.h */,
A5CE355F2959C45B0038FD6F /* PNMessageType.h */,
A5CE35602959C45B0038FD6F /* PNMessageType.m */,
A5CE35712959D1E80038FD6F /* PNSpaceId.h */,
A5CE35722959D1E80038FD6F /* PNSpaceId.m */,
A58975E023005CFB0093BD9A /* PNMembership+Private.h */,
Expand Down Expand Up @@ -4092,7 +4071,6 @@
79AA8EC926EAB81500ADA747 /* PNConfiguration+Private.h in Headers */,
A58975B223005AAC0093BD9A /* PNManageMembershipsStatus.h in Headers */,
79A238D01D2E70BD00D080CD /* NSURLSessionConfiguration+PNConfiguration.h in Headers */,
A5CE356C2959C9260038FD6F /* PNMessageType+Private.h in Headers */,
791582521BD709C60084FC70 /* PNPresenceChannelGroupHereNowResult.h in Headers */,
7932485E1D874D9F00FBDF36 /* PNPublishSequence.h in Headers */,
79A0D8441DC22C950039A264 /* PNAPNSAuditAPICallBuilder.h in Headers */,
Expand Down Expand Up @@ -4204,7 +4182,6 @@
A55DAEFC24B1FE9E00766EE9 /* PNXML.h in Headers */,
A55A87DC22FD8272002D0A72 /* PNBaseObjectsRequest.h in Headers */,
A57A3089238D751400DE8C68 /* PNMPNSNotificationPayload.h in Headers */,
A5CE35612959C45B0038FD6F /* PNMessageType.h in Headers */,
79A0D86E1DC22C950039A264 /* PNAPICallBuilder+Private.h in Headers */,
A57A30E9238DCAAF00DE8C68 /* PNAPNSNotificationTarget+Private.h in Headers */,
A55A881B22FD8272002D0A72 /* PNFetchAllChannelsMetadataRequest.h in Headers */,
Expand Down Expand Up @@ -4370,7 +4347,6 @@
79AA8ECB26EAB81500ADA747 /* PNConfiguration+Private.h in Headers */,
A58975B423005AAC0093BD9A /* PNManageMembershipsStatus.h in Headers */,
791583201BD709D10084FC70 /* PNPushNotificationsStateModificationParser.h in Headers */,
A5CE356E2959C9260038FD6F /* PNMessageType+Private.h in Headers */,
79A238D21D2E70BD00D080CD /* NSURLSessionConfiguration+PNConfiguration.h in Headers */,
791582FB1BD709D10084FC70 /* PNPresenceChannelGroupHereNowResult.h in Headers */,
793248601D874D9F00FBDF36 /* PNPublishSequence.h in Headers */,
Expand Down Expand Up @@ -4482,7 +4458,6 @@
A55DAEFE24B1FE9E00766EE9 /* PNXML.h in Headers */,
A55A87DE22FD8272002D0A72 /* PNBaseObjectsRequest.h in Headers */,
A57A308B238D751400DE8C68 /* PNMPNSNotificationPayload.h in Headers */,
A5CE35632959C45B0038FD6F /* PNMessageType.h in Headers */,
791583111BD709D10084FC70 /* PNHistoryResult.h in Headers */,
A57A30EB238DCAAF00DE8C68 /* PNAPNSNotificationTarget+Private.h in Headers */,
A55A881D22FD8272002D0A72 /* PNFetchAllChannelsMetadataRequest.h in Headers */,
Expand Down Expand Up @@ -4691,7 +4666,6 @@
A5A7B0132349330F0060113B /* PNAddMessageActionRequest.h in Headers */,
A55BCCFB231D222B0019DB68 /* PNRemoveMessageActionAPICallBuilder.h in Headers */,
7960B6691F68122200FFAEBB /* PNDeleteMessageAPICallBuilder.h in Headers */,
A5CE35652959C45B0038FD6F /* PNMessageType.h in Headers */,
A55DAF0B24B1FEC800766EE9 /* PNXML+Private.h in Headers */,
A504E15824AA9CFB006DCF5B /* PNFilesAPICallBuilder.h in Headers */,
A57A308E238D751400DE8C68 /* PNMPNSNotificationPayload.h in Headers */,
Expand Down Expand Up @@ -4878,7 +4852,6 @@
7925DB8C1D3FFCAC00857C0D /* PNLLogger.h in Headers */,
79CFA2BD26DE1C4900D206D4 /* PNPAMToken.h in Headers */,
79A3E4142215699900F2ADB9 /* PNMessageCountAPICallBuilder.h in Headers */,
A5CE35702959C9260038FD6F /* PNMessageType+Private.h in Headers */,
A55A866222FD80B9002D0A72 /* PNFetchChannelMetadataAPICallBuilder.h in Headers */,
79ABD8961F01636B007634E0 /* PNTelemetry.h in Headers */,
7988427F1C18F286003E8948 /* PNNumber.h in Headers */,
Expand Down Expand Up @@ -4925,7 +4898,6 @@
79AA8ECA26EAB81500ADA747 /* PNConfiguration+Private.h in Headers */,
A58975B323005AAC0093BD9A /* PNManageMembershipsStatus.h in Headers */,
79A8BC8D1C58F93900015BDE /* PNPushNotificationsStateModificationParser.h in Headers */,
A5CE356D2959C9260038FD6F /* PNMessageType+Private.h in Headers */,
79A238D11D2E70BD00D080CD /* NSURLSessionConfiguration+PNConfiguration.h in Headers */,
79A8BC681C58F93900015BDE /* PNPresenceChannelGroupHereNowResult.h in Headers */,
7932485F1D874D9F00FBDF36 /* PNPublishSequence.h in Headers */,
Expand Down Expand Up @@ -5037,7 +5009,6 @@
A55DAEFD24B1FE9E00766EE9 /* PNXML.h in Headers */,
A55A87DD22FD8272002D0A72 /* PNBaseObjectsRequest.h in Headers */,
A57A308A238D751400DE8C68 /* PNMPNSNotificationPayload.h in Headers */,
A5CE35622959C45B0038FD6F /* PNMessageType.h in Headers */,
79A8BC7E1C58F93900015BDE /* PNHistoryResult.h in Headers */,
A57A30EA238DCAAF00DE8C68 /* PNAPNSNotificationTarget+Private.h in Headers */,
A55A881C22FD8272002D0A72 /* PNFetchAllChannelsMetadataRequest.h in Headers */,
Expand Down Expand Up @@ -5203,7 +5174,6 @@
79AA8ECC26EAB81500ADA747 /* PNConfiguration+Private.h in Headers */,
A58975B523005AAC0093BD9A /* PNManageMembershipsStatus.h in Headers */,
79E20D2C1C8B0AD5001BC9CC /* PNPushNotificationsStateModificationParser.h in Headers */,
A5CE356F2959C9260038FD6F /* PNMessageType+Private.h in Headers */,
79A238D31D2E70BD00D080CD /* NSURLSessionConfiguration+PNConfiguration.h in Headers */,
79E20D2B1C8B0A70001BC9CC /* PNPresenceChannelGroupHereNowResult.h in Headers */,
793248611D874D9F00FBDF36 /* PNPublishSequence.h in Headers */,
Expand Down Expand Up @@ -5315,7 +5285,6 @@
A55DAEFF24B1FE9E00766EE9 /* PNXML.h in Headers */,
A55A87DF22FD8272002D0A72 /* PNBaseObjectsRequest.h in Headers */,
A57A308C238D751400DE8C68 /* PNMPNSNotificationPayload.h in Headers */,
A5CE35642959C45B0038FD6F /* PNMessageType.h in Headers */,
79CBB11A1BD03DE4001FC34D /* PNConfiguration.h in Headers */,
A57A30EC238DCAAF00DE8C68 /* PNAPNSNotificationTarget+Private.h in Headers */,
A55A881E22FD8272002D0A72 /* PNFetchAllChannelsMetadataRequest.h in Headers */,
Expand Down Expand Up @@ -6115,7 +6084,6 @@
A56865702300709F0014E17C /* PNFetchMembershipsResult.m in Sources */,
A56FAEF9233161570072ADD6 /* PubNub+MessageActions.m in Sources */,
79A0D8651DC22C950039A264 /* PNSubscribeAPIBuilder.m in Sources */,
A5CE35662959C45B0038FD6F /* PNMessageType.m in Sources */,
A5046F2424784CAB0008C81E /* PNObjectsRemoveParser.m in Sources */,
A5046F1D24784CAB0008C81E /* PNRemoveUUIDMetadataRequest.m in Sources */,
A5046F0B24784CAB0008C81E /* PNMembership.m in Sources */,
Expand Down Expand Up @@ -6347,7 +6315,6 @@
A56865722300709F0014E17C /* PNFetchMembershipsResult.m in Sources */,
A56FAEFB233161570072ADD6 /* PubNub+MessageActions.m in Sources */,
79A0D96D1DC2313A0039A264 /* PNSubscribeChannelsOrGroupsAPIBuilder.m in Sources */,
A5CE35682959C45B0038FD6F /* PNMessageType.m in Sources */,
A5046EC624784CAA0008C81E /* PNObjectsRemoveParser.m in Sources */,
A5046EBF24784CAA0008C81E /* PNRemoveUUIDMetadataRequest.m in Sources */,
A5046EAD24784CAA0008C81E /* PNMembership.m in Sources */,
Expand Down Expand Up @@ -6579,7 +6546,6 @@
A56865752300709F0014E17C /* PNFetchMembershipsResult.m in Sources */,
A56FAEFE233161570072ADD6 /* PubNub+MessageActions.m in Sources */,
79A0D96F1DC2313B0039A264 /* PNSubscribeChannelsOrGroupsAPIBuilder.m in Sources */,
A5CE356A2959C45B0038FD6F /* PNMessageType.m in Sources */,
A5046E6824784CA90008C81E /* PNObjectsRemoveParser.m in Sources */,
A5046E6124784CA90008C81E /* PNRemoveUUIDMetadataRequest.m in Sources */,
A5046E4F24784CA90008C81E /* PNMembership.m in Sources */,
Expand Down Expand Up @@ -6811,7 +6777,6 @@
A56865712300709F0014E17C /* PNFetchMembershipsResult.m in Sources */,
A56FAEFA233161570072ADD6 /* PubNub+MessageActions.m in Sources */,
79A0D96E1DC2313A0039A264 /* PNSubscribeChannelsOrGroupsAPIBuilder.m in Sources */,
A5CE35672959C45B0038FD6F /* PNMessageType.m in Sources */,
A5046EF524784CAB0008C81E /* PNObjectsRemoveParser.m in Sources */,
A5046EEE24784CAB0008C81E /* PNRemoveUUIDMetadataRequest.m in Sources */,
A5046EDC24784CAB0008C81E /* PNMembership.m in Sources */,
Expand Down Expand Up @@ -7043,7 +7008,6 @@
A56865732300709F0014E17C /* PNFetchMembershipsResult.m in Sources */,
A56FAEFC233161570072ADD6 /* PubNub+MessageActions.m in Sources */,
79A0D9711DC2313C0039A264 /* PNSubscribeChannelsOrGroupsAPIBuilder.m in Sources */,
A5CE35692959C45B0038FD6F /* PNMessageType.m in Sources */,
A5046E9724784CAA0008C81E /* PNObjectsRemoveParser.m in Sources */,
A5046E9024784CAA0008C81E /* PNRemoveUUIDMetadataRequest.m in Sources */,
A5046E7E24784CAA0008C81E /* PNMembership.m in Sources */,
Expand Down
1 change: 0 additions & 1 deletion Framework/PubNub/PubNub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ FOUNDATION_EXPORT const unsigned char PubNubVersionString[];
#import "PNStatus.h"

// Models
#import "PNMessageType.h"
#import "PNSpaceId.h"

// API
Expand Down
1 change: 0 additions & 1 deletion PubNub/Core/PubNub+Files.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#import "PNDeleteFileRequest.h"
#import "PNListFilesRequest.h"
#import "PNSendFileRequest.h"
#import "PNMessageType.h"
#import "PNSpaceId.h"
#import "PNFile.h"

Expand Down
4 changes: 2 additions & 2 deletions PubNub/Core/PubNub+Files.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ - (void)sendFileRequestUsingBuilderParameters:(NSDictionary *)parameters {
request.cipherKey = cipherKey ?: self.configuration.cipherKey;
request.fileMessageMetadata = parameters[NSStringFromSelector(@selector(fileMessageMetadata))];
request.arbitraryQueryParameters = parameters[@"queryParam"];
request.messageType = parameters[NSStringFromSelector(@selector(messageType))];
request.type = parameters[NSStringFromSelector(@selector(type))];
request.spaceId = parameters[NSStringFromSelector(@selector(spaceId))];
request.message = parameters[NSStringFromSelector(@selector(message))];

Expand Down Expand Up @@ -508,7 +508,7 @@ - (void)handleUploadFileSuccessWithFileIdentifier:(NSString *)fileIdentifier

request.arbitraryQueryParameters = sendFileRequest.arbitraryQueryParameters;
request.metadata = sendFileRequest.fileMessageMetadata;
request.messageType = sendFileRequest.messageType;
request.type = sendFileRequest.type;
request.store = sendFileRequest.fileMessageStore;
request.spaceId = sendFileRequest.spaceId;
request.message = sendFileRequest.message;
Expand Down
17 changes: 15 additions & 2 deletions PubNub/Core/PubNub+History.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ @interface PubNub (HistoryProtected)
* not.
* @param includeMessageType Whether event type should be included in response or not.
* By default set to: \b YES.
* @param includeType Whether user-provided event type should be included in response or not.
* By default set to: \b YES.
* @param includeSpaceId Whether identifier of space to which event has been sent should be included or not.
* @param includeUUID Whether event publisher UUID should be included in response or not.
* By default set to: \b YES.
Expand All @@ -62,6 +64,7 @@ - (void)historyForChannels:(BOOL)multipleChannels
reverse:(nullable NSNumber *)shouldReverseOrder
includeTimeToken:(nullable NSNumber *)shouldIncludeTimeToken
includeMessageType:(nullable NSNumber *)includeMessageType
includeType:(nullable NSNumber *)includeType
includeSpaceId:(nullable NSNumber *)includeSpaceId
includeUUID:(nullable NSNumber *)includeUUID
includeMessageActions:(nullable NSNumber *)shouldIncludeMessageActions
Expand Down Expand Up @@ -155,6 +158,7 @@ @implementation PubNub (History)
NSNumber *reverse = parameters[NSStringFromSelector(@selector(reverse))];
NSNumber *includeTimeToken = parameters[NSStringFromSelector(@selector(includeTimeToken))];
NSNumber *includeMessageType = parameters[NSStringFromSelector(@selector(includeMessageType))];
NSNumber *includeType = parameters[NSStringFromSelector(@selector(includeType))];
NSNumber *includeSpaceId = parameters[NSStringFromSelector(@selector(includeSpaceId))];
NSNumber *includeUUID = parameters[NSStringFromSelector(@selector(includeUUID))];
NSNumber *includeMetadata = parameters[NSStringFromSelector(@selector(includeMetadata))];
Expand All @@ -170,6 +174,7 @@ @implementation PubNub (History)
reverse:reverse
includeTimeToken:includeTimeToken
includeMessageType:includeMessageType
includeType:includeType
includeSpaceId:includeSpaceId
includeUUID:includeUUID
includeMessageActions:includeActions
Expand Down Expand Up @@ -320,6 +325,7 @@ - (void)historyForChannel:(NSString *)channel
reverse:@NO
includeTimeToken:@NO
includeMessageType:@YES
includeType:@YES
includeSpaceId:@NO
includeUUID:@YES
includeMessageActions:@(shouldIncludeMessageActions)
Expand Down Expand Up @@ -408,6 +414,7 @@ - (void)historyForChannel:(NSString *)channel
reverse:@(shouldReverseOrder)
includeTimeToken:@(shouldIncludeTimeToken)
includeMessageType:@YES
includeType:@YES
includeSpaceId:@NO
includeUUID:@YES
includeMessageActions:nil
Expand All @@ -424,6 +431,7 @@ - (void)historyForChannels:(BOOL)multipleChannels
reverse:(NSNumber *)shouldReverseOrder
includeTimeToken:(NSNumber *)shouldIncludeTimeToken
includeMessageType:(NSNumber *)includeMessageType
includeType:(NSNumber *)includeType
includeSpaceId:(NSNumber *)includeSpaceId
includeUUID:(NSNumber *)includeUUID
includeMessageActions:(NSNumber *)shouldIncludeMessageActions
Expand All @@ -443,10 +451,14 @@ - (void)historyForChannels:(BOOL)multipleChannels
if (!limit || limit.unsignedIntValue == 0) {
limit = nil;
}

if (!includeMessageType) {
includeMessageType = @YES;
}

if (!includeType) {
includeType = @YES;
}

if (!includeSpaceId) {
includeSpaceId = @NO;
Expand Down Expand Up @@ -519,7 +531,7 @@ - (void)historyForChannels:(BOOL)multipleChannels
if (operation == PNHistoryWithActionsOperation || multipleChannels) {
[parameters addQueryParameter:(includeMessageType.boolValue ? @"true" : @"false")
forFieldName:@"include_message_type"];
[parameters addQueryParameter:(includeMessageType.boolValue ? @"true" : @"false")
[parameters addQueryParameter:(includeType.boolValue ? @"true" : @"false")
forFieldName:@"include_type"];
[parameters addQueryParameter:(includeSpaceId.boolValue ? @"true" : @"false")
forFieldName:@"include_space_id"];
Expand Down Expand Up @@ -584,6 +596,7 @@ - (void)historyForChannels:(BOOL)multipleChannels
reverse:shouldReverseOrder
includeTimeToken:shouldIncludeTimeToken
includeMessageType:includeMessageType
includeType:includeType
includeSpaceId:includeSpaceId
includeUUID:includeUUID
includeMessageActions:shouldIncludeMessageActions
Expand Down
Loading