tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swift cleanup: remove duplicate or unnecessary initializers using default values

Browse Source 
Signed-off-by: Bryan Montz <bryanmontz@me.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Bryan Montz
2023-07-16 08:00:54 -05:00
committed by William Casarin
parent 6bf5293701
commit 0f1390f412
14 changed files with 31 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
damus/Components/EndBlock.swift
View File

@@ -10,11 +10,7 @@ import SwiftUI
struct EndBlock: View { struct EndBlock: View {
let height: CGFloat let height: CGFloat
init() { init(height: Float = 10) {
self.height = 10.0
}
init(height: Float) {
self.height = CGFloat(height) self.height = CGFloat(height)
} }

14
damus/Models/ActionBarModel.swift
View File

@@ -28,19 +28,7 @@ class ActionBarModel: ObservableObject {
return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil) return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
} }
init() { init(likes: Int = 0, boosts: Int = 0, zaps: Int = 0, zap_total: Int64 = 0, replies: Int = 0, our_like: NostrEvent? = nil, our_boost: NostrEvent? = nil, our_zap: Zapping? = nil, our_reply: NostrEvent? = nil) {
self.our_like = nil
self.our_boost = nil
self.our_reply = nil
self.our_zap = nil
self.likes = 0
self.boosts = 0
self.zaps = 0
self.zap_total = 0
self.replies = 0
}
init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, replies: Int, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zapping?, our_reply: NostrEvent?) {
self.likes = likes self.likes = likes
self.boosts = boosts self.boosts = boosts
self.zaps = zaps self.zaps = zaps

8
damus/Models/CreateAccountModel.swift
View File

@@ -35,13 +35,7 @@ class CreateAccountModel: ObservableObject {
return Keypair(pubkey: self.pubkey, privkey: self.privkey) return Keypair(pubkey: self.pubkey, privkey: self.privkey)
} }
init() { init(real: String = "", nick: String = "", about: String = "") {
let keypair = generate_new_keypair()
self.pubkey = keypair.pubkey
self.privkey = keypair.privkey!
}
init(real: String, nick: String, about: String) {
let keypair = generate_new_keypair() let keypair = generate_new_keypair()
self.pubkey = keypair.pubkey self.pubkey = keypair.pubkey
self.privkey = keypair.privkey! self.privkey = keypair.privkey!

16
damus/Models/DirectMessageModel.swift
View File

@@ -14,11 +14,11 @@ class DirectMessageModel: ObservableObject {
} }
} }
@Published var draft: String @Published var draft: String = ""
let pubkey: String let pubkey: String
var is_request: Bool var is_request = false
var our_pubkey: String var our_pubkey: String
func determine_is_request() -> Bool { func determine_is_request() -> Bool {
@@ -31,19 +31,9 @@ class DirectMessageModel: ObservableObject {
return true return true
} }
init(events: [NostrEvent], our_pubkey: String, pubkey: String) { init(events: [NostrEvent] = [], our_pubkey: String, pubkey: String) {
self.events = events self.events = events
self.is_request = false
self.our_pubkey = our_pubkey self.our_pubkey = our_pubkey
self.draft = ""
self.pubkey = pubkey
}
init(our_pubkey: String, pubkey: String) {
self.events = []
self.is_request = false
self.our_pubkey = our_pubkey
self.draft = ""
self.pubkey = pubkey self.pubkey = pubkey
} }
} }

7
damus/Models/DraftsModel.swift
View File

@@ -11,12 +11,7 @@ class DraftArtifacts {
var content: NSMutableAttributedString var content: NSMutableAttributedString
var media: [UploadedMedia] var media: [UploadedMedia]
init() { init(content: NSMutableAttributedString = NSMutableAttributedString(string: ""), media: [UploadedMedia] = []) {
self.content = NSMutableAttributedString(string: "")
self.media = []
}
init(content: NSMutableAttributedString, media: [UploadedMedia]) {
self.content = content self.content = content
self.media = media self.media = media
} }

6
damus/Models/Notifications/EventGroup.swift
View File

@@ -18,11 +18,7 @@ class EventGroup {
return first.created_at return first.created_at
} }
init() { init(events: [NostrEvent] = []) {
self.events = []
}
init(events: [NostrEvent]) {
self.events = events self.events = events
} }

