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

Don't leak mentions in DMs

Browse Source 
Changelog-Fixed: Don't leak mentions in DMs
This commit is contained in:
William Casarin
2023-04-10 09:31:26 -07:00
parent f500da03e8
commit 2aa8d527b9
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
damus/Models/Mentions.swift
View File

@@ -134,10 +134,12 @@ func render_blocks(blocks: [Block]) -> String {
case .mention(let m): case .mention(let m):
if let idx = m.index { if let idx = m.index {
return str + "#[\(idx)]" return str + "#[\(idx)]"
} else if m.type == .pubkey { } else if m.type == .pubkey, let pk = bech32_pubkey(m.ref.ref_id) {
return str + "nostr:\(bech32_pubkey(m.ref.ref_id)!)" return str + "nostr:\(pk)"
} else if let note_id = bech32_note_id(m.ref.ref_id) {
return str + "nostr:\(note_id)"
} else { } else {
return str + "nostr:\(bech32_note_id(m.ref.ref_id)!)" return str + m.ref.ref_id
} }
case .relay(let relay): case .relay(let relay):
return str + relay return str + relay
@@ -633,7 +635,7 @@ func parse_mention_type(_ c: String) -> MentionType? {
} }
/// Convert /// Convert
func make_post_tags(post_blocks: [PostBlock], tags: [[String]]) -> PostTags { func make_post_tags(post_blocks: [PostBlock], tags: [[String]], silent_mentions: Bool) -> PostTags {
var new_tags = tags var new_tags = tags
var blocks: [Block] = [] var blocks: [Block] = []
@@ -643,6 +645,14 @@ func make_post_tags(post_blocks: [PostBlock], tags: [[String]]) -> PostTags {
guard let mention_type = parse_mention_type(ref.key) else { guard let mention_type = parse_mention_type(ref.key) else {
continue continue
} }
if silent_mentions || mention_type == .event {
let mention = Mention(index: nil, type: mention_type, ref: ref)
let block = Block.mention(mention)
blocks.append(block)
continue
}
if let ind = find_tag_ref(type: ref.key, id: ref.ref_id, tags: tags) { if let ind = find_tag_ref(type: ref.key, id: ref.ref_id, tags: tags) {
let mention = Mention(index: ind, type: mention_type, ref: ref) let mention = Mention(index: ind, type: mention_type, ref: ref)
let block = Block.mention(mention) let block = Block.mention(mention)
@@ -668,7 +678,7 @@ func make_post_tags(post_blocks: [PostBlock], tags: [[String]]) -> PostTags {
func post_to_event(post: NostrPost, privkey: String, pubkey: String) -> NostrEvent { func post_to_event(post: NostrPost, privkey: String, pubkey: String) -> NostrEvent {
let tags = post.references.map(refid_to_tag) let tags = post.references.map(refid_to_tag)
let post_blocks = parse_post_blocks(content: post.content) let post_blocks = parse_post_blocks(content: post.content)
let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags) let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags, silent_mentions: false)
let content = render_blocks(blocks: post_tags.blocks) let content = render_blocks(blocks: post_tags.blocks)
let new_ev = NostrEvent(content: content, pubkey: pubkey, kind: post.kind.rawValue, tags: post_tags.tags) let new_ev = NostrEvent(content: content, pubkey: pubkey, kind: post.kind.rawValue, tags: post_tags.tags)
new_ev.calculate_id() new_ev.calculate_id()

2
damus/Views/DMChatView.swift
View File

@@ -120,7 +120,7 @@ struct DMChatView: View {
func send_message() { func send_message() {
let tags = [["p", pubkey]] let tags = [["p", pubkey]]
let post_blocks = parse_post_blocks(content: dms.draft) let post_blocks = parse_post_blocks(content: dms.draft)
let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags) let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags, silent_mentions: true)
let content = render_blocks(blocks: post_tags.blocks) let content = render_blocks(blocks: post_tags.blocks)
guard let dm = create_dm(content, to_pk: pubkey, tags: post_tags.tags, keypair: damus_state.keypair) else { guard let dm = create_dm(content, to_pk: pubkey, tags: post_tags.tags, keypair: damus_state.keypair) else {