Make link check lenient

rafalp · Apr 18, 2023 · 6c60b8c · 6c60b8c
1 parent 8278c78
commit 6c60b8c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/frontend/src/components/MarkupEditor/MarkupImageModal.jsx b/frontend/src/components/MarkupEditor/MarkupImageModal.jsx
@@ -1,7 +1,7 @@
 import React from "react"
 import modal from "../../services/modal"
-import isUrl from "../../utils/is-url"
 import FormGroup from "../form-group"
+import isUrl from "./isUrl"
 import { replaceSelection } from "./operations"
 
 class MarkupImageModal extends React.Component {
@@ -30,11 +30,6 @@ class MarkupImageModal extends React.Component {
       return false
     }
 
-    if (!isUrl(url)) {
-      this.setState({ error: gettext("Enter a valid address.") })
-      return false
-    }
-
     if (text.length > 0) {
       replaceSelection(selection, update, "![" + text + "](" + url + ")")
     } else {

diff --git a/frontend/src/components/MarkupEditor/MarkupLinkModal.jsx b/frontend/src/components/MarkupEditor/MarkupLinkModal.jsx
@@ -1,7 +1,7 @@
 import React from "react"
 import modal from "../../services/modal"
-import isUrl from "../../utils/is-url"
 import FormGroup from "../form-group"
+import isUrl from "./isUrl"
 import { replaceSelection } from "./operations"
 
 class MarkupLinkModal extends React.Component {
@@ -30,11 +30,6 @@ class MarkupLinkModal extends React.Component {
       return false
     }
 
-    if (!isUrl(url)) {
-      this.setState({ error: gettext("Enter a valid address.") })
-      return false
-    }
-
     if (text.length > 0) {
       replaceSelection(selection, update, "[" + text + "](" + url + ")")
     } else {

diff --git a/frontend/src/components/MarkupEditor/isUrl.js b/frontend/src/components/MarkupEditor/isUrl.js
@@ -0,0 +1,5 @@
+const URL_PATTERN = new RegExp("^(((ftps?)|(https?))://)", "i")
+
+export default function isUrl(str) {
+  return URL_PATTERN.test(str.trim())
+}
diff --git a/frontend/src/utils/is-url.js b/frontend/src/utils/is-url.js
diff --git a/misago/static/misago/js/misago.js b/misago/static/misago/js/misago.js
diff --git a/misago/static/misago/js/misago.js.map b/misago/static/misago/js/misago.js.map