Merge branch 'develop' into gutenberg/add/featured-functionality-to-i…

…mage-block
wordpress-mobile · Jul 1, 2021 · 1c973d5 · 1c973d5
2 parents e6fff4a + 15a51fb
commit 1c973d5
Show file tree

Hide file tree

Showing 7 changed files with 1,064 additions and 2 deletions.
diff --git a/MIGRATIONS.md b/MIGRATIONS.md
@@ -3,6 +3,12 @@
 This file documents changes in the data model. Please explain any changes to the
 data model as well as any custom migrations.
 
+## WordPress 126
+
+@scoutharris 2021-06-28
+
+- `Comment`: added  `canModerate` attribute. (required, default `false`, `Boolean`)
+
 ## WordPress 125
 
 @aerych 2021-06-04

diff --git a/WordPress/Classes/Models/Comment.h b/WordPress/Classes/Models/Comment.h
@@ -46,6 +46,7 @@ extern NSString * const CommentStatusDraft;
 @property (nonatomic, strong) NSAttributedString *attributedContent;
 @property (nonatomic) BOOL isLiked;
 @property (nonatomic, assign) BOOL isNew;
+@property (nonatomic) BOOL canModerate;
 
 /// Helper methods
 ///

diff --git a/WordPress/Classes/Models/Comment.m b/WordPress/Classes/Models/Comment.m
@@ -37,6 +37,7 @@ @implementation Comment
 @dynamic type;
 @dynamic isLiked;
 @dynamic likeCount;
+@dynamic canModerate;
 @synthesize isNew;
 @synthesize attributedContent;
 

diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -1148,6 +1148,7 @@ - (void)updateComment:(Comment *)comment withRemoteComment:(RemoteComment *)remo
     comment.type = remoteComment.type;
     comment.isLiked = remoteComment.isLiked;
     comment.likeCount = remoteComment.likeCount;
+    comment.canModerate = remoteComment.canModerate;
 
     // if the post for the comment is not set, check if that post is already stored and associate them
     if (!comment.post) {
@@ -1174,6 +1175,7 @@ - (RemoteComment *)remoteCommentWithComment:(Comment *)comment
     remoteComment.type = comment.type;
     remoteComment.isLiked = comment.isLiked;
     remoteComment.likeCount = comment.likeCount;
+    remoteComment.canModerate = comment.canModerate;
     return remoteComment;
 }
 

diff --git a/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion b/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>WordPress 125.xcdatamodel</string>
+	<string>WordPress 126.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents b/WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -6145,6 +6145,7 @@
 		986C90872231AD6200FC31E1 /* PostStatsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostStatsViewModel.swift; sourceTree = "<group>"; };
 		986CC4D120E1B2F6004F300E /* CustomLogFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomLogFormatter.swift; sourceTree = "<group>"; };
 		986DD19B218D002500D28061 /* WPStyleGuide+Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WPStyleGuide+Stats.swift"; sourceTree = "<group>"; };
+		987044AD268A9A5300BD0571 /* WordPress 126.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 126.xcdatamodel"; sourceTree = "<group>"; };
 		98712D1923DA1C7E00555316 /* WidgetNoConnectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetNoConnectionCell.swift; sourceTree = "<group>"; };
 		98712D1A23DA1C7E00555316 /* WidgetNoConnectionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WidgetNoConnectionCell.xib; sourceTree = "<group>"; };
 		9872CB2F203B8A730066A293 /* SignupEpilogueTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupEpilogueTableViewController.swift; sourceTree = "<group>"; };
@@ -24618,6 +24619,7 @@
 		E125443B12BF5A7200D87A0A /* WordPress.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				987044AD268A9A5300BD0571 /* WordPress 126.xcdatamodel */,
 				E6EE8807266ABE9F009BC219 /* WordPress 125.xcdatamodel */,
 				984FB2B22646001E00878DE0 /* WordPress 124.xcdatamodel */,
 				9804E0B42639D88C00532095 /* WordPress 123.xcdatamodel */,
@@ -24744,7 +24746,7 @@
 				8350E15911D28B4A00A7B073 /* WordPress.xcdatamodel */,
 				E125443D12BF5A7200D87A0A /* WordPress 2.xcdatamodel */,
 			);
-			currentVersion = E6EE8807266ABE9F009BC219 /* WordPress 125.xcdatamodel */;
+			currentVersion = 987044AD268A9A5300BD0571 /* WordPress 126.xcdatamodel */;
 			name = WordPress.xcdatamodeld;
 			path = Classes/WordPress.xcdatamodeld;
 			sourceTree = "<group>";