diff --git a/src/bin/chorus_cmd.rs b/src/bin/chorus_cmd.rs index e17f456..cdeda24 100644 --- a/src/bin/chorus_cmd.rs +++ b/src/bin/chorus_cmd.rs @@ -2,7 +2,7 @@ use chorus::error::{ChorusError, Error}; use pocket_types::{Filter, Id, Pubkey, Tags}; use std::env; -const USAGE: &'static str = "usage: chorus_cmd [args...]"; +const USAGE: &str = "usage: chorus_cmd [args...]"; fn main() -> Result<(), Error> { // Get args (config path) @@ -49,8 +49,8 @@ fn main() -> Result<(), Error> { let (_, tags) = Tags::from_json(b"[]", &mut tags_buffer)?; let mut filter_buffer: [u8; 128] = [0; 128]; let filter = - Filter::from_parts(&[], &[pk], &[], &tags, None, None, None, &mut filter_buffer)?; - let events = store.find_events(&filter, true, 0, 0, |_| true)?; + Filter::from_parts(&[], &[pk], &[], tags, None, None, None, &mut filter_buffer)?; + let events = store.find_events(filter, true, 0, 0, |_| true)?; for event in events.iter() { store.remove_event(event.id())?; } diff --git a/src/bin/chorus_moderate.rs b/src/bin/chorus_moderate.rs index 7233508..4b464a0 100644 --- a/src/bin/chorus_moderate.rs +++ b/src/bin/chorus_moderate.rs @@ -19,7 +19,7 @@ fn main() -> Result<(), Error> { chorus::setup_logging(&config); // These kinds don't need approval: - let allowed_kinds = vec![ + let allowed_kinds = [ Kind::from(4), // Encrypted Direct Message Kind::from(1059), // Giftwrap Kind::from(10002), // Relay list diff --git a/src/lib.rs b/src/lib.rs index 4782333..7ac8cd0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -397,7 +397,7 @@ impl WebSocketService { self.websocket.close(Some(close_frame)).await?; // Drive to completion - while let Some(_) = self.websocket.next().await {} + while (self.websocket.next().await).is_some() {} Err(error) } diff --git a/src/reply.rs b/src/reply.rs index 056b111..c3f3501 100644 --- a/src/reply.rs +++ b/src/reply.rs @@ -1,6 +1,7 @@ use pocket_types::{Event, Hll8, Id}; use std::fmt; +#[derive(Debug, Clone, Copy)] pub enum NostrReplyPrefix { None, AuthRequired, @@ -29,6 +30,8 @@ impl fmt::Display for NostrReplyPrefix { } } +#[derive(Debug, Clone)] +#[allow(clippy::large_enum_variant)] pub enum NostrReply<'a> { Auth(String), Event(&'a str, &'a Event), diff --git a/src/web/blossom/mod.rs b/src/web/blossom/mod.rs index b68ab8a..c907c34 100644 --- a/src/web/blossom/mod.rs +++ b/src/web/blossom/mod.rs @@ -125,7 +125,7 @@ pub async fn handle_hash( if let Some(etags) = request.headers().get(IF_MATCH) { let mut onematch: bool = false; for part in etags.to_str()?.split(',') { - if &part[1..part.len() - 1] == &format!("{}", hash) { + if part[1..part.len() - 1] == format!("{}", hash) { onematch = true; } } @@ -143,7 +143,7 @@ pub async fn handle_hash( let mut send_not_modified: bool = false; if let Some(etags) = request.headers().get(IF_NONE_MATCH) { for part in etags.to_str()?.split(',') { - if &part[1..part.len() - 1] == &format!("{}", hash) { + if part[1..part.len() - 1] == format!("{}", hash) { send_not_modified = true; } } diff --git a/src/web/management/auth.rs b/src/web/management/auth.rs index bc0816b..a15c091 100644 --- a/src/web/management/auth.rs +++ b/src/web/management/auth.rs @@ -27,7 +27,7 @@ pub async fn check_auth(request: Request) -> Result { // Authorization header must be type "nostr" let value = String::from_utf8(authz.as_bytes().to_owned())?; - let mut parts = value.split(|b| b == ' '); + let mut parts = value.split(' '); match parts.next() { Some(s) => { if s.to_lowercase() != "nostr" {