tag unless textWithinUnderscores starts with valid email
+ replacement: (match, extraLeadingUnderscores, textWithinUnderscores) => {
+ if (textWithinUnderscores.includes('') || this.containsNonPairTag(textWithinUnderscores)) {
+ return match;
+ }
+ if (String(textWithinUnderscores).match(`^${CONST.REG_EXP.MARKDOWN_EMAIL}`)) {
+ return `${extraLeadingUnderscores}${textWithinUnderscores}`;
+ }
+ return `${extraLeadingUnderscores}${textWithinUnderscores}`;
+ },
+ },
+
+ /**
+ * Automatically links emails that are not in a link. Runs before the autolinker as it will not link an
+ * email that is in a link
+ * Prevent emails from starting with [~_*]. Such emails should not be supported.
+ */
+ {
+ name: 'autoEmail',
+ regex: new RegExp(
+ `(?![^<]*>|[^<>]*<\\/(?!em))([^\\w'#%+-]|^|)${CONST.REG_EXP.MARKDOWN_EMAIL}(?!((?:(?!|[^<]*(<\\/pre>|<\\/code>))`,
+ 'gim',
+ ),
+ replacement: '$1$2',
+ },
+
{
name: 'heading1',
regex: /^# +(?! )((?:(?!|\n|\r\n).)+)/gm,
@@ -175,26 +200,6 @@ export default class ExpensiMark {
return `${replacedText}
`;
},
},
- {
- /**
- * Use \b in this case because it will match on words, letters,
- * and _: https://www.rexegg.com/regex-boundaries.html#wordboundary
- * The !_blank is to prevent the `target="_blank">` section of the
- * link replacement from being captured Additionally, something like
- * `\b\_([^<>]*?)\_\b` doesn't work because it won't replace
- * `_https://www.test.com_`
- * Use [\s\S]* instead of .* to match newline
- */
- name: 'italic',
- regex: /(\b_+|\b)(?!_blank")_((?![\s_])[\s\S]*?[^\s_])_(?![^\W_])(?![^<]*(<\/pre>|<\/code>|<\/a>|<\/mention-user>|_blank))/g,
-
- // We want to add extraLeadingUnderscores back before the tag
- replacement: (match, extraLeadingUnderscores, textWithinUnderscores) => (
- textWithinUnderscores.includes('') || this.containsNonPairTag(textWithinUnderscores)
- ? match
- : `${extraLeadingUnderscores}${textWithinUnderscores}`
- ),
- },
{
// Use \B in this case because \b doesn't match * or ~.
// \B will match everything that \b doesn't, so it works
diff --git a/lib/Url.js b/lib/Url.js
index f8eb7e9e..12c53af1 100644
--- a/lib/Url.js
+++ b/lib/Url.js
@@ -2,7 +2,7 @@ import TLD_REGEX from './tlds';
const ALLOWED_PORTS = '([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])';
const URL_PROTOCOL_REGEX = '((ht|f)tps?:\\/\\/)';
-const URL_WEBSITE_REGEX = `${URL_PROTOCOL_REGEX}?((?:www\\.)?[a-z0-9](?:[-a-z0-9]*[a-z0-9])?\\.)+(?:${TLD_REGEX})(?:\\:${ALLOWED_PORTS}|\\b|(?=_))`;
+const URL_WEBSITE_REGEX = `${URL_PROTOCOL_REGEX}?((?:www\\.)?[a-z0-9](?:[-a-z0-9]*[a-z0-9])?\\.)+(?:${TLD_REGEX})(?:\\:${ALLOWED_PORTS}|\\b|(?=_))(?!@(?:[a-z\\d-]+\\.)+[a-z]{2,})`;
const addEscapedChar = reg => `(?:${reg}|&(?:amp|quot|#x27);)`;
const URL_PATH_REGEX = `(?:${addEscapedChar('[.,=(+$!*]')}?\\/${addEscapedChar('[-\\w$@.+!*:(),=%~]')}*${addEscapedChar('[-\\w~@:%)]')}|\\/)*`;
const URL_PARAM_REGEX = `(?:\\?${addEscapedChar('[-\\w$@.+!*()\\/,=%{}:;\\[\\]\\|_|~]')}*)?`;