mirror of
https://github.com/aljazceru/notedeck.git
synced 2025-12-19 01:24:21 +01:00
@@ -56,10 +56,10 @@ impl ClientMessage {
|
||||
Self::Raw(raw) => raw.clone(),
|
||||
Self::Req { sub_id, filters } => {
|
||||
if filters.is_empty() {
|
||||
format!("[\"REQ\",\"{}\",{{ }}]", sub_id)
|
||||
format!("[\"REQ\",\"{sub_id}\",{{ }}]")
|
||||
} else if filters.len() == 1 {
|
||||
let filters_json_str = filters[0].json()?;
|
||||
format!("[\"REQ\",\"{}\",{}]", sub_id, filters_json_str)
|
||||
format!("[\"REQ\",\"{sub_id}\",{filters_json_str}]")
|
||||
} else {
|
||||
let filters_json_str: Result<Vec<String>, Error> = filters
|
||||
.iter()
|
||||
|
||||
@@ -46,8 +46,8 @@ impl From<RelayEvent<'_>> for OwnedRelayEvent {
|
||||
RelayEvent::Other(ws_message) => {
|
||||
let ws_str = match ws_message {
|
||||
WsMessage::Binary(_) => "Binary".to_owned(),
|
||||
WsMessage::Text(t) => format!("Text:{}", t),
|
||||
WsMessage::Unknown(u) => format!("Unknown:{}", u),
|
||||
WsMessage::Text(t) => format!("Text:{t}"),
|
||||
WsMessage::Unknown(u) => format!("Unknown:{u}"),
|
||||
WsMessage::Ping(_) => "Ping".to_owned(),
|
||||
WsMessage::Pong(_) => "Pong".to_owned(),
|
||||
};
|
||||
@@ -57,9 +57,9 @@ impl From<RelayEvent<'_>> for OwnedRelayEvent {
|
||||
RelayEvent::Message(relay_message) => {
|
||||
let relay_msg = match relay_message {
|
||||
RelayMessage::OK(_) => "OK".to_owned(),
|
||||
RelayMessage::Eose(s) => format!("EOSE:{}", s),
|
||||
RelayMessage::Event(_, s) => format!("EVENT:{}", s),
|
||||
RelayMessage::Notice(s) => format!("NOTICE:{}", s),
|
||||
RelayMessage::Eose(s) => format!("EOSE:{s}"),
|
||||
RelayMessage::Event(_, s) => format!("EVENT:{s}"),
|
||||
RelayMessage::Notice(s) => format!("NOTICE:{s}"),
|
||||
};
|
||||
OwnedRelayEvent::Message(relay_msg)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user