From 32eae764316e308d095e6fcf654c86be5417bbf3 Mon Sep 17 00:00:00 2001
From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:59:31 +0900
Subject: [PATCH] Trading View fixes

---
 Core/Helper/SystemHelper.cs          | 28 +++++++++++++++-------------
 Monitor/Pages/SettingsGeneral.cshtml |  1 -
 PTMagic/Program.cs                   |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Core/Helper/SystemHelper.cs b/Core/Helper/SystemHelper.cs
index c315e50..3c2d269 100644
--- a/Core/Helper/SystemHelper.cs
+++ b/Core/Helper/SystemHelper.cs
@@ -536,20 +536,14 @@ namespace Core.Helper
       string result = "#";
       if (platform.Equals("TradingView"))
       {
-        result = "https://www.tradingview.com/symbols/" + market.ToUpper() + "/?exchange=" + exchange.ToUpper();
-      }
-      else if (platform.Equals("TradingViewFutures"))
-      {
-        result = "https://www.tradingview.com/chart/?symbol=";
-
-        string pairName = SystemHelper.StripBadCode(market, Constants.WhiteListMinimal);
-
-        if (pairName.StartsWith(mainMarket))
+        if (exchange.Equals("binancefutures", StringComparison.InvariantCultureIgnoreCase))
         {
-          pairName = pairName.Replace(mainMarket, "") + mainMarket;
+          result = "https://www.tradingview.com/chart/?symbol=BINANCE:" + market.ToUpper() + "PERP";
+        }
+        else
+        {
+          result = "https://www.tradingview.com/?symbol=" + exchange.ToUpper() + ":" + market.ToUpper();
         }
-
-        result += pairName + "PERP";
       }
       else
       {
@@ -614,8 +608,16 @@ namespace Core.Helper
         pairName = pairName.Replace(mainMarket, "") + mainMarket;
       }
 
-      result += pairName;
+      if (exchange.Equals("binancefutures", StringComparison.InvariantCultureIgnoreCase))
+      {
+        result = "BINANCE:" + pairName + "PERP";
+      }
+      else
+      {
+        result += pairName;
+      }
 
+      
 
       return result;
     }
diff --git a/Monitor/Pages/SettingsGeneral.cshtml b/Monitor/Pages/SettingsGeneral.cshtml
index 5447e0b..64c3783 100644
--- a/Monitor/Pages/SettingsGeneral.cshtml
+++ b/Monitor/Pages/SettingsGeneral.cshtml
@@ -243,7 +243,6 @@
                   <select name="Monitor_LinkPlatform" class="form-control">
                     <option selected="@(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform.Equals("Exchange", StringComparison.InvariantCultureIgnoreCase))">Exchange</option>
                     <option selected="@(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform.Equals("TradingView", StringComparison.InvariantCultureIgnoreCase))">TradingView</option>
-                    <option selected="@(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform.Equals("TradingViewFutures", StringComparison.InvariantCultureIgnoreCase))">TradingViewFutures</option>
                   </select>
                 </div>
               </div>
diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs
index ff6fbbd..11bc420 100644
--- a/PTMagic/Program.cs
+++ b/PTMagic/Program.cs
@@ -6,7 +6,7 @@ using Core.Helper;
 using Microsoft.Extensions.DependencyInjection;
 
 
-[assembly: AssemblyVersion("2.5.4")]
+[assembly: AssemblyVersion("2.5.5")]
 [assembly: AssemblyProduct("PT Magic")]
 
 namespace PTMagic