Disable post button when media upload in progress

Changelog-Fixed: Disable post button when media upload in progress

damus/Views/PostView.swift

@@ -79,27 +79,13 @@ struct PostView: View {
 
         post.enumerateAttributes(in: NSRange(location: 0, length: post.length), options: []) { attributes, range, stop in
             if let link = attributes[.link] as? String {
-                let normalized_link: String
-                if link.hasPrefix("damus:nostr:") {
-                    // Replace damus:nostr: URI prefix with nostr: since the former is for internal navigation and not meant to be posted.
-                    normalized_link = String(link.dropFirst(6))
-                } else {
-                    normalized_link = link
-                }
-
-                // Add zero-width space in case text preceding the mention is not a whitespace.
-                // In the case where the character preceding the mention is a whitespace, the added zero-width space will be stripped out.
-                post.replaceCharacters(in: range, with: "\u{200B}\(normalized_link)\u{200B}")
+                post.replaceCharacters(in: range, with: link)
             }
         }
 
         var content = self.post.string
-            // If two zero-width spaces are next to each other, normalize it to just one zero-width space.
-            .replacingOccurrences(of: "\u{200B}\u{200B}", with: "\u{200B}")
-            // If zero-width space is next to an actual whitespace, remove the zero-width space.
-            .replacingOccurrences(of: " \u{200B}", with: " ")
-            .replacingOccurrences(of: "\u{200B} ", with: " ")
             .trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+            .replacingOccurrences(of: "\u{200B}", with: "") // these characters are added when adding mentions.
 
         let imagesString = uploadedMedias.map { $0.uploadedURL.absoluteString }.joined(separator: " ")
         
@@ -125,6 +111,14 @@ struct PostView: View {
     var is_post_empty: Bool {
         return post.string.allSatisfy { $0.isWhitespace } && uploadedMedias.isEmpty
     }
+
+    var uploading_disabled: Bool {
+        return image_upload.progress != nil
+    }
+
+    var posting_disabled: Bool {
+        return is_post_empty || uploading_disabled
+    }
     
     var ImageButton: some View {
         Button(action: {
@@ -149,7 +143,7 @@ struct PostView: View {
             ImageButton
             CameraButton
         }
-        .disabled(image_upload.progress != nil)
+        .disabled(uploading_disabled)
     }
     
     var PostButton: some View {
@@ -160,12 +154,12 @@ struct PostView: View {
                 self.send_post()
             }
         }
-        .disabled(is_post_empty)
+        .disabled(posting_disabled)
         .font(.system(size: 14, weight: .bold))
         .frame(width: 80, height: 30)
         .foregroundColor(.white)
         .background(LINEAR_GRADIENT)
-        .opacity(is_post_empty ? 0.5 : 1.0)
+        .opacity(posting_disabled ? 0.5 : 1.0)
         .clipShape(Capsule())
     }
     

damus/Views/Posting/UserSearch.swift

@@ -63,8 +63,7 @@ struct UserSearch: View {
 
         let tagAttributedString = NSMutableAttributedString(string: tagString,
                                    attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 18.0),
-                                                // Add damus: URI so that taps within the post creation view redirect internally within Damus instead of redirecting to a different Nostr client. The damus: prefix will be stripped out prior to sending the note to relays.
-                                                NSAttributedString.Key.link: "damus:nostr:\(pk)"])
+                                                NSAttributedString.Key.link: "nostr:\(pk)"])
         tagAttributedString.removeAttribute(.link, range: NSRange(location: tagAttributedString.length - 2, length: 2))
         tagAttributedString.addAttributes([NSAttributedString.Key.foregroundColor: UIColor.label], range: NSRange(location: tagAttributedString.length - 2, length: 2))