12
damus/Models/Notifications/ZapGroup.swift
View File

@@ -8,9 +8,9 @@
import Foundation import Foundation
class ZapGroup { class ZapGroup {
var zaps: [Zapping] var zaps: [Zapping] = []
var msat_total: Int64 var msat_total: Int64 = 0
var zappers: Set<String> var zappers = Set<String>()
var last_event_at: Int64 { var last_event_at: Int64 {
guard let first = zaps.first else { guard let first = zaps.first else {
@@ -46,12 +46,6 @@ class ZapGroup {
return grp return grp
} }
init() {
self.zaps = []
self.msat_total = 0
self.zappers = Set()
}
@discardableResult @discardableResult
func insert(_ zap: Zapping) -> Bool { func insert(_ zap: Zapping) -> Bool {
if !insert_uniq_sorted_zap_by_created(zaps: &zaps, new_zap: zap) { if !insert_uniq_sorted_zap_by_created(zaps: &zaps, new_zap: zap) {

36
damus/Models/NotificationsModel.swift
View File

@@ -99,34 +99,20 @@ enum NotificationItem {
} }
class NotificationsModel: ObservableObject, ScrollQueue { class NotificationsModel: ObservableObject, ScrollQueue {
var incoming_zaps: [Zapping] var incoming_zaps: [Zapping] = []
var incoming_events: [NostrEvent] var incoming_events: [NostrEvent] = []
var should_queue: Bool var should_queue: Bool = true
// mappings from events to // mappings from events to
var zaps: [String: ZapGroup] var zaps: [String: ZapGroup] = [:]
var profile_zaps: ZapGroup var profile_zaps = ZapGroup()
var reactions: [String: EventGroup] var reactions: [String: EventGroup] = [:]
var reposts: [String: EventGroup] var reposts: [String: EventGroup] = [:]
var replies: [NostrEvent] var replies: [NostrEvent] = []
var has_reply: Set<String> var has_reply = Set<String>()
var has_ev: Set<String> var has_ev = Set<String>()
@Published var notifications: [NotificationItem] @Published var notifications: [NotificationItem] = []
init() {
self.zaps = [:]
self.reactions = [:]
self.reposts = [:]
self.replies = []
self.has_reply = Set()
self.should_queue = true
self.incoming_zaps = []
self.incoming_events = []
self.profile_zaps = ZapGroup()
self.notifications = []
self.has_ev = Set()
}
func set_should_queue(_ val: Bool) { func set_should_queue(_ val: Bool) {
self.should_queue = val self.should_queue = val

7
damus/Models/SignalModel.swift
View File

@@ -12,12 +12,7 @@ class SignalModel: ObservableObject {
@Published var signal: Int @Published var signal: Int
@Published var max_signal: Int @Published var max_signal: Int
init() { init(signal: Int = 0, max_signal: Int = 0) {
self.signal = 0
self.max_signal = 0
}
init(signal: Int, max_signal: Int) {
self.signal = signal self.signal = signal
self.max_signal = max_signal self.max_signal = max_signal
} }

26
damus/Util/EventHolder.swift
View File

@@ -9,10 +9,10 @@ import Foundation
/// Used for holding back events until they're ready to be displayed /// Used for holding back events until they're ready to be displayed
class EventHolder: ObservableObject, ScrollQueue { class EventHolder: ObservableObject, ScrollQueue {
private var has_event: Set<String> private var has_event = Set<String>()
@Published var events: [NostrEvent] @Published var events: [NostrEvent]
var incoming: [NostrEvent] var incoming: [NostrEvent]
var should_queue: Bool var should_queue = false
var on_queue: ((NostrEvent) -> Void)? var on_queue: ((NostrEvent) -> Void)?
func set_should_queue(_ val: Bool) { func set_should_queue(_ val: Bool) {
@@ -27,28 +27,10 @@ class EventHolder: ObservableObject, ScrollQueue {
events + incoming events + incoming
} }
init() { init(events: [NostrEvent] = [], incoming: [NostrEvent] = [], on_queue: ((NostrEvent) -> ())? = nil) {
self.should_queue = false
self.events = []
self.incoming = []
self.has_event = Set()
self.on_queue = nil
}
init(on_queue: @escaping (NostrEvent) -> ()) {
self.should_queue = false
self.events = []
self.incoming = []
self.has_event = Set()
self.on_queue = on_queue
}
init(events: [NostrEvent], incoming: [NostrEvent]) {
self.should_queue = false
self.events = events self.events = events
self.incoming = incoming self.incoming = incoming
self.has_event = Set() self.on_queue = on_queue
self.on_queue = nil
} }
func filter(_ isIncluded: (NostrEvent) -> Bool) { func filter(_ isIncluded: (NostrEvent) -> Bool) {

6
damus/Util/PreviewCache.swift
View File

@@ -65,13 +65,9 @@ enum PreviewState {
} }
class PreviewCache { class PreviewCache {
private var previews: [String: Preview] private var previews: [String: Preview] = [:]
func lookup(_ evid: String) -> Preview? { func lookup(_ evid: String) -> Preview? {
return previews[evid] return previews[evid]
} }
init() {
self.previews = [:]
}
} }

7
damus/Views/Notifications/NotificationsView.swift
View File

@@ -41,12 +41,7 @@ class NotificationFilter: ObservableObject, Equatable {
return lhs.state == rhs.state && lhs.fine_filter == rhs.fine_filter return lhs.state == rhs.state && lhs.fine_filter == rhs.fine_filter
} }
init() { init(state: NotificationFilterState = .all, fine_filter: FriendFilter = .all) {
self.state = .all
self.fine_filter = .all
}
init(state: NotificationFilterState, fine_filter: FriendFilter) {
self.state = state self.state = state
self.fine_filter = fine_filter self.fine_filter = fine_filter
} }

10
damus/Views/Profile/ProfileName.swift
View File

@@ -35,16 +35,8 @@ struct ProfileName: View {
@State var display_name: DisplayName? @State var display_name: DisplayName?
@State var nip05: NIP05? @State var nip05: NIP05?
@State var donation: Int? @State var donation: Int?
init(pubkey: String, profile: Profile?, damus: DamusState, show_nip5_domain: Bool = true) {
self.pubkey = pubkey
self.profile = profile
self.prefix = ""
self.show_nip5_domain = show_nip5_domain
self.damus_state = damus
}
init(pubkey: String, profile: Profile?, prefix: String, damus: DamusState, show_nip5_domain: Bool = true) { init(pubkey: String, profile: Profile?, prefix: String = "", damus: DamusState, show_nip5_domain: Bool = true) {
self.pubkey = pubkey self.pubkey = pubkey
self.profile = profile self.profile = profile
self.prefix = prefix self.prefix = prefix

9
damus/Views/Relays/RecommendedRelayView.swift
View File

@@ -14,14 +14,7 @@ struct RecommendedRelayView: View {
@Binding var showActionButtons: Bool @Binding var showActionButtons: Bool
init(damus: DamusState, relay: String, showActionButtons: Binding<Bool>) { init(damus: DamusState, relay: String, add_button: Bool = true, showActionButtons: Binding<Bool>) {
self.damus = damus
self.relay = relay
self.add_button = true
self._showActionButtons = showActionButtons
}
init(damus: DamusState, relay: String, add_button: Bool, showActionButtons: Binding<Bool>) {
self.damus = damus self.damus = damus
self.relay = relay self.relay = relay
self.add_button = add_button self.add_button = add_button