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

mute: fix issue with not being able to change mute duration

Browse Source 
This patch fixes an issue where the user can’t change the mute duration
when adding a new mute item.

The problem was that `expiration` was nil for indefinite which isn’t
really allowed for a Picker.

I fixed this by adding an indefinite case to DamusDuration.

Closes: https://github.com/damus-io/damus/issues/1907
Lighting-address: fishcharlie@strike.me
Signed-off-by: Charlie Fish <contact@charlie.fish>
Reviewed-by: William Casarin <jb55@jb55.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Charlie Fish
2024-01-27 14:06:38 -07:00
committed by William Casarin
parent a4f0eeadec
commit a6b508c25a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
damus/Types/DamusDuration.swift
View File

@@ -8,12 +8,15 @@
import Foundation import Foundation
enum DamusDuration: CaseIterable { enum DamusDuration: CaseIterable {
case indefinite
case day case day
case week case week
case month case month
var title: String { var title: String {
switch self { switch self {
case .indefinite:
return NSLocalizedString("Indefinite", comment: "Mute a given item indefinitly (until user unmutes it). As opposed to muting the item for a given period of time.")
case .day: case .day:
return NSLocalizedString("24 hours", comment: "A duration of 24 hours/1 day to be shown to the user. Most likely in the context of how long they want to mute a piece of content for.") return NSLocalizedString("24 hours", comment: "A duration of 24 hours/1 day to be shown to the user. Most likely in the context of how long they want to mute a piece of content for.")
case .week: case .week:
@@ -27,6 +30,8 @@ enum DamusDuration: CaseIterable {
let current_date = Date() let current_date = Date()
switch self { switch self {
case .indefinite:
return nil
case .day: case .day:
return Calendar.current.date(byAdding: .day, value: 1, to: current_date) return Calendar.current.date(byAdding: .day, value: 1, to: current_date)
case .week: case .week:

5
damus/Views/Muting/AddMuteItemView.swift
View File

@@ -9,7 +9,7 @@ import SwiftUI
struct AddMuteItemView: View { struct AddMuteItemView: View {
let state: DamusState let state: DamusState
@State var new_text: String = "" @State var new_text: String = ""
@State var expiration: DamusDuration? @State var expiration: DamusDuration = .indefinite
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
@@ -23,7 +23,6 @@ struct AddMuteItemView: View {
.padding(.bottom) .padding(.bottom)
Picker(selection: $expiration) { Picker(selection: $expiration) {
Text("Indefinite", comment: "Mute a given item indefinitly (until user unmutes it). As opposed to muting the item for a given period of time.")
ForEach(DamusDuration.allCases, id: \.self) { duration in ForEach(DamusDuration.allCases, id: \.self) { duration in
Text(duration.title).tag(duration) Text(duration.title).tag(duration)
} }
@@ -55,7 +54,7 @@ struct AddMuteItemView: View {
.cornerRadius(10) .cornerRadius(10)
Button(action: { Button(action: {
let expiration_date: Date? = self.expiration?.date_from_now let expiration_date: Date? = self.expiration.date_from_now
let mute_item: MuteItem? = { let mute_item: MuteItem? = {
if new_text.starts(with: "npub") { if new_text.starts(with: "npub") {
if let pubkey: Pubkey = bech32_pubkey_decode(new_text) { if let pubkey: Pubkey = bech32_pubkey_decode(new_text) {