From 4fbb13248a470f062e38d166144362e5cfcddd65 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:07:54 +0900
Subject: [PATCH] Remove hysteria to sing-box generate

---
 fmt/Bean2CoreObj_box.cpp     | 24 ------------------------
 fmt/Bean2External.cpp        |  1 -
 ui/dialog_basic_settings.cpp |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/fmt/Bean2CoreObj_box.cpp b/fmt/Bean2CoreObj_box.cpp
index c13d743..0dfa7bc 100644
--- a/fmt/Bean2CoreObj_box.cpp
+++ b/fmt/Bean2CoreObj_box.cpp
@@ -137,30 +137,6 @@ namespace NekoRay::fmt {
     CoreObjOutboundBuildResult CustomBean::BuildCoreObjSingBox() {
         CoreObjOutboundBuildResult result;
 
-        if (core == "hysteria") {
-            QJsonObject outbound{{"type", "hysteria"}};
-            outbound["server"] = serverAddress;
-            outbound["server_port"] = serverPort;
-            auto hy = QString2QJsonObject(config_simple);
-            QJSONOBJECT_COPY(hy, outbound, "up")
-            QJSONOBJECT_COPY(hy, outbound, "down")
-            QJSONOBJECT_COPY(hy, outbound, "up_mbps")
-            QJSONOBJECT_COPY(hy, outbound, "down_mbps")
-            QJSONOBJECT_COPY(hy, outbound, "obfs")
-            QJSONOBJECT_COPY(hy, outbound, "auth")
-            QJSONOBJECT_COPY(hy, outbound, "auth_str")
-            QJSONOBJECT_COPY(hy, outbound, "recv_window_conn")
-            QJSONOBJECT_COPY(hy, outbound, "recv_window_client")
-            QJSONOBJECT_COPY(hy, outbound, "disable_mtu_discovery")
-            QJsonObject tls{{"enabled", true}};
-            QJSONOBJECT_COPY(hy, tls, "server_name")
-            QJSONOBJECT_COPY(hy, tls, "alpn")
-            QJSONOBJECT_COPY(hy, tls, "insecure")
-            QJSONOBJECT_COPY2(hy, tls, "ca", "certificate_path")
-            outbound["tls"] = tls;
-            result.outbound = outbound;
-        }
-
         if (core == "internal") {
             result.outbound = QString2QJsonObject(config_simple);
         }
diff --git a/fmt/Bean2External.cpp b/fmt/Bean2External.cpp
index 0cf183c..3b72f2d 100644
--- a/fmt/Bean2External.cpp
+++ b/fmt/Bean2External.cpp
@@ -33,7 +33,6 @@ namespace NekoRay::fmt {
 
     int CustomBean::NeedExternal(bool isFirstProfile, bool isVPN) {
         if (core == "internal") return 0;
-        if (IS_NEKO_BOX && core == "hysteria") return 0;
         if (core == "hysteria") {
             if (isFirstProfile && !isVPN) {
                 return 2;
diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp
index 125e660..7c51b0a 100644
--- a/ui/dialog_basic_settings.cpp
+++ b/ui/dialog_basic_settings.cpp
@@ -174,7 +174,7 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
     //
     CACHE.extraCore = QString2QJsonObject(NekoRay::dataStore->extraCore->core_map);
     if (!CACHE.extraCore.contains("naive")) CACHE.extraCore.insert("naive", "");
-    if (!CACHE.extraCore.contains("hysteria") && !IS_NEKO_BOX) CACHE.extraCore.insert("hysteria", "");
+    if (!CACHE.extraCore.contains("hysteria")) CACHE.extraCore.insert("hysteria", "");
     //
     auto extra_core_layout = ui->extra_core_box->layout();
     for (const auto &s: CACHE.extraCore.keys()) {