From 421245a2f8919842bccc86a9355701bab5a14f6b Mon Sep 17 00:00:00 2001 From: William Casarin Date: Fri, 6 Jan 2023 14:21:23 -0800 Subject: [PATCH 1/3] v1.0.0 (5) Changelog --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e25509..19fda873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +## [1.0.0-5] - 2023-01-06 + +### Added + +- Added share button to profile (William Casarin) +- Added universal link sharing of notes (William Casarin) +- Added clear cache button to wipe pfp/image cache (OlegAba) +- Allow Adding Relay Without wss:// Prefix (Joel Klabo) +- Allow Saving Images to Library (Joel Klabo) + + +### Changed + +- Added damus gradient to post button (Ben Weeks) +- Center the Post Button (Thomas) +- Switch yellow nip05 check to gray (William Casarin) +- Switch from bluecheck to purplecheck (William Casarin) + + +### Fixed + +- Add system background color to profile pics (OlegAba) +- High res color pubkey on profile page (William Casarin) +- Don't spin forever if we're temporarily disconnected (William Casarin) +- Fixed a few issues with avatars not animating (OlegAba) +- Scroll to bottom when new DM received (Aidan O'Loan) +- Make reply view scrollable (Joel Klabo) +- Hide profile edit button when logged in with pubkey (Swift) + + +[1.0.0-5]: https://github.com/damus-io/damus/releases/tag/v1.0.0-5 + ## [1.0.0-4] - 2023-01-04 ### Added @@ -320,3 +352,4 @@ [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2 + From 08dd2d5414b895dd8713f4b4f928a0cc3a674827 Mon Sep 17 00:00:00 2001 From: OlegAba Date: Sat, 7 Jan 2023 13:03:05 -0500 Subject: [PATCH 2/3] Fix picker bug and refactored --- damus/ContentView.swift | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/damus/ContentView.swift b/damus/ContentView.swift index a20c90a3..698249cc 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -45,10 +45,10 @@ enum FilterState : Int { case posts_and_replies = 1 case posts = 0 - func filter(privkey: String?, ev: NostrEvent) -> Bool { + func filter(ev: NostrEvent) -> Bool { switch self { case .posts: - return !ev.is_reply(privkey) + return !ev.is_reply(nil) case .posts_and_replies: return true } @@ -93,10 +93,12 @@ struct ContentView: View { var PostingTimelineView: some View { VStack { TabView(selection: $filter_state) { - contentTimelineView(filter: posts_filter_event) + contentTimelineView(filter: FilterState.posts.filter) .tag(FilterState.posts) - contentTimelineView(filter: posts_and_replies_filter_event) + .id(FilterState.posts) + contentTimelineView(filter: FilterState.posts_and_replies.filter) .tag(FilterState.posts_and_replies) + .id(FilterState.posts_and_replies) } .tabViewStyle(.page(indexDisplayMode: .never)) } @@ -126,14 +128,6 @@ struct ContentView: View { } } - func posts_and_replies_filter_event(_ ev: NostrEvent) -> Bool { - return true - } - - func posts_filter_event(_ ev: NostrEvent) -> Bool { - return !ev.is_reply(nil) - } - var FiltersView: some View { VStack{ Picker("Filter State", selection: $filter_state) { From c10fcc52e3bd87577dc39d75c1ced98d63055551 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 7 Jan 2023 11:29:24 -0800 Subject: [PATCH 3/3] dms: always use the other persons pubkey in context menu The DM view can sometimes show our last message, which means the pubkey in the context menu would be ours. This is super confusing, so always use the other persons pubkey when copying the user id in the DMs view. Changlog-Fixed: Always copy other persons pubkey in DMs context menus --- damus/Views/ChatroomView.swift | 2 +- damus/Views/DMChatView.swift | 2 +- damus/Views/EventView.swift | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/damus/Views/ChatroomView.swift b/damus/Views/ChatroomView.swift index 70bd6c6f..0ce67276 100644 --- a/damus/Views/ChatroomView.swift +++ b/damus/Views/ChatroomView.swift @@ -24,7 +24,7 @@ struct ChatroomView: View { next_ev: ind == count-1 ? nil : thread.events[ind+1], damus_state: damus ) - .event_context_menu(ev, privkey: damus.keypair.privkey) + .event_context_menu(ev, pubkey: ev.pubkey, privkey: damus.keypair.privkey) .onTapGesture { if thread.initial_event.id == ev.id { //dismiss() diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift index 0c71bc6e..67bf25de 100644 --- a/damus/Views/DMChatView.swift +++ b/damus/Views/DMChatView.swift @@ -19,7 +19,7 @@ struct DMChatView: View { VStack(alignment: .leading) { ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in DMView(event: dms.events[ind], damus_state: damus_state) - .event_context_menu(ev, privkey: damus_state.keypair.privkey) + .event_context_menu(ev, pubkey: ev.pubkey, privkey: damus_state.keypair.privkey) } EndBlock(height: 80) } diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 4a373ebe..5cb5581f 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -274,7 +274,7 @@ struct EventView: View { .id(event.id) .frame(maxWidth: .infinity, minHeight: PFP_SIZE) .padding([.bottom], 2) - .event_context_menu(event, privkey: damus.keypair.privkey) + .event_context_menu(event, pubkey: pubkey, privkey: damus.keypair.privkey) } } @@ -313,7 +313,7 @@ extension View { } } - func event_context_menu(_ event: NostrEvent, privkey: String?) -> some View { + func event_context_menu(_ event: NostrEvent, pubkey: String, privkey: String?) -> some View { return self.contextMenu { Button { UIPasteboard.general.string = event.get_content(privkey) @@ -322,7 +322,7 @@ extension View { } Button { - UIPasteboard.general.string = bech32_pubkey(event.pubkey) ?? event.pubkey + UIPasteboard.general.string = bech32_pubkey(pubkey) ?? pubkey } label: { Label("Copy User ID", systemImage: "tag") }