Merge pull request #705 from meganz/fix/mega-urls-rich-links

#12877 Not manage as rich link mega urls
meganz · Aug 14, 2019 · 4d7923f · 4d7923f
2 parents f70fddc + 38aaa26
commit 4d7923f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/chatd.cpp b/src/chatd.cpp
@@ -5094,16 +5094,14 @@ bool Message::parseUrl(const std::string &url)
         }
     }
 
-    if (urlToParse.find("mega.co.nz/#!") != std::string::npos || urlToParse.find("mega.co.nz/#F!") != std::string::npos ||
-            urlToParse.find("mega.nz/#!") != std::string::npos || urlToParse.find("mega.nz/#F!") != std::string::npos ||
-            urlToParse.find("mega.nz/chat/") != std::string::npos)
+    std::regex megaUrlExpression("^((WWW.|www.)?mega.+(nz/|co.nz/)).*((#F!|#!|C!|chat/)[a-z0-9A-Z-._~:\/?#!$&'()*+,;=\-@]+)$");
+    if (regex_match(urlToParse, megaUrlExpression))
     {
         return false;
     }
 
     std::regex regularExpresion("^(WWW.|www.)?[a-z0-9A-Z-._~:/?#@!$&'()*+,;=]+[.][a-zA-Z]{2,5}(:[0-9]{1,5})?([a-z0-9A-Z-._~:/?#@!$&'()*+,;=]*)?$");
 
-
     return regex_match(urlToParse, regularExpresion);
 }