nostr: fix Kind::is_regular method

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -120,6 +120,7 @@
 * nostr: fix `TagStanderd::to_vec` ([nanikamado])
 * nostr: fix broken intra doc links ([Yuki Kishimoto])
 * nostr: fix `JsonUtil::try_as_pretty_json` method ([Yuki Kishimoto])
+* nostr: fix `Kind::is_regular` method ([Yuki Kishimoto])
 
 ### Removed
 

bindings/nostr-ffi/src/event/kind.rs

@@ -67,6 +67,8 @@ impl Kind {
 
     /// Check if it's regular
     ///
+    /// Regular means that event is expected to be stored by relays.
+    ///
     /// <https://github.com/nostr-protocol/nips/blob/master/01.md>
     #[inline]
     pub fn is_regular(&self) -> bool {

bindings/nostr-js/src/event/kind.rs

@@ -60,6 +60,8 @@ impl JsKind {
 
     /// Check if it's regular
     ///
+    /// Regular means that event is expected to be stored by relays.
+    ///
     /// <https://github.com/nostr-protocol/nips/blob/master/01.md>
     #[wasm_bindgen(js_name = isRegular)]
     pub fn is_regular(&self) -> bool {

crates/nostr/src/event/kind.rs

@@ -29,7 +29,9 @@ pub const PARAMETERIZED_REPLACEABLE_RANGE: Range<u16> = 30_000..40_000;
 
 macro_rules! kind_variants {
     ($($name:ident => $value:expr, $doc:expr),* $(,)?) => {
-        /// Event [`Kind`]
+        /// Event kind
+        ///
+        /// <https://github.com/nostr-protocol/nips/blob/master/01.md>
         #[derive(Debug, Clone, Copy)]
         pub enum Kind {
             $(
@@ -227,10 +229,19 @@ impl Kind {
         NIP90_JOB_RESULT_RANGE.contains(&self.as_u16())
     }
 
-    /// Check if [`Kind`] is `Regular`
-    #[inline]
+    /// Check if it's regular
+    ///
+    /// Regular means that event is expected to be stored by relays.
     pub fn is_regular(&self) -> bool {
-        REGULAR_RANGE.contains(&self.as_u16())
+        let kind: u16 = self.as_u16();
+
+        // Exclude ALL param replaceable and ephemeral
+        // Exclude PARTIALLY the replaceable
+        if kind > 10_000 {
+            return false;
+        }
+
+        REGULAR_RANGE.contains(&kind) || !self.is_replaceable()
     }
 
     /// Check if [`Kind`] is `Replaceable`