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

Fix: presence map key and get with query (clientId and connectionId) #647

Merged
merged 4 commits into from
Nov 16, 2017
Merged

Fix: presence map key and get with query (clientId and connectionId) #647

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2513ce
RTP11c2 and RTP11c3
ricardopereira Nov 15, 2017
7b69c1a
RealtimePresence.get: filter members by cliendId and connectionId
ricardopereira Nov 15, 2017
5f38c91
PresenceMap: use memberKey as members list key
ricardopereira Nov 15, 2017
d157cb2
fixup! RTP11c2 and RTP11c3
ricardopereira Nov 16, 2017
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
Prev Previous commit
Next Next commit
RealtimePresence.get: filter members by cliendId and connectionId
  • Loading branch information
@ricardopereira
ricardopereira committed Nov 16, 2017
commit 7b69c1affba1150181934b7900ca464496b6f064
13 changes: 11 additions & 2 deletions Source/ARTRealtimePresence.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#import "ARTPresence+Private.h"
#import "ARTDataQuery+Private.h"
#import "ARTConnection+Private.h"
#import "ARTNSArray+ARTFunctional.h"

#pragma mark - ARTRealtimePresenceQuery

Expand Down Expand Up @@ -84,20 +85,28 @@ - (void)get:(ARTRealtimePresenceQuery *)query callback:(void (^)(NSArray<ARTPres
break;
}

BOOL (^filterMemberBlock)(ARTPresenceMessage *message) = ^BOOL(ARTPresenceMessage *message) {
return (query.clientId == nil || [message.clientId isEqualToString:query.clientId]) &&
(query.connectionId == nil || [message.connectionId isEqualToString:query.connectionId]);
};

[_channel _attach:^(ARTErrorInfo *error) {
if (error) {
callback(nil, error);
return;
}
if (_channel.presenceMap.syncInProgress && query.waitForSync) {
[_channel.presenceMap onceSyncEnds:^(NSArray<ARTPresenceMessage *> *members) {
callback(members, nil);
NSArray<ARTPresenceMessage *> *filteredMembers = [members artFilter:filterMemberBlock];
callback(filteredMembers, nil);
}];
[_channel.presenceMap onceSyncFails:^(ARTErrorInfo *error) {
callback(nil, error);
}];
} else {
callback(_channel.presenceMap.members.allValues, nil);
NSArray<ARTPresenceMessage *> *members = _channel.presenceMap.members.allValues;
NSArray<ARTPresenceMessage *> *filteredMembers = [members artFilter:filterMemberBlock];
callback(filteredMembers, nil);
}
}];
} ART_TRY_OR_MOVE_TO_FAILED_END
Expand Down