diff --git a/webroot/vendor/autolink.js b/webroot/vendor/autolink.js
index 66ba0e8ec..4bbfba284 100644
--- a/webroot/vendor/autolink.js
+++ b/webroot/vendor/autolink.js
@@ -1,6 +1,6 @@
 const re = {
   http: /.*?:\/\//g,
-  url: /(\s|^)((https?|ftp):\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\w-\/\?\=\#\.])*/gi,
+  url: /(\s|^)((https?|ftp):\/\/)?[\da-z\d:%._\+~#=-]{2,256}\.[a-z]{2,6}\b([\da-z:%_\+.~#?&//=-]*)/gi,
   image: /\.(jpe?g|png|gif)$/,
   email: /(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/gi,
   cloudmusic: /http:\/\/music\.163\.com\/#\/song\?id=(\d+)/i,