MessagesList: Add support for beforeMessageGUID and beforeDate
This commit is contained in:
@@ -9,9 +9,12 @@
|
||||
#import "MBIMMessagesListOperation.h"
|
||||
#import "MBIMHTTPUtilities.h"
|
||||
#import "IMMessageItem+Encoded.h"
|
||||
#import "MBIMErrorResponse.h"
|
||||
|
||||
#import "IMCore_ClassDump.h"
|
||||
|
||||
#define kDefaultMessagesLimit 75
|
||||
|
||||
@implementation MBIMMessagesListOperation
|
||||
|
||||
+ (void)load { [super load]; }
|
||||
@@ -25,11 +28,26 @@
|
||||
{
|
||||
__block NSObject<HTTPResponse> *response = nil;
|
||||
do {
|
||||
// Required parameters
|
||||
NSString *guid = [self valueForQueryItemWithName:@"guid"];
|
||||
|
||||
// Optional
|
||||
NSString *limitValue = [self valueForQueryItemWithName:@"limit"];
|
||||
|
||||
NSDate *beforeDate = nil;
|
||||
NSString *beforeDateValue = [self valueForQueryItemWithName:@"beforeDate"];
|
||||
if (beforeDateValue) {
|
||||
beforeDate = [beforeDateValue ISO8601Date];
|
||||
if (!beforeDate) {
|
||||
response = [[MBIMErrorResponse alloc] initWithErrorCode:500 message:@"Unable to decode ISO8601 beforeDate value"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
NSString *beforeMessageGUID = [self valueForQueryItemWithName:@"beforeMessageGUID"];
|
||||
|
||||
if (!guid) {
|
||||
MBIMLogInfo(@"No query item provided");
|
||||
response = [[HTTPErrorResponse alloc] initWithErrorCode:500];
|
||||
response = [[MBIMErrorResponse alloc] initWithErrorCode:500 message:@"No GUID provided."];
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -41,12 +59,33 @@
|
||||
response = [[HTTPErrorResponse alloc] initWithErrorCode:500];
|
||||
} else {
|
||||
// Load messages
|
||||
[chat loadMessagesBeforeDate:[NSDate date] limit:50 loadImmediately:YES];
|
||||
|
||||
[[chat chatItems] enumerateMessagesWithOptions:0 usingBlock:^(IMMessage *message, BOOL *stop) {
|
||||
NSDictionary *messageDict = [message mbim_dictionaryRepresentation];
|
||||
[messages addObject:messageDict];
|
||||
}];
|
||||
// (Must be done on main queue for some reason)
|
||||
dispatch_sync(dispatch_get_main_queue(), ^{
|
||||
NSUInteger limit = kDefaultMessagesLimit;
|
||||
if (limitValue) {
|
||||
limit = [limitValue integerValue];
|
||||
}
|
||||
|
||||
if (beforeMessageGUID) {
|
||||
if ([chat respondsToSelector:@selector(loadMessagesBeforeAndAfterGUID:numberOfMessagesToLoadBeforeGUID:numberOfMessagesToLoadAfterGUID:loadImmediately:threadIdentifier:)]) {
|
||||
[chat loadMessagesBeforeAndAfterGUID:beforeMessageGUID numberOfMessagesToLoadBeforeGUID:limit numberOfMessagesToLoadAfterGUID:0 loadImmediately:YES threadIdentifier:nil];
|
||||
} else {
|
||||
[chat loadMessagesBeforeAndAfterGUID:beforeMessageGUID numberOfMessagesToLoadBeforeGUID:limit numberOfMessagesToLoadAfterGUID:0 loadImmediately:YES];
|
||||
}
|
||||
} else {
|
||||
[chat loadMessagesBeforeDate:beforeDate limit:limit loadImmediately:YES];
|
||||
}
|
||||
|
||||
[[chat chatItems] enumerateMessagesWithOptions:0 usingBlock:^(IMMessage *message, BOOL *stop) {
|
||||
if ([[message guid] isEqual:beforeMessageGUID]) {
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
|
||||
NSDictionary *messageDict = [message mbim_dictionaryRepresentation];
|
||||
[messages addObject:messageDict];
|
||||
}];
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user