buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

Plumb guid down for deduplication on the conversation level

Browse Source
This commit is contained in:
James Magahern
2019-01-04 13:08:28 -08:00
parent dba4910a82
commit 6aaa2ff5b3
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kordophone/Bridge/Operations/MBIMMessagesListOperation.m
View File

@@ -43,10 +43,10 @@
// Load messages // Load messages
[chat loadMessagesBeforeDate:[NSDate date] limit:50 loadImmediately:YES]; [chat loadMessagesBeforeDate:[NSDate date] limit:50 loadImmediately:YES];
for (IMMessageItem *imMessage in [[chat chatItems] messages]) { [[chat chatItems] enumerateMessagesWithOptions:0 usingBlock:^(IMMessage *message, BOOL *stop) {
NSDictionary *messageDict = [imMessage mbim_dictionaryRepresentation]; NSDictionary *messageDict = [message mbim_dictionaryRepresentation];
[messages addObject:messageDict]; [messages addObject:messageDict];
} }];
} }
}); });

5
kordophone/Categories/IMMessageItem+Encoded.h
View File

@@ -16,9 +16,4 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface IMMessageItem (Encoded)
- (NSDictionary *)mbim_dictionaryRepresentation;
@end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

18
kordophone/Categories/IMMessageItem+Encoded.m
View File

@@ -16,21 +16,8 @@
NSMutableDictionary *messageDict = [NSMutableDictionary dictionary]; NSMutableDictionary *messageDict = [NSMutableDictionary dictionary];
messageDict[@"text"] = [[self text] string]; messageDict[@"text"] = [[self text] string];
messageDict[@"date"] = MBIMWebServerFormatISO8601([self time]); messageDict[@"date"] = MBIMWebServerFormatISO8601([self time]);
messageDict[@"sender"] = [[self sender] displayID]; messageDict[@"sender"] = ([self isFromMe] ? nil : [[self sender] displayID]); // TODO: nil sender is still a weird way to represent this...
messageDict[@"guid"] = [self guid];
return messageDict;
}
@end
@implementation IMMessageItem (Encoded)
- (NSDictionary *)mbim_dictionaryRepresentation
{
NSMutableDictionary *messageDict = [NSMutableDictionary dictionary];
messageDict[@"text"] = [[self body] string];
messageDict[@"date"] = MBIMWebServerFormatISO8601([self time]);
messageDict[@"sender"] = [self sender];
if ([self fileTransferGUIDs]) { if ([self fileTransferGUIDs]) {
// Support only images right now // Support only images right now
@@ -51,3 +38,4 @@
} }
@end @end