Merge pull request #554 from matrix-org/riot_1937_3

Room tag: Add definition for the new kMXRoomTagServerNotice tag
matrix-org · Aug 23, 2018 · 8dda339 · 8dda339
2 parents 8c74fc2 + 4add74d
commit 8dda339
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/MatrixSDK/JSONModels/MXJSONModels.h b/MatrixSDK/JSONModels/MXJSONModels.h
@@ -416,6 +416,7 @@ FOUNDATION_EXPORT NSString *const kMXLoginIdentifierTypePhone;
  */
 FOUNDATION_EXPORT NSString *const kMXRoomTagFavourite;
 FOUNDATION_EXPORT NSString *const kMXRoomTagLowPriority;
+FOUNDATION_EXPORT NSString *const kMXRoomTagServerNotice;
 
 /**
  `MXRoomTag` represents a room tag.

diff --git a/MatrixSDK/JSONModels/MXJSONModels.m b/MatrixSDK/JSONModels/MXJSONModels.m
@@ -343,6 +343,7 @@ + (id)modelFromJSON:(NSDictionary *)JSONDictionary
 
 NSString *const kMXRoomTagFavourite = @"m.favourite";
 NSString *const kMXRoomTagLowPriority = @"m.lowpriority";
+NSString *const kMXRoomTagServerNotice = @"m.server_notice";
 
 @interface MXRoomTag()
 {