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

login: allow user to login to deleted profile

Browse Source 
If they every change their mind.

Changelog-Fixed: Allow user to login to deleted profile
This commit is contained in:
William Casarin
2023-07-17 11:30:09 -07:00
parent 5c87dd5bbb
commit d04f1c6867
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/ContentView.swift
View File

@@ -81,7 +81,6 @@ struct ContentView: View {
@State var active_sheet: Sheets? = nil @State var active_sheet: Sheets? = nil
@State var damus_state: DamusState? = nil @State var damus_state: DamusState? = nil
@SceneStorage("ContentView.selected_timeline") var selected_timeline: Timeline = .home @SceneStorage("ContentView.selected_timeline") var selected_timeline: Timeline = .home
@State var is_deleted_account: Bool = false
@State var muting: String? = nil @State var muting: String? = nil
@State var confirm_mute: Bool = false @State var confirm_mute: Bool = false
@State var user_muted_confirm: Bool = false @State var user_muted_confirm: Bool = false
@@ -349,9 +348,6 @@ struct ContentView: View {
.onReceive(timer) { n in .onReceive(timer) { n in
self.damus_state?.postbox.try_flushing_events() self.damus_state?.postbox.try_flushing_events()
} }
.onReceive(handle_notify(.deleted_account)) { notif in
self.is_deleted_account = true
}
.onReceive(handle_notify(.report)) { notif in .onReceive(handle_notify(.report)) { notif in
let target = notif.object as! ReportTarget let target = notif.object as! ReportTarget
self.active_sheet = .report(target) self.active_sheet = .report(target)
@@ -512,12 +508,6 @@ struct ContentView: View {
let profile_ev = make_metadata_event(keypair: keypair, metadata: profile) let profile_ev = make_metadata_event(keypair: keypair, metadata: profile)
damus_state.postbox.send(profile_ev) damus_state.postbox.send(profile_ev)
} }
.alert(NSLocalizedString("Deleted Account", comment: "Alert message to indicate this is a deleted account"), isPresented: $is_deleted_account) {
Button(NSLocalizedString("Logout", comment: "Button to close the alert that informs that the current account has been deleted.")) {
is_deleted_account = false
notify(.logout, ())
}
}
.alert(NSLocalizedString("User muted", comment: "Alert message to indicate the user has been muted"), isPresented: $user_muted_confirm, actions: { .alert(NSLocalizedString("User muted", comment: "Alert message to indicate the user has been muted"), isPresented: $user_muted_confirm, actions: {
Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to muted a user was successful.")) { Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to muted a user was successful.")) {
user_muted_confirm = false user_muted_confirm = false

5
damus/Models/HomeModel.swift
View File

@@ -783,11 +783,6 @@ func print_filters(relay_id: String?, filters groups: [[NostrFilter]]) {
} }
func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: Profile, ev: NostrEvent) { func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: Profile, ev: NostrEvent) {
if our_pubkey == ev.pubkey && (profile.deleted ?? false) {
notify(.deleted_account, ())
return
}
var old_nip05: String? = nil var old_nip05: String? = nil
let mprof = profiles.lookup_with_timestamp(id: ev.pubkey) let mprof = profiles.lookup_with_timestamp(id: ev.pubkey)