Fix build warnings

Changelog-Fixed: Fix build warnings

damus/Models/HomeModel.swift

@@ -154,7 +154,7 @@ class HomeModel {
                 print("nwc: \(resp.req_id) not found in the postbox, nothing to remove [\(relay)]")
             }
             
-            guard let err = resp.response.error else {
+            guard resp.response.error != nil else {
                 print("nwc success: \(resp.response.result.debugDescription) [\(relay)]")
                 nwc_success(state: self.damus_state, resp: resp)
                 return

damus/Models/Report.swift

@@ -7,27 +7,11 @@
 
 import Foundation
 
-enum ReportType: String, CustomStringConvertible, CaseIterable {
+enum ReportType: String {
-    case spam
+    case explicit
-    case nudity
-    case profanity
     case illegal
+    case spam
     case impersonation
-
-    var description: String {
-        switch self {
-        case .spam:
-            return NSLocalizedString("Spam", comment: "Description of report type for spam.")
-        case .nudity:
-            return NSLocalizedString("Nudity", comment: "Description of report type for nudity.")
-        case .profanity:
-            return NSLocalizedString("Profanity", comment: "Description of report type for profanity.")
-        case .illegal:
-            return NSLocalizedString("Illegal Content", comment: "Description of report type for illegal content.")
-        case .impersonation:
-            return NSLocalizedString("Impersonation", comment: "Description of report type for impersonation.")
-        }
-    }
 }
 
 struct ReportNoteTarget {
@@ -47,12 +31,16 @@ struct Report {
 }
 
 func create_report_tags(target: ReportTarget, type: ReportType) -> [[String]] {
+    var tags: [[String]]
     switch target {
     case .user(let pubkey):
-        return [["p", pubkey, type.rawValue]]
+        tags = [["p", pubkey]]
     case .note(let notet):
-        return [["e", notet.note_id, type.rawValue], ["p", notet.pubkey]]
+        tags = [["e", notet.note_id], ["p", notet.pubkey]]
     }
+    
+    tags.append(["report", type.rawValue])
+    return tags
 }
 
 func create_report_event(privkey: String, report: Report) -> NostrEvent? {

damus/Util/PostBox.swift

@@ -150,7 +150,7 @@ class PostBox {
             relayer.attempts += 1
             relayer.last_attempt = Int64(Date().timeIntervalSince1970)
             relayer.retry_after *= 1.5
-            if let relay = pool.get_relay(relayer.relay) {
+            if pool.get_relay(relayer.relay) != nil {
                 print("flushing event \(event.event.id) to \(relayer.relay)")
             } else {
                 print("could not find relay when flushing: \(relayer.relay)")

damus/Views/ReportView.swift

@@ -14,8 +14,6 @@ struct ReportView: View {
      
     @State var report_sent: Bool = false
     @State var report_id: String = ""
-    @State var report_message: String = ""
-    @State var selected_report_type: ReportType?
     
     var body: some View {
         if report_sent {
@@ -45,8 +43,8 @@ struct ReportView: View {
         .padding()
     }
     
-    func do_send_report() {
+    func do_send_report(type: ReportType) {
-        guard let selected_report_type, let ev = send_report(privkey: privkey, postbox: postbox, target: target, type: selected_report_type, message: report_message) else {
+        guard let ev = send_report(privkey: privkey, postbox: postbox, target: target, type: type) else {
             return
         }
         
@@ -58,15 +56,6 @@ struct ReportView: View {
         report_id = note_id
     }
     
-    var send_report_button_text: String {
-        switch target {
-        case .note:
-            return NSLocalizedString("Report Note", comment: "Button to report a note.")
-        case .user:
-            return NSLocalizedString("Report User", comment: "Button to report a user.")
-        }
-    }
-    
     var MainForm: some View {
         VStack {
             
@@ -76,27 +65,23 @@ struct ReportView: View {
             
         Form {
             Section(content: {
-                Picker("", selection: $selected_report_type) {
+                Button(NSLocalizedString("It's spam", comment: "Button for user to report that the account or content has spam.")) {
-                    ForEach(ReportType.allCases, id: \.self) { report_type in
+                    do_send_report(type: .spam)
-                        // Impersonation type is not supported when reporting notes.
+                }
-                        if case .note = target, report_type != .impersonation {
+                
-                            Text(verbatim: String(describing: report_type))
+                Button(NSLocalizedString("Nudity or explicit content", comment: "Button for user to report that the account or content has nudity or explicit content.")) {
-                                .tag(Optional(report_type))
+                    do_send_report(type: .explicit)
-                        } else if case .user = target {
+                }
-                            Text(verbatim: String(describing: report_type))
+                
-                                .tag(Optional(report_type))
+                       Button(NSLocalizedString("Illegal content", comment: "Button for user to report that the account or content has illegal content.")) {
-                        }
+                    do_send_report(type: .illegal)
+                }
+                
+                if case .user = target {
+                    Button(NSLocalizedString("They are impersonating someone", comment: "Button for user to report that the account is impersonating someone.")) {
+                        do_send_report(type: .impersonation)
                     }
                 }
-                .labelsHidden()
-                .pickerStyle(.inline)
-
-                TextField(NSLocalizedString("Additional information (optional)", comment: "Prompt to enter optional additional information when reporting an account or content."), text: $report_message, axis: .vertical)
-
-                Button(send_report_button_text) {
-                    do_send_report()
-                }
-                .disabled(selected_report_type == nil)
             }, header: {
                 Text("What do you want to report?", comment: "Header text to prompt user what issue they want to report.")
             }, footer: {
@@ -107,8 +92,8 @@ struct ReportView: View {
     }
 }
 
-func send_report(privkey: String, postbox: PostBox, target: ReportTarget, type: ReportType, message: String) -> NostrEvent? {
+func send_report(privkey: String, postbox: PostBox, target: ReportTarget, type: ReportType) -> NostrEvent? {
-    let report = Report(type: type, target: target, message: message)
+    let report = Report(type: type, target: target, message: "")
     guard let ev = create_report_event(privkey: privkey, report: report) else {
         return nil
     }