Skip to content

Group system messages #1321

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

Merged
SystemKeeper merged 13 commits into from
Aug 10, 2023
Merged

Group system messages #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5118b6
Allow to group system messages (Adding participants only).
Ivansss Jul 31, 2023
cea2bc9
Group more participant related system messages.
Ivansss Aug 1, 2023
bcb5bfc
Group call join/leave system messages.
Ivansss Aug 1, 2023
7d5e27f
Show original collapsedBy message when it is not collapsed.
Ivansss Aug 2, 2023
498e7ac
Only show collapse button when grouped system message are disclosed.
SystemKeeper Aug 10, 2023
0db5f90
Check if collapsed message includes actor or user "self".
Ivansss Aug 2, 2023
e78c08b
Do not collapse a new message that is collapsing already some messages.
Ivansss Aug 3, 2023
197fcab
Check that the new message can really be collapsed with the last mess…
Ivansss Aug 3, 2023
329371a
Group call reconnections.
Ivansss Aug 3, 2023
3ef5ac2
Add automatic row animation when collapsing/disclosing messages.
Ivansss Aug 4, 2023
8e61b13
Highlight users and actors in collapsed messages.
Ivansss Aug 4, 2023
1adb6ec
Update localitable strings file.
Ivansss Aug 4, 2023
a4d69e4
Adjust translation comments
SystemKeeper Aug 10, 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
9 changes: 9 additions & 0 deletions NextcloudTalk/NCChatMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ typedef void (^GetReferenceDataCompletionBlock)(NCChatMessage *message, NSDictio
@property (nonatomic, assign) BOOL isSilent;
@property (nonatomic, assign) BOOL isOfflineMessage;
@property (nonatomic, assign) NSInteger offlineMessageRetryCount;
@property (nonatomic, strong) RLMArray<RLMInt> *collapsedMessages;
@property (nonatomic, strong) NCChatMessage *collapsedBy;
@property (nonatomic, strong) NSString *collapsedMessage;
@property (nonatomic, strong) NSString *collapsedMessageParametersJSONString;
@property (nonatomic, assign) BOOL collapsedIncludesActorSelf;
@property (nonatomic, assign) BOOL collapsedIncludesUserSelf;
@property (nonatomic, assign) BOOL isCollapsed;

+ (instancetype)messageWithDictionary:(NSDictionary *)messageDict;
+ (instancetype)messageWithDictionary:(NSDictionary *)messageDict andAccountId:(NSString *)accountId;
Expand Down Expand Up @@ -118,5 +125,7 @@ typedef void (^GetReferenceDataCompletionBlock)(NCChatMessage *message, NSDictio
- (void)getReferenceDataWithCompletionBlock:(GetReferenceDataCompletionBlock)block;
- (BOOL)isSameMessage:(NCChatMessage *)message;
- (void)setPreviewImageHeight:(CGFloat)height;
- (NSDictionary *)collapsedMessageParameters;
- (void)setCollapsedMessageParameters:(NSDictionary *)messageParameters;

@end
39 changes: 39 additions & 0 deletions NextcloudTalk/NCChatMessage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,9 @@ - (NSMutableAttributedString *)parsedMessage
}

NSString *originalMessage = self.file.contactName ? self.file.contactName : self.message;
if (self.collapsedMessage && self.isCollapsed) {
originalMessage = self.collapsedMessage;
}
NSString *parsedMessage = originalMessage;
NSError *error = nil;

Expand All @@ -439,6 +442,9 @@ - (NSMutableAttributedString *)parsedMessage
NSString *parameterKey = [[parameter stringByReplacingOccurrencesOfString:@"{" withString:@""]
stringByReplacingOccurrencesOfString:@"}" withString:@""];
NSDictionary *parameterDict = [[self messageParameters] objectForKey:parameterKey];
if (self.collapsedMessage && self.isCollapsed) {
parameterDict = [[self collapsedMessageParameters] objectForKey:parameterKey];
}
if (parameterDict) {
NCMessageParameter *messageParameter = [[NCMessageParameter alloc] initWithDictionary:parameterDict] ;
// Default replacement string is the parameter name
Expand Down Expand Up @@ -866,4 +872,37 @@ - (void)setPreviewImageHeight:(CGFloat)height
}
}

- (NSDictionary *)collapsedMessageParameters
{
NSDictionary *messageParametersDict = @{};
NSData *data = [self.collapsedMessageParametersJSONString dataUsingEncoding:NSUTF8StringEncoding];
if (data) {
NSError* error;
NSDictionary* jsonData = [NSJSONSerialization JSONObjectWithData:data
options:0
error:&error];
if (jsonData) {
messageParametersDict = jsonData;
} else {
NSLog(@"Error retrieving collapsed message parameters JSON data: %@", error);
}
}
return messageParametersDict;
}

- (void)setCollapsedMessageParameters:(NSDictionary *)messageParameters
{
if ([messageParameters isKindOfClass:[NSDictionary class]]) {
NSError *error;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:messageParameters
options:0
error:&error];
if (jsonData) {
self.collapsedMessageParametersJSONString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
} else {
NSLog(@"Error generating collapsed message parameters JSON string: %@", error);
}
}
}

@end
Loading