felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 09:02:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

MESSENGER-5570 acl status events up to collapsability

Browse Source
This commit is contained in:
Frank Rotermund
2024-02-21 16:50:20 +01:00
parent f9f3b69763
commit 4aaf86e41e
9 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Models/MXKAppSettings.m
+6 -3
View File
@@ -151,7 +151,8 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
kMXEventTypeStringPollEnd,
kMXEventTypeStringPollEndMSC3381,
kMXEventTypeStringBeaconInfo,
kMXEventTypeStringBeaconInfoMSC3672
kMXEventTypeStringBeaconInfoMSC3672,
kMXEventTypeStringRoomServerACL
].mutableCopy;
@@ -186,7 +187,8 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
kMXEventTypeStringPollEnd,
kMXEventTypeStringPollEndMSC3381,
kMXEventTypeStringBeaconInfo,
kMXEventTypeStringBeaconInfoMSC3672
kMXEventTypeStringBeaconInfoMSC3672,
kMXEventTypeStringRoomServerACL
].mutableCopy;
lastMessageEventTypesAllowList = @[
@@ -201,7 +203,8 @@ static NSString *const kMXAppGroupID = @"group.org.matrix";
kMXEventTypeStringPollStart,
kMXEventTypeStringPollStartMSC3381,
kMXEventTypeStringPollEnd,
kMXEventTypeStringPollEndMSC3381
kMXEventTypeStringPollEndMSC3381,
kMXEventTypeStringRoomServerACL
].mutableCopy;
_messageDetailsAllowSharing = YES;
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+5 -1
View File
@@ -323,7 +323,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
{
// Check we can output the error
NSParameterAssert(error);
*error = MXKEventFormatterErrorNone;
// Filter the events according to their type.
@@ -1673,6 +1673,10 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
displayText = [MXBeaconInfo modelFromJSON:event.content].desc;
break;
}
case MXEventTypeRoomServerACL: {
displayText = [[[FederationEventHelper alloc] init] statusInTimelineForEventWithEvent:event];
break;
}
default:
*error = MXKEventFormatterErrorUnknownEventType;
break;