Skip to content

Commit ff7ced6

Browse files
authored
Merge pull request #649 from zapcannon87/master
feat(im): update conversation
2 parents 29ced9b + 2edc2da commit ff7ced6

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

AVOS/Sources/Realtime/IM/Client/LCIMClient.m

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ - (void)processConvMembersLeft:(AVIMGenericCommand *)inCommand
10501050

10511051
- (void)processConvUpdated:(AVIMGenericCommand *)inCommand
10521052
{
1053-
AssertRunInQueue(self->_internalSerialQueue);
1053+
AssertRunInQueue(self.internalSerialQueue);
10541054

10551055
AVIMConvCommand *convCommand = (inCommand.hasConvMessage ? inCommand.convMessage : nil);
10561056
NSString *conversationId = (convCommand.hasCid ? convCommand.cid : nil);
@@ -1094,14 +1094,13 @@ - (void)processConvUpdated:(AVIMGenericCommand *)inCommand
10941094
updatedAt = [LCDate dateFromString:convCommand.udate];
10951095
}
10961096

1097-
[self->_conversationManager queryConversationWithId:conversationId callback:^(LCIMConversation *conversation, NSError *error) {
1097+
[self.conversationManager queryConversationWithId:conversationId callback:^(LCIMConversation *conversation, NSError *error) {
10981098
if (error) { return; }
10991099
[conversation processConvUpdatedAttr:attr attrModified:attrModified];
1100-
id <LCIMClientDelegate> delegate = self->_delegate;
1101-
SEL sel = @selector(conversation:didUpdateAt:byClientId:updatedData:);
1102-
if (delegate && [delegate respondsToSelector:sel]) {
1100+
id <LCIMClientDelegate> delegate = self.delegate;
1101+
if ([delegate respondsToSelector:@selector(conversation:didUpdateAt:byClientId:updatedData:updatingData:)]) {
11031102
[self invokeInUserInteractQueue:^{
1104-
[delegate conversation:conversation didUpdateAt:updatedAt byClientId:initById updatedData:attrModified];
1103+
[delegate conversation:conversation didUpdateAt:updatedAt byClientId:initById updatedData:attrModified updatingData:attr];
11051104
}];
11061105
}
11071106
}];

AVOS/Sources/Realtime/IM/Client/LCIMClientProtocol.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,13 @@ NS_ASSUME_NONNULL_BEGIN
128128
*/
129129
- (void)conversation:(LCIMConversation *)conversation didUpdateForKey:(LCIMConversationUpdatedKey)key;
130130

131-
/**
132-
Notification for conversation's attribution updated.
133-
134-
@param conversation Updated conversation.
135-
@param date Updated date.
136-
@param clientId Client ID of doing updates.
137-
@param data Updated data.
138-
*/
139-
- (void)conversation:(LCIMConversation *)conversation didUpdateAt:(NSDate * _Nullable)date byClientId:(NSString * _Nullable)clientId updatedData:(NSDictionary * _Nullable)data;
131+
/// Notification for conversation's attribution updated.
132+
/// @param conversation Updated conversation.
133+
/// @param date Updated date.
134+
/// @param clientId Client ID which do this update.
135+
/// @param updatedData Updated data.
136+
/// @param updatingData Updating data.
137+
- (void)conversation:(LCIMConversation *)conversation didUpdateAt:(NSDate * _Nullable)date byClientId:(NSString * _Nullable)clientId updatedData:(NSDictionary * _Nullable)updatedData updatingData:(NSDictionary * _Nullable)updatingData;
140138

141139
/**
142140
Notification for conversation's member info updated.

0 commit comments

Comments
 (0)