From 022021014c2921174478b06ff1f33450a63220da Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Sat, 16 Aug 2025 12:43:50 +1000
Subject: [PATCH] Validates url when adding a link

---
 .../UserInterfaceState.xcuserstate            | Bin 37485 -> 37485 bytes
 .../Resources/en.lproj/Localizable.strings    |   1 +
 .../zh-Hans.lproj/Localizable.strings         |   6 +
 mobile/Heygo/Views/LinkFormView.swift         | 124 +++++++++++++++++-
 4 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/mobile/Heygo.xcodeproj/project.xcworkspace/xcuserdata/junv.xcuserdatad/UserInterfaceState.xcuserstate b/mobile/Heygo.xcodeproj/project.xcworkspace/xcuserdata/junv.xcuserdatad/UserInterfaceState.xcuserstate
index f9bd4c5e20f929dcd670f119c4807549d18f0309..f5a375a722f34d53a66636f35a4a6fbef94bd8ba 100644
GIT binary patch
delta 340
zcmaF6gz4=PrVVeI_~ls?SQJ^bS#(%*S@c+pHveII#>!~C`7y@{ZD#idgUJ_7WGD0H
zX+^L|ut+nAEn?PTk!twg$mqI=@dt}+!;(fuw+4f_l>Fq<+|;}hpVYkck_<t|gv$)P
z415gyEJ`eD3}TB}lvz|*R2vyR8W}ws8NC*>sIzD=OExlkH!}K6PS9y&W6=kyHJCi#
zRE^ab$TFFH%2Z{uvRM@)8^nsui_KjW`Isfyw=^>OH~ej63IMt+!Ov*&`7H0rMUe&U
zvW<+-fKHj5A1%3=DJqQ-Ca^g_`m_S8@E)O<XOrz~<e5zvj5a6M7<1U4HhE|A+mykS
z$&}TU%aq5I-&D|4!BpAQz|`E-%GB1>!PMQ<%hcD@-!#y)%5;tCS<`E#k4?Xs{xD-S
d<1<s-e7WT>8|R0J&k<iE)gwJN-|U{k1^~F7XafKM

delta 339
zcmaF6gz4=PrVVeI_!U`{Sd>{*STtC4SWH+<H~(RJ#>!~4`7y@{ZAP!jx>=seED|g-
z3}TB}Bw3_bq#GGs8yVdi8QmAN$g;>WOExlkG%|WlPS9y&V^L+`XHlDc#Z-+|6Ufq<
z{NGf?^fCi410Rs5%VNMFwunWKS*MZFyW#&L7DL7#jf_4GOBxK~Qu32ab5rw5d{Xn$
zOELr<6E-WGRWY&|HY@?E*u2=>MUjtvGtep~|3;>OhQAF4lN0=mCdY+nPPX?`oLm@L
z$Zpuk_zb9aa(=YrW~Qh#Mwr0n{OHpPtU?zr9^W$AzDAzen89RoVvR9}{Y8^^CcjOY
zOj%7iOu0>kOhrv4Or=a^OkGXOO=p-cG+k$U(DbnB8Pl7lZ%p5r{x)MUV>V+o<1*tl
f<2MsDQ`mgD<u4oO$B54nUnA8c12*66p27wI_}ysM

diff --git a/mobile/Heygo/Resources/en.lproj/Localizable.strings b/mobile/Heygo/Resources/en.lproj/Localizable.strings
index cbd3ee8..4f61241 100644
--- a/mobile/Heygo/Resources/en.lproj/Localizable.strings
+++ b/mobile/Heygo/Resources/en.lproj/Localizable.strings
@@ -120,6 +120,7 @@
 /* Validation Messages */
 "alias_already_exists" = "Alias already exists";
 "alias_invalid_characters" = "Alias contains invalid characters";
+"invalid_url_format" = "Please enter a valid URL (e.g., https://example.com)";
 "tag_already_exists" = "Tag already exists";
 
 /* Error Messages */
diff --git a/mobile/Heygo/Resources/zh-Hans.lproj/Localizable.strings b/mobile/Heygo/Resources/zh-Hans.lproj/Localizable.strings
index 0f475a7..99469d7 100644
--- a/mobile/Heygo/Resources/zh-Hans.lproj/Localizable.strings
+++ b/mobile/Heygo/Resources/zh-Hans.lproj/Localizable.strings
@@ -140,3 +140,9 @@
 /* Basic Information */
 "basic_information" = "基本信息";
 "actions" = "操作";
