Add kick and improve client info display. Also improve error messages when can't connect (server down) or can't login (show server message).

6 files changed, 90 insertions, 54 deletions

diff --git a/Hotline/macOS/BroadcastMessageView.swift b/Hotline/macOS/BroadcastMessageSheet.swift
index a5f6fd2..b3bd7ea 100644
--- a/Hotline/macOS/BroadcastMessageView.swift
+++ b/Hotline/macOS/BroadcastMessageSheet.swift
@@ -2,7 +2,7 @@ import SwiftUI
 
 fileprivate let CHARACTER_LIMIT: Int = 255
 
-struct BroadcastMessageView: View {
+struct BroadcastMessageSheet: View {
   @Environment(HotlineState.self) private var model: HotlineState
   @Environment(\.dismiss) private var dismiss
   
diff --git a/Hotline/macOS/Files/FileDetailsSheet.swift b/Hotline/macOS/Files/FileDetailsSheet.swift
index e86bf28..1bfacb2 100644
--- a/Hotline/macOS/Files/FileDetailsSheet.swift
+++ b/Hotline/macOS/Files/FileDetailsSheet.swift
@@ -14,7 +14,7 @@ struct FileDetailsSheet: View {
   var body: some View {
     VStack(alignment: .leading, spacing: 16) {
       HStack(alignment: .center, spacing: 16){
-        if self.details.type == "Folder" {
+        if self.isFolder {
           FolderIconView()
             .frame(width: 32, height: 32)
         }
@@ -22,6 +22,7 @@ struct FileDetailsSheet: View {
           FileIconView(filename: self.details.name, fileType: nil)
             .frame(width: 32, height: 32)
         }
+        
         TextField("File Name", text: $filename)
           .disabled(!self.canRename)
       }
@@ -114,6 +115,28 @@ struct FileDetailsSheet: View {
     }
   }
   
+  private var isFolder: Bool {
+    self.details.type == "Folder" || self.details.type == "fldr"
+  }
+  
+  private func isEdited() -> Bool {
+    return self.filename != self.details.name || self.comment != self.details.comment
+  }
+  
+  private var canRename: Bool {
+    if self.isFolder {
+      return self.model.access?.contains(.canRenameFolders) == true
+    }
+    return self.model.access?.contains(.canRenameFiles) == true
+  }
+  
+  private var canSetComment: Bool {
+    if self.isFolder {
+      return self.model.access?.contains(.canSetFolderComment) == true
+    }
+    return self.model.access?.contains(.canSetFileComment) == true
+  }
+  
   static var dateFormatter: DateFormatter = {
     var dateFormatter = DateFormatter()
     dateFormatter.dateStyle = .long
@@ -142,24 +165,6 @@ struct FileDetailsSheet: View {
     let formattedByteCount = Self.byteCountSizeFormatter.string(from: NSNumber(value:byteCount)) ?? "0"
     return "\(FileItemView.byteFormatter.string(fromByteCount: Int64(byteCount))) (\(formattedByteCount) bytes)"
   }
-  
-  private func isEdited() -> Bool {
-    return self.filename != self.details.name || self.comment != self.details.comment
-  }
-  
-  private var canRename: Bool {
-    if self.details.type == "fldr" || self.details.type == "Folder" {
-      return self.model.access?.contains(.canRenameFolders) == true
-    }
-    return self.model.access?.contains(.canRenameFiles) == true
-  }
-  
-  private var canSetComment: Bool {
-    if self.details.type == "fldr" || self.details.type == "Folder" {
-      return self.model.access?.contains(.canSetFolderComment) == true
-    }
-    return self.model.access?.contains(.canSetFileComment) == true
-  }
 }
 
 //#Preview {
diff --git a/Hotline/macOS/Files/FilesView.swift b/Hotline/macOS/Files/FilesView.swift
index 1ae99d9..c9c4c24 100644
--- a/Hotline/macOS/Files/FilesView.swift
+++ b/Hotline/macOS/Files/FilesView.swift
@@ -198,28 +198,32 @@ struct FilesView: View {
           ToolbarSpacer()
         }
         
-        ToolbarItem {
-          Button {
-            self.newFolderShown = true
-          } label: {
-            Label("New Folder", systemImage: "folder.badge.plus")
-          }
-          .help("New Folder")
-          .popover(isPresented: self.$newFolderShown, arrowEdge: .bottom) {
-            NewFolderPopover { folderName in
-              self.newFolder(name: folderName, parent: self.selection)
+        if self.model.access?.contains(.canCreateFolders) == true {
+          ToolbarItem {
+            Button {
+              self.newFolderShown = true
+            } label: {
+              Label("New Folder", systemImage: "folder.badge.plus")
+            }
+            .help("New Folder")
+            .popover(isPresented: self.$newFolderShown, arrowEdge: .bottom) {
+              NewFolderPopover { folderName in
+                self.newFolder(name: folderName, parent: self.selection)
+              }
             }
           }
         }
         
-        ToolbarItem {
-          Button {
-            self.confirmDeleteShown = true
-          } label: {
-            Label("Delete", systemImage: "trash")
+        if self.model.access?.contains(.canDeleteFiles) == true || self.model.access?.contains(.canDeleteFolders) == true {
+          ToolbarItem {
+            Button {
+              self.confirmDeleteShown = true
+            } label: {
+              Label("Delete", systemImage: "trash")
+            }
+            .disabled(self.selection == nil)
+            .help("Delete")
           }
-          .disabled(self.selection == nil)
-          .help("Delete")
         }
       }
     }
diff --git a/Hotline/macOS/MessageView.swift b/Hotline/macOS/MessageView.swift
index 6690a88..6208d54 100644
--- a/Hotline/macOS/MessageView.swift
+++ b/Hotline/macOS/MessageView.swift
@@ -8,6 +8,8 @@ struct MessageView: View {
   @State private var scrollPos: Int?
   @State private var contentHeight: CGFloat = 0
   @State private var userInfo: HotlineUserClientInfo?
+  @State private var disconnectConfirmShown: Bool = false
+  @State private var username: String?
   
   @Namespace private var bottomID
   @FocusState private var focusedField: FocusedField?
@@ -27,6 +29,10 @@ struct MessageView: View {
       self.inputBar
     }
     .background(Color(nsColor: .textBackgroundColor))
+    .onAppear {
+      let user = self.model.users.first(where: { $0.id == userID })
+      self.username = user?.name
+    }
     .toolbar {
       if self.model.access?.contains(.canGetClientInfo) == true {
         ToolbarItem {
@@ -35,11 +41,30 @@ struct MessageView: View {
           } label: {
             Image(systemName: "info.circle")
           }
+          .help("View \(self.username ?? "user")'s information")
+        }
+      }
+      
+      if self.model.access?.contains(.canDisconnectUsers) == true {
+        ToolbarItem {
+          Button {
+            self.disconnectConfirmShown = true
+          } label: {
+            Image(systemName: "nosign")
+          }
+          .help("Disconnect \(self.username ?? "this user")")
         }
       }
     }
     .sheet(item: self.$userInfo) { info in
-      UserInfoView(info: info)
+      UserClientInfoSheet(info: info)
+    }
+    .alert("Are you sure you want to disconnect \(self.username ?? "this user")?", isPresented: self.$disconnectConfirmShown) {
+      Button("Disconnect", role: .destructive) {
+        self.disconnectUser()
+      }
+    } message: {
+      Text("They will be disconnected from the server, but may reconnect.")
     }
   }
   
@@ -51,10 +76,15 @@ struct MessageView: View {
     }
   }
   
+  private func disconnectUser() {
+    Task {
+      try await self.model.disconnectUser(id: self.userID, options: nil)
+    }
+  }
+  
   private var inputBar: some View {
     HStack(alignment: .lastTextBaseline, spacing: 0) {
-      let user = self.model.users.first(where: { $0.id == userID })
-      TextField("Message \(user?.name ?? "")", text: $input, axis: .vertical)
+      TextField("Message \(self.username ?? "")", text: $input, axis: .vertical)
         .focused($focusedField, equals: .chatInput)
         .textFieldStyle(.plain)
         .lineLimit(1...5)
diff --git a/Hotline/macOS/ServerView.swift b/Hotline/macOS/ServerView.swift
index 3794018..ff92acc 100644
--- a/Hotline/macOS/ServerView.swift
+++ b/Hotline/macOS/ServerView.swift
@@ -111,7 +111,7 @@ struct ServerView: View {
           self.connectForm
           Spacer()
         }
-        .navigationTitle("New Connection")
+        .navigationTitle(self.model.serverTitle.isBlank ? "Hotline" : self.model.serverTitle)
       }
       else if self.model.status.isLoggingIn {
         HStack {
@@ -131,7 +131,7 @@ struct ServerView: View {
         }
         .frame(maxWidth: 300)
         .padding()
-        .navigationTitle("New Connection")
+        .navigationTitle(self.model.serverTitle.isBlank ? "Hotline" : self.model.serverTitle)
       }
       else if self.model.status == .loggedIn {
         self.serverView
@@ -155,7 +155,7 @@ struct ServerView: View {
             Task { try? await self.model.sendUserPreferences() }
           }
           .sheet(isPresented: self.$state.broadcastShown) {
-            BroadcastMessageView()
+            BroadcastMessageSheet()
               .environment(self.model)
               .presentationSizing(.fitted)
           }
@@ -336,8 +336,8 @@ struct ServerView: View {
   var serverView: some View {
     NavigationSplitView {
       self.navigationList
-        .frame(maxWidth: .infinity)
-        .navigationSplitViewColumnWidth(min: 200, ideal: 250, max: 500)
+        .navigationSplitViewColumnWidth(200)
+//        .navigationSplitViewColumnWidth(min: 150, ideal: 200, max: 400)
         .toolbar(removing: .sidebarToggle)
 //        .toolbar {
 //          if self.model.access?.contains(.canOpenUsers) == true {
@@ -357,22 +357,22 @@ struct ServerView: View {
           ChatView()
             .navigationTitle(model.serverTitle)
 //            .navigationSubtitle("Public Chat")
-            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
+//            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
         case .news:
           NewsView()
             .navigationTitle(model.serverTitle)
 //            .navigationSubtitle("Newsgroups")
-            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
+//            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
         case .board:
           MessageBoardView()
             .navigationTitle(model.serverTitle)
 //            .navigationSubtitle("Message Board")
-            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
+//            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
         case .files:
           FilesView()
             .navigationTitle(model.serverTitle)
 //            .navigationSubtitle("Shared Files")
-            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
+//            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
 //        case .accounts:
 //            AccountManagerView()
 //              .navigationTitle(model.serverTitle)
@@ -383,15 +383,12 @@ struct ServerView: View {
           MessageView(userID: userID)
             .navigationTitle(model.serverTitle)
 //            .navigationSubtitle(user?.name ?? "Private Message")
-            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
+//            .navigationSplitViewColumnWidth(min: 250, ideal: 500)
             .onAppear {
               model.markInstantMessagesAsRead(userID: userID)
             }
         }
     }
-    .background {
-      Color.red
-    }
   }
   
   // MARK: -
diff --git a/Hotline/macOS/UserInfo.swift b/Hotline/macOS/UserClientInfoSheet.swift
index 328fc02..8fa4db8 100644
--- a/Hotline/macOS/UserInfo.swift
+++ b/Hotline/macOS/UserClientInfoSheet.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct UserInfoView: View {
+struct UserClientInfoSheet: View {
   @Environment(\.dismiss) private var dismiss
   
   let info: HotlineUserClientInfo