Implement posting

.envrc

@@ -4,6 +4,8 @@ export android_emulator=false
 
 use nix --arg use_android $use_android --arg android_emulator $android_emulator
 
+# you can put secret keys in here
+source .privenv || :
+
 export PATH=$PATH:$HOME/.cargo/bin
 export JB55=32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245
-

.gitignore

@@ -2,6 +2,7 @@
 .buildcmd
 perf.data
 perf.data.old
+.privenv
 target
 queries/damus-notifs.json
 .git

Cargo.toml

@@ -46,8 +46,8 @@ serde_json = "1.0.89"
 env_logger = "0.10.0"
 puffin_egui = { version = "0.27.0", optional = true }
 puffin = { version = "0.19.0", optional = true }
-nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "5733ece62b8495db8624a21637bacd12ebb22b2c" }
-#nostrdb = "0.3.3"
+nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "ee8afeeb0b6695fca6d27dd0b74a8dc159e37b95" }
+#nostrdb = "0.3.4"
 hex = "0.4.3"
 base32 = "0.4.0"
 strum = "0.26"

enostr/src/client/message.rs

@@ -1,11 +1,11 @@
-use crate::{Event, Filter};
+use crate::{Filter, Note};
 use serde_json::json;
 
 /// Messages sent by clients, received by relays
 #[derive(Debug, Eq, PartialEq)]
 pub enum ClientMessage {
     Event {
-        event: Event,
+        note: Note,
     },
     Req {
         sub_id: String,
@@ -14,11 +14,16 @@ pub enum ClientMessage {
     Close {
         sub_id: String,
     },
+    Raw(String),
 }
 
 impl ClientMessage {
-    pub fn event(event: Event) -> Self {
-        ClientMessage::Event { event }
+    pub fn event(note: Note) -> Self {
+        ClientMessage::Event { note }
+    }
+
+    pub fn raw(raw: String) -> Self {
+        ClientMessage::Raw(raw)
     }
 
     pub fn req(sub_id: String, filters: Vec<Filter>) -> Self {
@@ -31,7 +36,8 @@ impl ClientMessage {
 
     pub fn to_json(&self) -> String {
         match self {
-            Self::Event { event } => json!(["EVENT", event]).to_string(),
+            Self::Event { note } => json!(["EVENT", note]).to_string(),
+            Self::Raw(raw) => raw.clone(),
             Self::Req { sub_id, filters } => {
                 let mut json = json!(["REQ", sub_id]);
                 let mut filters = json!(filters);

enostr/src/filter.rs

@@ -1,17 +1,17 @@
-use crate::{EventId, Pubkey};
+use crate::{NoteId, Pubkey};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
 pub struct Filter {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub ids: Option<Vec<EventId>>,
+    pub ids: Option<Vec<NoteId>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub authors: Option<Vec<Pubkey>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub kinds: Option<Vec<u64>>,
     #[serde(rename = "#e")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub events: Option<Vec<EventId>>,
+    pub events: Option<Vec<NoteId>>,
     #[serde(rename = "#p")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub pubkeys: Option<Vec<Pubkey>>,
@@ -49,7 +49,7 @@ impl Filter {
         150
     }
 
-    pub fn ids(mut self, ids: Vec<EventId>) -> Self {
+    pub fn ids(mut self, ids: Vec<NoteId>) -> Self {
         self.ids = Some(ids);
         self
     }
@@ -64,7 +64,7 @@ impl Filter {
         self
     }
 
-    pub fn events(mut self, events: Vec<EventId>) -> Self {
+    pub fn events(mut self, events: Vec<NoteId>) -> Self {
         self.events = Some(events);
         self
     }

enostr/src/lib.rs

@@ -1,6 +1,5 @@
 mod client;
 mod error;
-mod event;
 mod filter;
 mod keypair;
 mod note;
@@ -10,12 +9,11 @@ mod relay;
 
 pub use client::ClientMessage;
 pub use error::Error;
-pub use event::{Event, EventId};
 pub use ewebsock;
 pub use filter::Filter;
 pub use keypair::{FullKeypair, Keypair};
 pub use nostr::SecretKey;
-pub use note::NoteId;
+pub use note::{Note, NoteId};
 pub use profile::Profile;
 pub use pubkey::Pubkey;
 pub use relay::message::{RelayEvent, RelayMessage};