nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-05-03 06:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nip-04 support

Browse Source
This commit is contained in:
Mike Dilger 2024-02-19 15:10:35 +13:00
parent 2b636f6776
commit 04e6947ffb
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/nostr.rs
View File

@ -113,11 +113,32 @@ impl WebSocketService {
Some(pk) => event.pubkey() == pk, Some(pk) => event.pubkey() == pk,
}; };
let user_is_tagged = match self.user {
None => false,
Some(pk) => {
let mut user_is_tagged = false;
for mut tag in event.tags()?.iter() {
if let Some(b"p") = tag.next() {
if let Some(value) = tag.next() {
let mut bytes: [u8; 64] = [0; 64];
pk.write_hex(&mut bytes).unwrap();
if value == bytes {
user_is_tagged = true;
break;
}
}
}
}
user_is_tagged
}
};
if screen_outgoing_event( if screen_outgoing_event(
&event, &event,
authorized_user, authorized_user,
authored_by_an_authorized_user, authored_by_an_authorized_user,
authored_by_requester, authored_by_requester,
user_is_tagged
) { ) {
events.push(event); events.push(event);
} }
@ -389,6 +410,7 @@ fn screen_outgoing_event(
authorized_user: bool, authorized_user: bool,
authored_by_an_authorized_user: bool, authored_by_an_authorized_user: bool,
authored_by_requester: bool, authored_by_requester: bool,
user_is_tagged: bool,
) -> bool { ) -> bool {
// Allow Relay Lists // Allow Relay Lists
if event.kind() == Kind(10002) { if event.kind() == Kind(10002) {
@ -400,9 +422,16 @@ fn screen_outgoing_event(
return true; return true;
} }
// Forbid if it is a private event (DM or GiftWrap) and the author isn't them // Forbid if it is a private event (DM or GiftWrap) and theey are neither the recipient
if (event.kind() == Kind(4) || event.kind() == Kind(1059)) && !authored_by_requester { // nor the author
return false; if event.kind() == Kind(4) || event.kind() == Kind(1059) {
if authored_by_requester {
return true;
} else if user_is_tagged {
return true;
} else {
return false;
}
} }
// Allow if an authorized_user is asking // Allow if an authorized_user is asking