From b9581dd428ffb76649452782d56ca9043abbd299 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Wed, 14 Aug 2013 19:15:46 -0700 Subject: [PATCH] Separate out IPv4 again --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/Linkification/Linkify.coffee | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 99f8666b6..e4a799257 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -4422,7 +4422,7 @@ if (g.VIEW === 'catalog' || !Conf['Linkify']) { return; } - this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2})(\/|(?!.))|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i; + this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2})(\/|(?!.))|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i; if (Conf['Comment Expansion']) { ExpandComment.callbacks.push(this.node); } diff --git a/builds/crx/script.js b/builds/crx/script.js index 51e35e7f0..c94ac2bd2 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -4431,7 +4431,7 @@ if (g.VIEW === 'catalog' || !Conf['Linkify']) { return; } - this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2})(\/|(?!.))|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i; + this.regString = /((https?|mailto|git|magnet|ftp|irc):([a-z\d%\/])|[-a-z\d.]+[.](aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2})(\/|(?!.))|[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}|[-\w\d.@]+@[a-z\d.-]+\.[a-z\d])/i; if (Conf['Comment Expansion']) { ExpandComment.callbacks.push(this.node); } diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index 2154e303c..2ee844501 100755 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -9,11 +9,14 @@ Linkify = [a-z\d%/] ) | - # This should account for virtually all links posted without http:, including IPv4 addresses + # This should account for virtually all links posted without http: [-a-z\d.]+[.]( - aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[\d]{1,3}|[a-z]{2} + aero|asia|biz|cat|com|coop|info|int|jobs|mobi|museum|name|net|org|post|pro|tel|travel|xxx|edu|gov|mil|[a-z]{2} )(/|(?!.)) | + # IPv4 Addresses + [\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3} + | # E-mails [-\w\d.@]+@[a-z\d.-]+\.[a-z\d] )///i