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

Accept all events from our users

Browse Source
This commit is contained in:
Mike Dilger 2024-02-18 09:17:03 +13:00
parent f576106a05
commit c0033d4ba5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nostr.rs
View File

@ -3,7 +3,7 @@ use crate::globals::GLOBALS;
use crate::reply::{NostrReply, NostrReplyPrefix}; use crate::reply::{NostrReply, NostrReplyPrefix};
use crate::types::parse::json_escape::json_unescape; use crate::types::parse::json_escape::json_unescape;
use crate::types::parse::json_parse::*; use crate::types::parse::json_parse::*;
use crate::types::{Event, Filter, Kind, OwnedFilter, Time}; use crate::types::{Event, Filter, Kind, OwnedFilter, Pubkey, Time};
use crate::WebSocketService; use crate::WebSocketService;
use futures::SinkExt; use futures::SinkExt;
use hyper_tungstenite::tungstenite::Message; use hyper_tungstenite::tungstenite::Message;
@ -139,7 +139,7 @@ impl WebSocketService {
} }
// Screen the event to see if we are willing to accept it // Screen the event to see if we are willing to accept it
if !screen_event(&event).await? { if !screen_event(&event, self.user).await? {
let prefix = if self.user.is_some() { let prefix = if self.user.is_some() {
NostrReplyPrefix::Restricted NostrReplyPrefix::Restricted
} else { } else {
@ -276,7 +276,7 @@ impl WebSocketService {
} }
} }
async fn screen_event(event: &Event<'_>) -> Result<bool, Error> { async fn screen_event(event: &Event<'_>, user: Option<Pubkey>) -> Result<bool, Error> {
// Accept relay lists from anybody // Accept relay lists from anybody
if event.kind() == Kind(10002) { if event.kind() == Kind(10002) {
return Ok(true); return Ok(true);
@ -306,6 +306,14 @@ async fn screen_event(event: &Event<'_>) -> Result<bool, Error> {
} }
} }
// If the user is authenticated as one of our users, accept anything
// that they give us
if let Some(pk) = user {
if GLOBALS.config.read().await.user_keys.contains(&pk) {
return Ok(true);
}
}
// Reject everything else // Reject everything else
Ok(false) Ok(false)
} }