Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages.

Browse source
This commit is contained in:
Stefan Ceriu 2021-12-13 12:08:52 +02:00 committed by Stefan Ceriu
parent 5a72750f8d
commit 574a155c80
10 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m
View file

@ -37,7 +37,7 @@
roomId = event.roomId;
// Title is here the file name stored in event body
title = [event.content[@"body"] isKindOfClass:[NSString class]] ? event.content[@"body"] : nil;
title = [event.content[kMXMessageBodyKey] isKindOfClass:[NSString class]] ? event.content[kMXMessageBodyKey] : nil;
// Check attachment if any
if ([searchDataSource.eventFormatter isSupportedAttachment:event])

2
Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m
View file

@ -2184,7 +2184,7 @@
NSString* textMessage;
if ([msgtype isEqualToString:kMXMessageTypeText])
{
textMessage = event.content[@"body"];
textMessage = event.content[kMXMessageBodyKey];
}
// Show a confirmation popup to the end user

2
Riot/Modules/MatrixKit/Models/Room/MXKAttachment.m
View file

@ -119,7 +119,7 @@ NSString *const kMXKAttachmentFileNameBase = @"attatchment";
}
}
MXJSONModelSetString(_originalFileName, eventContent[@"body"]);
MXJSONModelSetString(_originalFileName, eventContent[kMXMessageBodyKey]);
MXJSONModelSetDictionary(_contentInfo, eventContent[@"info"]);
MXJSONModelSetMXJSONModel(contentFile, MXEncryptedContentFile, eventContent[@"file"]);

4
Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
View file

@ -3992,7 +3992,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
}
else
{
editableTextMessage = event.content[@"body"];
editableTextMessage = event.content[kMXMessageBodyKey];
}
return editableTextMessage;
@ -4109,7 +4109,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
NSString *sanitizedText = [self sanitizedMessageText:text];
NSString *formattedText = [self htmlMessageFromSanitizedText:sanitizedText];
NSString *eventBody = event.content[@"body"];
NSString *eventBody = event.content[kMXMessageBodyKey];
NSString *eventFormattedBody = event.content[@"formatted_body"];
if (![sanitizedText isEqualToString:eventBody] && (!eventFormattedBody || ![formattedText isEqualToString:eventFormattedBody]))

2
Riot/Modules/MatrixKit/Models/Search/MXKSearchCellData.m
View file

@ -56,7 +56,7 @@
date = [searchDataSource.eventFormatter dateStringFromEvent:searchResult.result withTime:YES];
// Code from [MXEventFormatter stringFromEvent] for the particular case of a text message
message = [searchResult.result.content[@"body"] isKindOfClass:[NSString class]] ? searchResult.result.content[@"body"] : nil;
message = [searchResult.result.content[kMXMessageBodyKey] isKindOfClass:[NSString class]] ? searchResult.result.content[kMXMessageBodyKey] : nil;
}
return self;
}

12
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
View file

@ -139,7 +139,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
if (event.eventType == MXEventTypeRoomMessage)
{
NSString *msgtype;
MXJSONModelSetString(msgtype, event.content[kMXMessageTypeKey]);
MXJSONModelSetString(msgtype, event.content[@"msgtype"]);
NSString *urlField;
NSDictionary *fileField;
@ -1263,12 +1263,12 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
else if (eventThreadIdentifier)
{
isHTML = YES;
MXJSONModelSetString(body, event.content[@"body"]);
MXJSONModelSetString(body, event.content[kMXMessageBodyKey]);
MXEvent *threadRootEvent = [mxSession.store eventWithEventId:eventThreadIdentifier
inRoom:event.roomId];
NSString *threadRootEventContent;
MXJSONModelSetString(threadRootEventContent, threadRootEvent.content[@"body"]);
MXJSONModelSetString(threadRootEventContent, threadRootEvent.content[kMXMessageBodyKey]);
body = [NSString stringWithFormat:@"<mx-reply><blockquote><a href=\"%@\">In reply to</a> <a href=\"%@\">%@</a><br>%@</blockquote></mx-reply>%@",
[MXTools permalinkToEvent:eventThreadIdentifier inRoom:event.roomId],
[MXTools permalinkToUserWithUserId:threadRootEvent.sender],
@ -1279,7 +1279,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
}
else
{
MXJSONModelSetString(body, event.content[@"body"]);
MXJSONModelSetString(body, event.content[kMXMessageBodyKey]);
}
if (body)
@ -1561,7 +1561,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
else
{
NSString *body;
MXJSONModelSetString(body, event.content[@"body"]);
MXJSONModelSetString(body, event.content[kMXMessageBodyKey]);
// Check sticker validity
if (![self isSupportedAttachment:event])
@ -2100,7 +2100,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
else if (!_isForSubtitle && event.eventType == MXEventTypeRoomMessage && (_emojiOnlyTextFont || _singleEmojiTextFont))
{
NSString *message;
MXJSONModelSetString(message, event.content[@"body"]);
MXJSONModelSetString(message, event.content[kMXMessageBodyKey]);
if (_emojiOnlyTextFont && [MXKTools isEmojiOnlyString:message])
{

2
Riot/Modules/Room/CellData/RoomBubbleCellData.m
View file

@ -1066,7 +1066,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
NSString *mediaName = [self accessibilityLabelForAttachmentType:self.attachment.type];
MXJSONModelSetString(accessibilityLabel, self.events.firstObject.content[@"body"]);
MXJSONModelSetString(accessibilityLabel, self.events.firstObject.content[kMXMessageBodyKey]);
if (accessibilityLabel)
{
accessibilityLabel = [NSString stringWithFormat:@"%@ %@", mediaName, accessibilityLabel];

2
RiotNSE/NotificationService.swift
View file

@ -386,7 +386,7 @@ class NotificationService: UNNotificationServiceExtension {
}
let msgType = event.content[kMXMessageTypeKey] as? String
let messageContent = event.content["body"] as? String
let messageContent = event.content[kMXMessageBodyKey] as? String
let isReply = event.isReply()
if isReply {

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
View file

@ -103,7 +103,7 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
})
.compactMap({ event -> TemplateRoomChatMessage? in
guard let eventId = event.eventId,
let body = event.content["body"] as? String,
let body = event.content[kMXMessageBodyKey] as? String,
let sender = senderForMessage(event: event)
else { return nil }

2
RiotTests/MatrixKitTests/MXKEventFormatterTests.m
View file

@ -52,7 +52,7 @@
anEvent.wireType = kMXEventTypeStringRoomMessage;
anEvent.originServerTs = (uint64_t) ([[NSDate date] timeIntervalSince1970] * 1000);
anEvent.wireContent = @{ kMXMessageTypeKey: kMXMessageTypeText,
@"body": @"deded" };
kMXMessageBodyKey: @"deded" };
maxHeaderSize = ceil(eventFormatter.defaultTextFont.pointSize * 1.2);
}