Browse Source

Show images from yourself

Changelog-Fixed: Show images from yourself
post-button-style
William Casarin 2 years ago
parent
commit
13516dbc0a
  1. 2
      damus/Views/ChatView.swift
  2. 4
      damus/Views/DMView.swift
  3. 9
      damus/Views/EventView.swift
  4. 1
      damus/Views/SelectWalletView.swift

2
damus/Views/ChatView.swift

@ -106,7 +106,7 @@ struct ChatView: View {
} }
} }
NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, show_images: should_show_images(contacts: damus_state.contacts, ev: event), artifacts: .just_content(event.content), size: .normal) NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, show_images: should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey), artifacts: .just_content(event.content), size: .normal)
if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey { if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey {
let bar = make_actionbar_model(ev: event, damus: damus_state) let bar = make_actionbar_model(ev: event, damus: damus_state)

4
damus/Views/DMView.swift

@ -21,7 +21,9 @@ struct DMView: View {
Spacer() Spacer()
} }
NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, show_images: should_show_images(contacts: damus_state.contacts, ev: event), artifacts: .just_content(event.get_content(damus_state.keypair.privkey)), size: .normal) let should_show_img = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, show_images: should_show_img, artifacts: .just_content(event.get_content(damus_state.keypair.privkey)), size: .normal)
.foregroundColor(is_ours ? Color.white : Color.primary) .foregroundColor(is_ours ? Color.white : Color.primary)
.padding(10) .padding(10)
.background(is_ours ? Color.accentColor : Color.secondary.opacity(0.15)) .background(is_ours ? Color.accentColor : Color.secondary.opacity(0.15))

9
damus/Views/EventView.swift

@ -247,7 +247,9 @@ struct EventView: View {
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
} }
NoteContentView(privkey: damus.keypair.privkey, event: event, profiles: damus.profiles, show_images: should_show_images(contacts: damus.contacts, ev: event), artifacts: .just_content(content), size: self.size) let should_show_img = should_show_images(contacts: damus.contacts, ev: event, our_pubkey: damus.pubkey)
NoteContentView(privkey: damus.keypair.privkey, event: event, profiles: damus.profiles, show_images: should_show_img, artifacts: .just_content(content), size: self.size)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
.allowsHitTesting(!embedded) .allowsHitTesting(!embedded)
@ -309,7 +311,10 @@ struct EventView: View {
} }
// blame the porn bots for this code // blame the porn bots for this code
func should_show_images(contacts: Contacts, ev: NostrEvent) -> Bool { func should_show_images(contacts: Contacts, ev: NostrEvent, our_pubkey: String) -> Bool {
if ev.pubkey == our_pubkey {
return true
}
if contacts.is_in_friendosphere(ev.pubkey) { if contacts.is_in_friendosphere(ev.pubkey) {
return true return true
} }

1
damus/Views/SelectWalletView.swift

@ -57,6 +57,7 @@ struct SelectWalletView: View {
ForEach(walletItems, id: \.self) { wallet in ForEach(walletItems, id: \.self) { wallet in
Button() { Button() {
if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) { if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
print("opening wallet url \(url)")
openURL(url) openURL(url)
} else { } else {
if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) { if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {

Loading…
Cancel
Save