minor proxy bug

RyzomApps · Nov 10, 2024 · 227701f · 227701f
1 parent b6eba9e
commit 227701f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/Client/Network/Web/WebBrowserProxyThread.cs b/Client/Network/Web/WebBrowserProxyThread.cs
@@ -151,6 +151,22 @@ private async Task HandleIncomingConnections()
                     {
                         var htmlData = result.Content.ReadAsStringAsync().Result;
 
+                        // Replace add anchor tags to lua links
+                        htmlData = Regex.Replace(htmlData, @"<lua>([^<]*?)((https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_\+.~#?&//=]*)([^<]*?))+</lua>",
+                            m =>
+                            {
+                                string ret = "<lua>";
+
+                                ret += m.Groups[1].Value;
+
+                                for (int i = 0; i < m.Groups[3].Captures.Count; i++)
+                                {
+                                    ret += "<a href=\"" + m.Groups[3].Captures[i].Value + "\">" + m.Groups[3].Captures[i].Value + "</a>" + m.Groups[4].Captures[i].Value;
+                                }
+
+                                return ret + "</lua>";
+                            });
+
                         // Replace lua tags
                         htmlData = htmlData.Replace("<lua>", "<pre><code class=\"language-clike\">");
                         htmlData = htmlData.Replace("</lua>", "</code></pre>");
@@ -164,9 +180,6 @@ private async Task HandleIncomingConnections()
                         // Remove size tags
                         htmlData = Regex.Replace(htmlData, "<([^>]*?)(size=\"(.*?)\")(.*?)>", "<$1$4>");
 
-                        // Remove bgcolor tags
-                        //htmlData = Regex.Replace(htmlData, "<([^>]*?)(bgcolor=\"(.*?)\")(.*?)>", "<$1$4>");
-
                         // Add some style informations
                         htmlData = htmlData.Replace("</head>",
                             "<link href=\"https://prismjs.com/themes/prism.css\" rel=\"stylesheet\" />\r\n" +

diff --git a/Client/RyzomClient.cs b/Client/RyzomClient.cs
@@ -219,7 +219,7 @@ public RyzomClient(bool autoStart = true)
             _interfaceManager = new InterfaceManager(this);
             _networkManager = new NetworkManager(this);
             _actionHandlerManager = new ActionHandlerManager(this);
-            
+
             // create the data dir
             if (!Directory.Exists("data")) Directory.CreateDirectory("data");
 
@@ -953,7 +953,14 @@ private void TimeoutDetector()
 
             while (true)
             {
-                Thread.Sleep(TimeSpan.FromSeconds(10));
+                try
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(10));
+                }
+                catch
+                {
+                    return;
+                }
 
                 if (_networkConnection.ConnectionState == ConnectionState.NotInitialized ||
                     _networkConnection.ConnectionState == ConnectionState.Connected)
@@ -1314,7 +1321,7 @@ public IEnumerable<string> AutoComplete(string behindCursor)
                     var stringManager = GetApiStringManager();
                     var networkManager = GetApiNetworkManager();
 
-                    if (databaseManager == null || stringManager == null || networkManager == null) 
+                    if (databaseManager == null || stringManager == null || networkManager == null)
                         return ret;
 
                     for (var gm = 0; gm < 7; gm++)
@@ -1325,7 +1332,7 @@ public IEnumerable<string> AutoComplete(string behindCursor)
                         var nameId = databaseManager.GetProp($"SERVER:GROUP:{gm}:NAME");
                         stringManager.GetString((uint)nameId, out var name, networkManager);
                         name = EntityHelper.RemoveTitleAndShardFromName(name);
-                        if(!ret.Contains(name))
+                        if (!ret.Contains(name))
                             ret.Add(name);
                     }
                 }