diff options
| author | Dustin Mierau <dustin@mierau.me> | 2023-12-24 12:10:02 -0800 |
|---|---|---|
| committer | Dustin Mierau <dustin@mierau.me> | 2023-12-24 12:10:02 -0800 |
| commit | a4cbaea0b12b7dd42133b4bd14f1371f1000fcc0 (patch) | |
| tree | e09e601d0d41024e9ed8c49c2b2c53a996cb7297 /Hotline/Models | |
| parent | e2eccde99075d2ca355a80bbbb7a3160d766b920 (diff) | |
New Preferences window on macOS with support for changing some basic moderation settings, plus username (finally) and user icon.1.0beta
Diffstat (limited to 'Hotline/Models')
| -rw-r--r-- | Hotline/Models/Hotline.swift | 14 | ||||
| -rw-r--r-- | Hotline/Models/Preferences.swift | 107 |
2 files changed, 117 insertions, 4 deletions
diff --git a/Hotline/Models/Hotline.swift b/Hotline/Models/Hotline.swift index 229f085..6aafdfe 100644 --- a/Hotline/Models/Hotline.swift +++ b/Hotline/Models/Hotline.swift @@ -71,6 +71,12 @@ import SwiftUI 2561: "πΈπͺ", ] +// @AppStorage("username") private var username: String = "guest" +// @AppStorage("refuse private messages") private var refusePrivateMessages = false +// @AppStorage("refuse private chat") private var refusePrivateChat = false +// @AppStorage("enable automatic response") private var enableAutomaticResponse = false +// @AppStorage("automatic response") private var automaticResponse = "" + var status: HotlineClientStatus = .disconnected var server: Server? { @@ -89,8 +95,8 @@ import SwiftUI } } var serverTitle: String = "Server" - var username: String = "bolt" - var iconID: UInt = 414 + var username: String = "guest" + var iconID: Int = 414 var access: HotlineUserAccessOptions? var agreed: Bool = false @@ -141,7 +147,7 @@ import SwiftUI self.trackerClient.disconnect() } - @MainActor func login(server: Server, login: String, password: String, username: String, iconID: UInt, callback: ((Bool) -> Void)? = nil) { + @MainActor func login(server: Server, login: String, password: String, username: String, iconID: Int, callback: ((Bool) -> Void)? = nil) { self.server = server self.serverName = server.name self.username = username @@ -157,7 +163,7 @@ import SwiftUI } } - @MainActor func sendUserInfo(username: String, iconID: UInt, options: HotlineUserOptions = [], autoresponse: String? = nil, callback: ((Bool) -> Void)? = nil) { + @MainActor func sendUserInfo(username: String, iconID: Int, options: HotlineUserOptions = [], autoresponse: String? = nil, callback: ((Bool) -> Void)? = nil) { self.username = username self.iconID = iconID diff --git a/Hotline/Models/Preferences.swift b/Hotline/Models/Preferences.swift new file mode 100644 index 0000000..324c6d5 --- /dev/null +++ b/Hotline/Models/Preferences.swift @@ -0,0 +1,107 @@ +import SwiftUI + +enum PrefsKeys: String { + case username = "username" + case userIconID = "user icon id" + case refusePrivateMessages = "refuse private messages" + case refusePrivateChat = "refuse private chat" + case enableAutomaticMessage = "enable automatic message" + case automaticMessage = "automatic message" +} + +@Observable +class Prefs { + init() { + UserDefaults.standard.register(defaults:[ + PrefsKeys.username.rawValue: "guest", + PrefsKeys.userIconID.rawValue: 137, + PrefsKeys.refusePrivateMessages.rawValue: false, + PrefsKeys.refusePrivateChat.rawValue: false, + PrefsKeys.enableAutomaticMessage.rawValue: false, + PrefsKeys.automaticMessage.rawValue: "", + ]) + + self.username = UserDefaults.standard.string(forKey: PrefsKeys.username.rawValue)! + self.userIconID = UserDefaults.standard.integer(forKey: PrefsKeys.userIconID.rawValue) + self.refusePrivateMessages = UserDefaults.standard.bool(forKey: PrefsKeys.refusePrivateMessages.rawValue) + self.refusePrivateChat = UserDefaults.standard.bool(forKey: PrefsKeys.refusePrivateChat.rawValue) + self.enableAutomaticMessage = UserDefaults.standard.bool(forKey: PrefsKeys.enableAutomaticMessage.rawValue) + self.automaticMessage = UserDefaults.standard.string(forKey: PrefsKeys.automaticMessage.rawValue)! + } + + var username: String { + didSet { UserDefaults.standard.set(self.username, forKey: PrefsKeys.username.rawValue) } + } + + var userIconID: Int { + didSet { UserDefaults.standard.set(self.userIconID, forKey: PrefsKeys.userIconID.rawValue) } + } + + var refusePrivateMessages: Bool { + didSet { UserDefaults.standard.set(self.refusePrivateMessages, forKey: PrefsKeys.refusePrivateMessages.rawValue) } + } + + var refusePrivateChat: Bool { + didSet { UserDefaults.standard.set(self.refusePrivateChat, forKey: PrefsKeys.refusePrivateChat.rawValue) } + } + + var enableAutomaticMessage: Bool { + didSet { UserDefaults.standard.set(self.enableAutomaticMessage, forKey: PrefsKeys.enableAutomaticMessage.rawValue) } + } + + var automaticMessage: String { + didSet { UserDefaults.standard.set(self.automaticMessage, forKey: PrefsKeys.automaticMessage.rawValue) } + } +} + +//@Observable +//final class Preferences { +// +// var username: String { +// get { +// access(keyPath: \.username) +// return UserDefaults.standard.object(forKey: "username") as? String ?? "guest" +// } +// set { +// withMutation(keyPath: \.username) { +// UserDefaults.standard.set(newValue, forKey: "username") +// } +// } +// } +// +// var refusePrivateMessages: Bool { +// get { return UserDefaults.standard.object(forKey: "refuse private messages") as? Bool ?? false } +// set { UserDefaults.standard.set(newValue, forKey: "refuse private messages") } +// } +// +// var refusePrivateChat: Bool { +// get { return UserDefaults.standard.object(forKey: "refuse private chat") as? Bool ?? false } +// set { UserDefaults.standard.set(newValue, forKey: "refuse private chat") } +// } +// +// var automaticResponseEnabled: Bool { +// get { return UserDefaults.standard.object(forKey: "enable automatic response") as? Bool ?? false } +// set { UserDefaults.standard.set(newValue, forKey: "enable automatic response") } +// } +// +// var automaticResponse: String { +// get { return UserDefaults.standard.object(forKey: "automatic response") as? String ?? "" } +// set { UserDefaults.standard.set(newValue, forKey: "automatic response") } +// } +// +// var userIconID: Int { +// get { return UserDefaults.standard.object(forKey: "user icon") as? Int ?? 404 } +// set { UserDefaults.standard.set(newValue, forKey: "user icon") } +// } +// +//// @AppStorage("username") public var username: String = "guest" +//// @AppStorage("refuse private messages") public var refusePrivateMessages: Bool = false +//// @AppStorage("refuse private chat") public var refusePrivateChat: Bool = false +//// @AppStorage("enable automatic response") public var enableAutomaticResponse: Bool = false +//// @AppStorage("automatic response") public var automaticResponse: String = "" +//// +//// // Icon +//// @AppStorage("user icon id") public var iconID: Int = 404 +// +// public static let shared = Preferences() +//} |