Add indication of followers you know in a profile

Changelog-Added: Add indication of followers you know in a profile

CHANGELOG.md

@@ -1,21 +1,3 @@
-## [1.5-5] - 2023-06-24
-
-### Fixed
-
-- Remove note zaps to fit apples appstore guidelines
-- Fix zap sheet popping (William Casarin)
-- Fix CustomizeZapView from randomly disappearing (William Casarin)
-- Fix "zapped your profile" strings to say "zapped you" (Terry Yiu)
-- Fix reconnect loop issues on iOS17 (William Casarin)
-- Fix some more thread jankiness (William Casarin)
-- Fix spelling of Nostr to use Titlecase instead of lowercase (Terry Yiu)
-- Rename all usages of the term Post as a noun to Note to conform to the Nostr spec (Terry Yiu)
-- Fix text cutoff on login with npub (gladiusKatana)
-- Fix hangs due to video player (William Casarin)
-
-
-[1.5-5]: https://github.com/damus-io/damus/releases/tag/v1.5-5
-
 ## [1.5-2] - 2023-05-30
 
 ### Added

damus.xcodeproj/project.pbxproj

@@ -2236,7 +2236,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -2284,7 +2284,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;

damus/ContentView.swift

@@ -310,14 +310,13 @@ struct ContentView: View {
                                         if selected_timeline == .search {
                                             Button(action: {
                                                 //isFilterVisible.toggle()
-                                                present_sheet(.filter)
+                                                self.active_sheet = .filter
                                             }) {
                                                 // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
                                                 Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), image: "filter")
                                                     .foregroundColor(.gray)
                                                     //.contentShape(Rectangle())
                                             }
-                                            .buttonStyle(.plain)
                                         }
                                     }
                                 }

damus/Models/HomeModel.swift

@@ -1164,15 +1164,13 @@ func process_local_notification(damus_state: DamusState, event ev: NostrEvent) {
             create_local_notification(profiles: damus_state.profiles, notify: notify )
         }
     } else if type == .boost && damus_state.settings.repost_notification, let inner_ev = ev.get_inner_event(cache: damus_state.events) {
-        let content = NSAttributedString(render_note_content(ev: inner_ev, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey).content.attributed).string
-        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: content)
+        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: inner_ev.content)
         create_local_notification(profiles: damus_state.profiles, notify: notify)
     } else if type == .like && damus_state.settings.like_notification,
               let evid = ev.referenced_ids.last?.ref_id,
               let liked_event = damus_state.events.lookup(evid)
     {
-        let content = NSAttributedString(render_note_content(ev: liked_event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey).content.attributed).string
-        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: content)
+        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: liked_event.content)
         create_local_notification(profiles: damus_state.profiles, notify: notify)
     }
 

damus/Views/NoteContentView.swift

@@ -425,7 +425,7 @@ enum UrlType {
             case .image(let url):
                 return url
             case .video:
-                return nil
+                return url
             }
         case .link:
             return nil

damus/Views/TimelineView.swift

@@ -30,10 +30,12 @@ struct TimelineView: View {
                     .redacted(reason: loading ? .placeholder : [])
                     .shimmer(loading)
                     .disabled(loading)
+                /*
                     .background(GeometryReader { proxy -> Color in
                         handle_scroll_queue(proxy, queue: self.events)
                         return Color.clear
                     })
+                 */
             }
             .buttonStyle(BorderlessButtonStyle())
             .coordinateSpace(name: "scroll")