fix #2188

Licho1 · Licho1 · commit 6e9256c9926f · 2018-04-16T17:51:36.000+02:00
diff --git a/Zero-K.info/ForumParser/ParserExtensions.cs b/Zero-K.info/ForumParser/ParserExtensions.cs
@@ -7,13 +7,15 @@ namespace ZeroKWeb.ForumParser
 {
     public static class ParserExtensions
     {
-        public static LinkedListNode<Tag> NextNodeOfType<T>(this LinkedListNode<Tag> node) {
+        public static LinkedListNode<Tag> NextNodeOfType<T>(this LinkedListNode<Tag> node)
+        {
             while (node != null && !(node.Value is T)) node = node.Next;
             return node;
         }
 
 
-        public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> node, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> whileCondition) {
+        public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> node, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> whileCondition)
+        {
             var sb = new StringBuilder();
             while (node != null && whileCondition(node))
             {
@@ -23,25 +25,30 @@ public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> n
             return sb.ToString();
         }
 
-        public static string GetOriginalContentUntilTag<T>(this LinkedListNode<Tag> node) {
+        public static string GetOriginalContentUntilTag<T>(this LinkedListNode<Tag> node)
+        {
             return node.GetOriginalContentWhileCondition(x => !(x.Value is T));
         }
 
-        public static string GetOriginalContentUntilNode(this LinkedListNode<Tag> startNode, LinkedListNode<Tag> endNode) {
+        public static string GetOriginalContentUntilNode(this LinkedListNode<Tag> startNode, LinkedListNode<Tag> endNode)
+        {
             return startNode.GetOriginalContentWhileCondition(x => x != endNode);
         }
 
-        public static string GetOriginalContentUntilWhiteSpaceOrEndline(this LinkedListNode<Tag> node) {
+        public static string GetOriginalContentUntilWhiteSpaceOrEndline(this LinkedListNode<Tag> node)
+        {
             return node.GetOriginalContentWhileCondition(x => !(x.Value is SpaceTag) && !(x.Value is NewLineTag));
         }
 
-        public static LinkedListNode<Tag> TranslateWhile(this LinkedListNode<Tag> startNode, TranslateContext context, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {
+        public static LinkedListNode<Tag> TranslateWhile(this LinkedListNode<Tag> startNode, TranslateContext context, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)
+        {
             var n = startNode;
             while (n != null && condition(n)) n = n.Value.Translate(context, n);
             return n;
         }
 
-        public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {
+        public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)
+        {
             while (startNode != null)
             {
                 if (condition(startNode)) return startNode;
@@ -50,7 +57,8 @@ public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode,
             return null;
         }
 
-        public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {
+        public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)
+        {
             while (startNode != null)
             {
                 if (condition(startNode)) return startNode;
@@ -60,41 +68,52 @@ public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> star
         }
 
 
-        public static IEnumerable<LinkedListNode<T>> AsEnumerable<T>(this LinkedListNode<T> startNode) {
+        public static IEnumerable<LinkedListNode<T>> AsEnumerable<T>(this LinkedListNode<T> startNode)
+        {
             return new LinkedListNodeEnumerator<T>(startNode);
         }
 
-        public static IEnumerable<LinkedListNode<T>> AsReverseEnumerable<T>(this LinkedListNode<T> startNode) {
+        public static IEnumerable<LinkedListNode<T>> AsReverseEnumerable<T>(this LinkedListNode<T> startNode)
+        {
             return new LinkedListNodeBackEnumerator<T>(startNode);
         }
 
 
-        public static LinkedListNode<Tag> TranslateUntilNode(this LinkedListNode<Tag> startNode, TranslateContext context, LinkedListNode<Tag> endNode) {
+        public static LinkedListNode<Tag> TranslateUntilNode(this LinkedListNode<Tag> startNode, TranslateContext context, LinkedListNode<Tag> endNode)
+        {
             return startNode.TranslateWhile(context, x => x != endNode);
         }
 
         static Regex linkMatcher = new Regex("^(mailto|spring|http|https|ftp|ftps|zk)\\://[^\\\"']+$", RegexOptions.Compiled);
 
-        public static bool IsValidLink(this string content) {
+        public static bool IsValidLink(this string content)
+        {
             if (string.IsNullOrEmpty(content)) return false;
             return linkMatcher.IsMatch(content);
         }
 
         public static bool IsValidLinkOrRelativeUrl(this string content, bool imageOnly)
         {
             if (string.IsNullOrEmpty(content)) return false;
+            if (!linkMatcher.IsMatch(content)) return false;
+
             Uri parsed;
-            if (!linkMatcher.IsMatch(content) || Uri.TryCreate(content, UriKind.Relative, out parsed)) return false;
-            if (imageOnly)
+            if (Uri.TryCreate(content, UriKind.RelativeOrAbsolute, out parsed) && parsed != null)
             {
-                Uri.TryCreate(content, UriKind.RelativeOrAbsolute, out parsed);
-                // for proper check do HEAD request and check response, but this needs some cache 
-                if (!(parsed.AbsolutePath.EndsWith(".jpg") || parsed.AbsolutePath.EndsWith(".gif") || parsed.AbsolutePath.EndsWith(".png") || parsed.AbsolutePath.EndsWith(".jpeg"))) return false;
+                if (imageOnly)
+                {
+                    // for proper check do HEAD request and check response, but this needs some cache 
+                    if (!(parsed.AbsolutePath.EndsWith(".jpg") || parsed.AbsolutePath?.EndsWith(".gif") == true || parsed.AbsolutePath.EndsWith(".png") ||
+                          parsed.AbsolutePath.EndsWith(".jpeg"))) return false;
+                }
+
+                return true;
             }
-            return true;
+            return false;
         }
 
-        public static char ToLower(this char high) {
+        public static char ToLower(this char high)
+        {
             if (high >= 'A' && high <= 'Z') return (char)(high - 'A' + 'a');
             return high;
         }

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,15 @@ namespace ZeroKWeb.ForumParser`
`7`	`7`	`{`
`8`	`8`	`public static class ParserExtensions`
`9`	`9`	`{`
`10`		`- public static LinkedListNode<Tag> NextNodeOfType<T>(this LinkedListNode<Tag> node) {`
	`10`	`+ public static LinkedListNode<Tag> NextNodeOfType<T>(this LinkedListNode<Tag> node)`
	`11`	`+ {`
`11`	`12`	`while (node != null && !(node.Value is T)) node = node.Next;`
`12`	`13`	`return node;`
`13`	`14`	`}`
`14`	`15`
`15`	`16`
`16`		`- public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> node, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> whileCondition) {`
	`17`	`+ public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> node, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> whileCondition)`
	`18`	`+ {`
`17`	`19`	`var sb = new StringBuilder();`
`18`	`20`	`while (node != null && whileCondition(node))`
`19`	`21`	`{`
`@@ -23,25 +25,30 @@ public static string GetOriginalContentWhileCondition(this LinkedListNode<Tag> n`
`23`	`25`	`return sb.ToString();`
`24`	`26`	`}`
`25`	`27`
`26`		`- public static string GetOriginalContentUntilTag<T>(this LinkedListNode<Tag> node) {`
	`28`	`+ public static string GetOriginalContentUntilTag<T>(this LinkedListNode<Tag> node)`
	`29`	`+ {`
`27`	`30`	`return node.GetOriginalContentWhileCondition(x => !(x.Value is T));`
`28`	`31`	`}`
`29`	`32`
`30`		`- public static string GetOriginalContentUntilNode(this LinkedListNode<Tag> startNode, LinkedListNode<Tag> endNode) {`
	`33`	`+ public static string GetOriginalContentUntilNode(this LinkedListNode<Tag> startNode, LinkedListNode<Tag> endNode)`
	`34`	`+ {`
`31`	`35`	`return startNode.GetOriginalContentWhileCondition(x => x != endNode);`
`32`	`36`	`}`
`33`	`37`
`34`		`- public static string GetOriginalContentUntilWhiteSpaceOrEndline(this LinkedListNode<Tag> node) {`
	`38`	`+ public static string GetOriginalContentUntilWhiteSpaceOrEndline(this LinkedListNode<Tag> node)`
	`39`	`+ {`
`35`	`40`	`return node.GetOriginalContentWhileCondition(x => !(x.Value is SpaceTag) && !(x.Value is NewLineTag));`
`36`	`41`	`}`
`37`	`42`
`38`		`- public static LinkedListNode<Tag> TranslateWhile(this LinkedListNode<Tag> startNode, TranslateContext context, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {`
	`43`	`+ public static LinkedListNode<Tag> TranslateWhile(this LinkedListNode<Tag> startNode, TranslateContext context, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)`
	`44`	`+ {`
`39`	`45`	`var n = startNode;`
`40`	`46`	`while (n != null && condition(n)) n = n.Value.Translate(context, n);`
`41`	`47`	`return n;`
`42`	`48`	`}`
`43`	`49`
`44`		`- public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {`
	`50`	`+ public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)`
	`51`	`+ {`
`45`	`52`	`while (startNode != null)`
`46`	`53`	`{`
`47`	`54`	`if (condition(startNode)) return startNode;`
`@@ -50,7 +57,8 @@ public static LinkedListNode<Tag> FirstNode(this LinkedListNode<Tag> startNode,`
`50`	`57`	`return null;`
`51`	`58`	`}`
`52`	`59`
`53`		`- public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition) {`
	`60`	`+ public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> startNode, Antlr.Runtime.Misc.Func<LinkedListNode<Tag>, bool> condition)`
	`61`	`+ {`
`54`	`62`	`while (startNode != null)`
`55`	`63`	`{`
`56`	`64`	`if (condition(startNode)) return startNode;`
`@@ -60,41 +68,52 @@ public static LinkedListNode<Tag> FirstNodeReverse(this LinkedListNode<Tag> star`
`60`	`68`	`}`
`61`	`69`
`62`	`70`
`63`		`- public static IEnumerable<LinkedListNode<T>> AsEnumerable<T>(this LinkedListNode<T> startNode) {`
	`71`	`+ public static IEnumerable<LinkedListNode<T>> AsEnumerable<T>(this LinkedListNode<T> startNode)`
	`72`	`+ {`
`64`	`73`	`return new LinkedListNodeEnumerator<T>(startNode);`
`65`	`74`	`}`
`66`	`75`
`67`		`- public static IEnumerable<LinkedListNode<T>> AsReverseEnumerable<T>(this LinkedListNode<T> startNode) {`
	`76`	`+ public static IEnumerable<LinkedListNode<T>> AsReverseEnumerable<T>(this LinkedListNode<T> startNode)`
	`77`	`+ {`
`68`	`78`	`return new LinkedListNodeBackEnumerator<T>(startNode);`
`69`	`79`	`}`
`70`	`80`
`71`	`81`
`72`		`- public static LinkedListNode<Tag> TranslateUntilNode(this LinkedListNode<Tag> startNode, TranslateContext context, LinkedListNode<Tag> endNode) {`
	`82`	`+ public static LinkedListNode<Tag> TranslateUntilNode(this LinkedListNode<Tag> startNode, TranslateContext context, LinkedListNode<Tag> endNode)`
	`83`	`+ {`
`73`	`84`	`return startNode.TranslateWhile(context, x => x != endNode);`
`74`	`85`	`}`
`75`	`86`
`76`	`87`	`static Regex linkMatcher = new Regex("^(mailto\|spring\|http\|https\|ftp\|ftps\|zk)\\://[^\\\"']+$", RegexOptions.Compiled);`
`77`	`88`
`78`		`- public static bool IsValidLink(this string content) {`
	`89`	`+ public static bool IsValidLink(this string content)`
	`90`	`+ {`
`79`	`91`	`if (string.IsNullOrEmpty(content)) return false;`
`80`	`92`	`return linkMatcher.IsMatch(content);`
`81`	`93`	`}`
`82`	`94`
`83`	`95`	`public static bool IsValidLinkOrRelativeUrl(this string content, bool imageOnly)`
`84`	`96`	`{`
`85`	`97`	`if (string.IsNullOrEmpty(content)) return false;`
	`98`	`+ if (!linkMatcher.IsMatch(content)) return false;`
	`99`	`+`
`86`	`100`	`Uri parsed;`
`87`		`- if (!linkMatcher.IsMatch(content) \|\| Uri.TryCreate(content, UriKind.Relative, out parsed)) return false;`
`88`		`- if (imageOnly)`
	`101`	`+ if (Uri.TryCreate(content, UriKind.RelativeOrAbsolute, out parsed) && parsed != null)`
`89`	`102`	`{`
`90`		`- Uri.TryCreate(content, UriKind.RelativeOrAbsolute, out parsed);`
`91`		`- // for proper check do HEAD request and check response, but this needs some cache`
`92`		`- if (!(parsed.AbsolutePath.EndsWith(".jpg") \|\| parsed.AbsolutePath.EndsWith(".gif") \|\| parsed.AbsolutePath.EndsWith(".png") \|\| parsed.AbsolutePath.EndsWith(".jpeg"))) return false;`
	`103`	`+ if (imageOnly)`
	`104`	`+ {`
	`105`	`+ // for proper check do HEAD request and check response, but this needs some cache`
	`106`	`+ if (!(parsed.AbsolutePath.EndsWith(".jpg") \|\| parsed.AbsolutePath?.EndsWith(".gif") == true \|\| parsed.AbsolutePath.EndsWith(".png") \|\|`
	`107`	`+ parsed.AbsolutePath.EndsWith(".jpeg"))) return false;`
	`108`	`+ }`
	`109`	`+`
	`110`	`+ return true;`
`93`	`111`	`}`
`94`		`- return true;`
	`112`	`+ return false;`
`95`	`113`	`}`
`96`	`114`
`97`		`- public static char ToLower(this char high) {`
	`115`	`+ public static char ToLower(this char high)`
	`116`	`+ {`
`98`	`117`	`if (high >= 'A' && high <= 'Z') return (char)(high - 'A' + 'a');`
`99`	`118`	`return high;`
`100`	`119`	`}`