+
+/* Validation Messages */
+"alias_already_exists" = "别名已存在";
+"alias_invalid_characters" = "别名包含无效字符";
+"invalid_url_format" = "请输入有效的网址（例如：https://example.com）";
+"tag_already_exists" = "标签已存在";
diff --git a/mobile/Heygo/Views/LinkFormView.swift b/mobile/Heygo/Views/LinkFormView.swift
index fa6d620..440a07e 100644
--- a/mobile/Heygo/Views/LinkFormView.swift
+++ b/mobile/Heygo/Views/LinkFormView.swift
@@ -16,7 +16,10 @@ struct LinkFormView: View {
     @State private var tagSearchText: String = ""
     @State private var isValidatingAlias: Bool = false
     @State private var aliasValidationMessage: String = ""
+    @State private var urlValidationMessage: String = ""
     @State private var showingTagPicker: Bool = false
+    @State private var saveErrorMessage: String = ""
+    @State private var showingSaveError: Bool = false
 
     @FetchRequest(
         sortDescriptors: [NSSortDescriptor(keyPath: \Tag.name, ascending: true)],
@@ -38,7 +41,8 @@ struct LinkFormView: View {
     var canSave: Bool {
         return !alias.isEmpty &&
                (selectedLinkType == .custom ? !text.isEmpty : !originalURL.isEmpty) &&
-               aliasValidationMessage.isEmpty
+               aliasValidationMessage.isEmpty &&
+               urlValidationMessage.isEmpty
     }
 
     var body: some View {
@@ -68,6 +72,14 @@ struct LinkFormView: View {
                         }
                     }
                     .pickerStyle(SegmentedPickerStyle())
+                    .onChange(of: selectedLinkType) { _, newValue in
+                        // Re-validate URL when link type changes
+                        if newValue != .custom {
+                            validateURL(originalURL)
+                        } else {
+                            urlValidationMessage = ""
+                        }
+                    }
 
                     // URL or Text field based on type
                     if selectedLinkType == .custom {
@@ -84,6 +96,24 @@ struct LinkFormView: View {
                                 .autocapitalization(.none)
                                 .autocorrectionDisabled()
                                 .keyboardType(.URL)
+                                .textFieldStyle(RoundedBorderTextFieldStyle())
+                                .overlay(
+                                    RoundedRectangle(cornerRadius: 8)
+                                        .stroke(!urlValidationMessage.isEmpty ? Color.orange : Color.clear, lineWidth: 2)
+                                )
+                                .onChange(of: originalURL) { _, newValue in
+                                    validateURL(newValue)
+                                }
+
+                            if !urlValidationMessage.isEmpty {
+                                HStack {
+                                    Image(systemName: "exclamationmark.triangle")
+                                        .foregroundColor(.orange)
+                                    Text(urlValidationMessage)
+                                        .font(.caption)
+                                        .foregroundColor(.orange)
+                                }
+                            }
 
                             if selectedLinkType == .template {
                                 Text("template_help")
@@ -169,6 +199,14 @@ struct LinkFormView: View {
         .onAppear {
             setupForm()
         }
+        .alert("Error", isPresented: $showingSaveError) {
+            Button("OK") {
+                showingSaveError = false
+                saveErrorMessage = ""
+            }
+        } message: {
+            Text(saveErrorMessage)
+        }
     }
 
     private func setupForm() {
@@ -179,6 +217,10 @@ struct LinkFormView: View {
             linkDescription = link.linkDescription ?? ""
             selectedLinkType = link.linkTypeEnum
             selectedTags = link.sortedTags
+
+            // Validate existing data
+            validateAlias(alias)
+            validateURL(originalURL)
         }
     }
 
@@ -214,6 +256,62 @@ struct LinkFormView: View {
         isValidatingAlias = false
     }
 
+    private func validateURL(_ url: String) {
+        // Don't validate empty URLs (allow empty for templates with placeholders)
+        if url.isEmpty {
+            urlValidationMessage = ""
+            return
+        }
+
+        // For templates, allow URLs with placeholders like {query}
+        if selectedLinkType == .template {
+            // Check if it's a valid URL pattern with or without placeholders
+            let urlWithoutPlaceholders = url.replacingOccurrences(of: #"\{[^}]+\}"#, with: "placeholder", options: .regularExpression)
+            if isValidURL(urlWithoutPlaceholders) {
+                urlValidationMessage = ""
+                return
+            }
+        }
+
+        // For regular links, validate the URL strictly
+        if selectedLinkType == .link {
+            if isValidURL(url) {
+                urlValidationMessage = ""
+                return
+            }
+        }
+
+        // If we reach here, the URL is invalid
+        urlValidationMessage = NSLocalizedString("invalid_url_format", comment: "Invalid URL format")
+    }
+
+    private func isValidURL(_ urlString: String) -> Bool {
+        // First check if it's a valid URL
+        guard let url = URL(string: urlString) else {
+            return false
+        }
+
+        // Check if it has a scheme
+        guard let scheme = url.scheme else {
+            return false
+        }
+
+        // Allow http, https, and other common schemes
+        let allowedSchemes = ["http", "https", "ftp", "mailto", "tel", "sms"]
+        if !allowedSchemes.contains(scheme.lowercased()) {
+            return false
+        }
+
+        // Check if it has a host for http/https URLs
+        if ["http", "https"].contains(scheme.lowercased()) {
+            guard let host = url.host, !host.isEmpty else {
+                return false
+            }
+        }
+
+        return true
+    }
+
     private func toggleTag(_ tag: Tag) {
         if selectedTags.contains(where: { $0.id == tag.id }) {
             selectedTags.removeAll { $0.id == tag.id }
@@ -250,6 +348,23 @@ struct LinkFormView: View {
     }
 
     private func saveLink() {
+        // Clear any previous error
+        saveErrorMessage = ""
+        showingSaveError = false
+
+        // Validate before saving
+        if !aliasValidationMessage.isEmpty {
+            saveErrorMessage = aliasValidationMessage
+            showingSaveError = true
+            return
+        }
+
+        if !urlValidationMessage.isEmpty && selectedLinkType != .custom {
+            saveErrorMessage = urlValidationMessage
+            showingSaveError = true
+            return
+        }
+
         let success: Bool
 
         if isEditing, let link = link {
@@ -275,6 +390,13 @@ struct LinkFormView: View {
 
         if success {
             presentationMode.wrappedValue.dismiss()
+        } else {
+            // Show error from view model
+            if let errorMessage = linkViewModel.errorMessage {
+                saveErrorMessage = errorMessage
+                showingSaveError = true
+                linkViewModel.errorMessage = nil // Clear the error
+            }
         }
     }
 }