From d8ea4236ccc2787f4ed18d907a8c882858179530 Mon Sep 17 00:00:00 2001 From: Ching Date: Mon, 20 Mar 2023 21:32:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(InstanceViewModel):=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=9C=B0=E5=9D=80=E5=8A=A0=E4=B8=8A=20https://?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 自动给用户输入的实例地址加上 https:// Signed-off-by: Ching --- DUDUJI/ViewModels/InstanceViewModel.swift | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/DUDUJI/ViewModels/InstanceViewModel.swift b/DUDUJI/ViewModels/InstanceViewModel.swift index 5f43b79..61b3984 100644 --- a/DUDUJI/ViewModels/InstanceViewModel.swift +++ b/DUDUJI/ViewModels/InstanceViewModel.swift @@ -11,11 +11,20 @@ class InstanceViewModel: ObservableObject { @Published var instance: Instance = .defaultInstance() @Published var isLoading: Bool = false + func addPrefixIfNecessary(_ str: String) -> String { + if str.hasPrefix("http://") || str.hasPrefix("https://") { + return str + } else { + return "https://" + str + } + } + func getInstance(from url: String) async { DispatchQueue.main.async { self.isLoading = true } do { + let url = addPrefixIfNecessary(url) let newInstance = try await Instance.instanceFromURL(url: url) DispatchQueue.main.async { self.instance = newInstance