Merge pull request #139 from wordpress-mobile/issues/filter-gutenberg…

…-comments Issues/filter gutenberg comments
wordpress-mobile · May 30, 2018 · 22e375c · 22e375c
2 parents fd11b1d + e87e600
commit 22e375c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/WordPressShared.podspec b/WordPressShared.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressShared"
-  s.version       = "1.0.4"
+  s.version       = "1.0.5"
   s.summary       = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description   = <<-DESC

diff --git a/WordPressShared/Core/Utility/RichContentFormatter.swift b/WordPressShared/Core/Utility/RichContentFormatter.swift
@@ -11,6 +11,7 @@ import Foundation
         static let styleTags = try! NSRegularExpression(pattern: "<style[^>]*?>[\\s\\S]*?</style>", options: .caseInsensitive)
         static let scriptTags = try! NSRegularExpression(pattern: "<script[^>]*?>[\\s\\S]*?</script>", options: .caseInsensitive)
         static let tableTags = try! NSRegularExpression(pattern: "<table[^>]*?>[\\s\\S]*?</table>", options: .caseInsensitive)
+        static let gutenbergComments = try! NSRegularExpression(pattern: "<p><!-- /?wp:.+? /?--></p>[\\n]?", options: .caseInsensitive)
 
         // Normalizaing Paragraphs
         static let divTagsStart = try! NSRegularExpression(pattern: "<div[^>]*>", options: .caseInsensitive)
@@ -84,6 +85,11 @@ import Foundation
                                                                    range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: "")
 
+        content = RegEx.gutenbergComments.stringByReplacingMatches(in: content,
+                                                                   options: .reportCompletion,
+                                                                   range: NSRange(location: 0, length: content.count),
+                                                                   withTemplate: "")
+
         return content
     }
 

diff --git a/WordPressSharedTests/RichContentFormatterTests.swift b/WordPressSharedTests/RichContentFormatterTests.swift
@@ -12,8 +12,8 @@ class RichContentFormatterTests: XCTestCase {
 
 
     func testRemoveForbiddenTags() {
-        let str = "<p>test</p><p>test</p>"
-        let styleStr = "<script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style>"
+        let str = "<p>test</p><p>test</p><img>"
+        let styleStr = "<script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style><p>test</p><p><!-- wp:paragraph {\"fontSize\":\"large\"}--></p><p><!-- /wp:paragraph --></p>\n<img><p><!-- wp:self-closing-tag /--></p><script>alert();</script><style>body{color:#000;}</style>"
         let sanitizedStr = RichContentFormatter.removeForbiddenTags(styleStr)
         XCTAssertTrue(str == sanitizedStr, "The forbidden tags were not removed.")
     }