refactor: filter regexp (#4412)

Refactor: filter regexp
hexojs · Jul 11, 2020 · f05e606 · f05e606
2 parents 17ea07b + c16010d
commit f05e606
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/plugins/filter/after_post_render/external_link.js b/lib/plugins/filter/after_post_render/external_link.js
@@ -27,7 +27,7 @@ function externalLinkFilter(data) {
     return;
   }
 
-  data.content = data.content.replace(/<a([\s]+|[\s]+[^<>]+[\s]+)href=["']([^<>"']+)["'][^<>]*>/gi, (str, _, href) => {
+  data.content = data.content.replace(/<a\s+(?:[^<>]+\s)?href=["']([^<>"']+)["'][^<>]*>/gi, (str, href) => {
     if (/target=/gi.test(str) || !isExternalLink(href, config.url, EXTERNAL_LINK_POST_CONFIG.exclude)) return str;
 
     if (/rel=/gi.test(str)) {

diff --git a/lib/plugins/filter/after_render/external_link.js b/lib/plugins/filter/after_render/external_link.js
@@ -27,10 +27,10 @@ function externalLinkFilter(data) {
     return;
   }
 
-  data = data.replace(/<a([\s]+|[\s]+[^<>]+[\s]+)href=["']([^<>"']+)["'][^<>]*>/gi, (str, _, href) => {
-    if (/target=/gi.test(str) || !isExternalLink(href, config.url, EXTERNAL_LINK_SITE_CONFIG.exclude)) return str;
+  data = data.replace(/<a\s+(?:[^<>]+\s)?href=["']([^<>"']+)["'][^<>]*>/gi, (str, href) => {
+    if (/target=/i.test(str) || !isExternalLink(href, config.url, EXTERNAL_LINK_SITE_CONFIG.exclude)) return str;
 
-    if (/rel=/gi.test(str)) {
+    if (/rel=/i.test(str)) {
       str = str.replace(/rel="(.*?)"/gi, (relStr, rel) => {
         return rel.includes('noopenner') ? relStr : `rel="${rel} noopener"`;
       });

diff --git a/lib/plugins/filter/after_render/meta_generator.js b/lib/plugins/filter/after_render/meta_generator.js
@@ -7,7 +7,7 @@ function hexoMetaGeneratorInject(data) {
   if (!NEED_INJECT) return;
 
   if (!this.config.meta_generator
-    || data.match(/<meta([\s]+|[\s]+[^<>]+[\s]+)name=['|"]?generator['|"]?/i)) {
+    || data.match(/<meta\s+(?:[^<>]+\s)?name=['|"]?generator['|"]?/i)) {
     NEED_INJECT = false;
     return;
   }