Skip to content

Commit 8ae5269

Browse files
giomfoVelin92
authored andcommitted
Add a new state event type: "m.room.retention"
# Conflicts: # MatrixSDK/Contrib/Swift/JSONModels/MXEvent.swift # MatrixSDK/JSONModels/MXEvent.h # MatrixSDK/JSONModels/MXEvent.m # MatrixSDK/Utils/MXTools.m
1 parent 82f93fb commit 8ae5269

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

MatrixSDK/Contrib/Swift/JSONModels/MXEvent.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public enum MXEventType: Equatable, Hashable {
8686

8787
case beaconInfo
8888
case beacon
89+
case roomRetention
8990

9091
case custom(String)
9192

@@ -141,6 +142,7 @@ public enum MXEventType: Equatable, Hashable {
141142
case .taggedEvents: return kMXEventTypeStringTaggedEvents
142143
case .spaceChild: return kMXEventTypeStringSpaceChild
143144
case .spaceOrder: return kMXEventTypeStringSpaceOrderMSC3230
145+
case .roomRetention: return kMXEventTypeStringRoomRetention
144146

145147
case .pollStart: return kMXEventTypeStringPollStartMSC3381
146148
case .pollResponse: return kMXEventTypeStringPollResponseMSC3381
@@ -157,7 +159,7 @@ public enum MXEventType: Equatable, Hashable {
157159
}
158160

159161
public init(identifier: String) {
160-
let events: [MXEventType] = [.roomName, .roomTopic, .roomAvatar, .roomMember, .roomCreate, .roomJoinRules, .roomPowerLevels, .roomAliases, .roomCanonicalAlias, .roomEncrypted, .roomEncryption, .roomGuestAccess, .roomHistoryVisibility, .roomKey, .roomForwardedKey, .roomKeyRequest, .roomMessage, .roomMessageFeedback, .roomRedaction, .roomThirdPartyInvite, .roomTag, .presence, .typing, .callInvite, .callCandidates, .callAnswer, .callSelectAnswer, .callHangup, .callReject, .callNegotiate, .callReplaces, .callRejectReplacement, .callAssertedIdentity, .callAssertedIdentityUnstable, .reaction, .receipt, .roomTombStone, .keyVerificationStart, .keyVerificationAccept, .keyVerificationKey, .keyVerificationMac, .keyVerificationCancel, .keyVerificationDone, .secretRequest, .secretSend, .secretStorageDefaultKey, .taggedEvents, .spaceChild, .spaceOrder, .pollStart, .pollResponse, .pollEnd, .beaconInfo, .beacon]
162+
let events: [MXEventType] = [.roomName, .roomTopic, .roomAvatar, .roomMember, .roomCreate, .roomJoinRules, .roomPowerLevels, .roomAliases, .roomCanonicalAlias, .roomEncrypted, .roomEncryption, .roomGuestAccess, .roomHistoryVisibility, .roomKey, .roomForwardedKey, .roomKeyRequest, .roomMessage, .roomMessageFeedback, .roomRedaction, .roomThirdPartyInvite, .roomTag, .presence, .typing, .callInvite, .callCandidates, .callAnswer, .callSelectAnswer, .callHangup, .callReject, .callNegotiate, .callReplaces, .callRejectReplacement, .callAssertedIdentity, .callAssertedIdentityUnstable, .reaction, .receipt, .roomTombStone, .keyVerificationStart, .keyVerificationAccept, .keyVerificationKey, .keyVerificationMac, .keyVerificationCancel, .keyVerificationDone, .secretRequest, .secretSend, .secretStorageDefaultKey, .taggedEvents, .spaceChild, .spaceOrder, .pollStart, .pollResponse, .pollEnd, .beaconInfo, .beacon, .roomRetention]
161163

162164
if let type = events.first(where: { $0.identifier == identifier }) {
163165
self = type

MatrixSDK/JSONModels/MXEvent.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ typedef NS_ENUM(NSInteger, MXEventType)
103103
MXEventTypeSpaceOrder,
104104
MXEventTypeBeaconInfo,
105105
MXEventTypeBeacon,
106+
MXEventTypeRoomRetention,
106107

107108
// The event is a custom event. Refer to its `MXEventTypeString` version
108109
MXEventTypeCustom = 1000
@@ -163,6 +164,7 @@ FOUNDATION_EXPORT NSString *const kMXEventTypeStringSpaceChild;
163164
FOUNDATION_EXPORT NSString *const kMXEventTypeStringSpaceOrder;
164165
FOUNDATION_EXPORT NSString *const kMXEventTypeStringSpaceOrderMSC3230;
165166
FOUNDATION_EXPORT NSString *const kMXEventTypeStringSpaceOrderKey;
167+
FOUNDATION_EXPORT NSString *const kMXEventTypeStringRoomRetention;
166168

167169
// Interactive key verification
168170
FOUNDATION_EXPORT NSString *const kMXEventTypeStringKeyVerificationRequest;

MatrixSDK/JSONModels/MXEvent.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
NSString *const kMXMessageTypeLocation = @"m.location";
116116
NSString *const kMXMessageTypeFile = @"m.file";
117117
NSString *const kMXMessageTypeServerNotice = @"m.server_notice";
118+
NSString *const kMXEventTypeStringRoomRetention = @"m.room.retention";
118119
NSString *const kMXMessageTypeKeyVerificationRequest = @"m.key.verification.request";
119120

120121
NSString *const kMXMessageBodyKey = @"body";

MatrixSDK/Utils/MXTools.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ + (void)initialize
215215
kMXEventTypeStringBeaconInfoMSC3672 : @(MXEventTypeBeaconInfo),
216216
kMXEventTypeStringBeaconInfo : @(MXEventTypeBeaconInfo),
217217
kMXEventTypeStringBeaconMSC3672 : @(MXEventTypeBeacon),
218-
kMXEventTypeStringBeacon : @(MXEventTypeBeacon)
218+
kMXEventTypeStringBeacon : @(MXEventTypeBeacon),
219+
kMXEventTypeStringRoomRetention: @(MXEventTypeRoomRetention),
219220
};
220221

221222
isEmailAddressRegex = [NSRegularExpression regularExpressionWithPattern:[NSString stringWithFormat:@"^%@$", kMXToolsRegexStringForEmailAddress]

0 commit comments

Comments
 (0)