Removes the Draft dependency for signer implementations

quartz/src/main/java/com/vitorpamplona/quartz/events/ChannelMessageEvent.kt

@@ -88,7 +88,11 @@ class ChannelMessageEvent(
                 arrayOf("alt", ALT),
             )
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), message, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), message, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), message, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ChatMessageEvent.kt

@@ -107,7 +107,11 @@ class ChatMessageEvent(
             }
             // tags.add(arrayOf("alt", alt))
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/ClassifiedsEvent.kt

@@ -193,7 +193,11 @@ class ClassifiedsEvent(
             }
             tags.add(arrayOf("alt", ALT))
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), message, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), message, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), message, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/GitReplyEvent.kt

@@ -157,7 +157,11 @@ class GitReplyEvent(
             }
             tags.add(arrayOf("alt", "a git issue reply"))
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesChatMessageEvent.kt

@@ -99,7 +99,11 @@ class LiveActivitiesChatMessageEvent(
             }
             tags.add(arrayOf("alt", ALT))
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), content, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), content, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), content, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/PollNoteEvent.kt

@@ -113,7 +113,11 @@ class PollNoteEvent(
             }
             tags.add(arrayOf("alt", ALT))
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/PrivateDmEvent.kt

@@ -168,7 +168,11 @@ class PrivateDmEvent(
             tags.add(arrayOf("alt", ALT))
 
             signer.nip04Encrypt(message, recipientPubKey) { content ->
-                signer.sign(createdAt, KIND, tags.toTypedArray(), content, onReady, isDraft)
+                if (isDraft) {
+                    signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), content, onReady)
+                } else {
+                    signer.sign(createdAt, KIND, tags.toTypedArray(), content, onReady)
+                }
             }
         }
     }

quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt

@@ -125,7 +125,11 @@ class TextNoteEvent(
                 }
             }
 
-            signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady, isDraft)
+            if (isDraft) {
+                signer.assembleRumor(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            } else {
+                signer.sign(createdAt, KIND, tags.toTypedArray(), msg, onReady)
+            }
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSigner.kt

@@ -21,7 +21,9 @@
 package com.vitorpamplona.quartz.signers
 
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventFactory
 import com.vitorpamplona.quartz.events.LnZapPrivateEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 
@@ -32,7 +34,6 @@ abstract class NostrSigner(val pubKey: HexKey) {
         tags: Array<Array<String>>,
         content: String,
         onReady: (T) -> Unit,
-        isDraft: Boolean = false,
     )
 
     abstract fun nip04Encrypt(
@@ -63,4 +64,26 @@ abstract class NostrSigner(val pubKey: HexKey) {
         event: LnZapRequestEvent,
         onReady: (LnZapPrivateEvent) -> Unit,
     )
+
+    fun <T : Event> assembleRumor(
+        createdAt: Long,
+        kind: Int,
+        tags: Array<Array<String>>,
+        content: String,
+        onReady: (T) -> Unit,
+    ) {
+        val id = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
+
+        onReady(
+            EventFactory.create(
+                id = id,
+                pubKey = pubKey,
+                createdAt = createdAt,
+                kind = kind,
+                tags = tags,
+                content = content,
+                sig = "",
+            ) as T,
+        )
+    }
 }

quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerExternal.kt

@@ -40,13 +40,7 @@ class NostrSignerExternal(
         tags: Array<Array<String>>,
         content: String,
         onReady: (T) -> Unit,
-        isDraft: Boolean,
     ) {
-        if (isDraft) {
-            unsignedEvent(createdAt, kind, tags, content, onReady)
-            return
-        }
-
         val id = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
 
         val event =
@@ -92,28 +86,6 @@ class NostrSignerExternal(
         }
     }
 
-    fun <T : Event> unsignedEvent(
-        createdAt: Long,
-        kind: Int,
-        tags: Array<Array<String>>,
-        content: String,
-        onReady: (T) -> Unit,
-    ) {
-        val id = Event.generateId(pubKey, createdAt, kind, tags, content)
-
-        onReady(
-            EventFactory.create(
-                id.toHexKey(),
-                pubKey,
-                createdAt,
-                kind,
-                tags,
-                content,
-                "",
-            ) as T,
-        )
-    }
-
     override fun nip04Encrypt(
         decryptedContent: String,
         toPublicKey: HexKey,

quartz/src/main/java/com/vitorpamplona/quartz/signers/NostrSignerInternal.kt

@@ -38,15 +38,9 @@ class NostrSignerInternal(val keyPair: KeyPair) : NostrSigner(keyPair.pubKey.toH
         tags: Array<Array<String>>,
         content: String,
         onReady: (T) -> Unit,
-        isDraft: Boolean,
     ) {
         if (keyPair.privKey == null) return
 
-        if (isDraft) {
-            unsignedEvent(createdAt, kind, tags, content, onReady)
-            return
-        }
-
         if (isUnsignedPrivateEvent(kind, tags)) {
             // this is a private zap
             signPrivateZap(createdAt, kind, tags, content, onReady)
@@ -88,30 +82,6 @@ class NostrSignerInternal(val keyPair: KeyPair) : NostrSigner(keyPair.pubKey.toH
         )
     }
 
-    fun <T : Event> unsignedEvent(
-        createdAt: Long,
-        kind: Int,
-        tags: Array<Array<String>>,
-        content: String,
-        onReady: (T) -> Unit,
-    ) {
-        if (keyPair.privKey == null) return
-
-        val id = Event.generateId(pubKey, createdAt, kind, tags, content)
-
-        onReady(
-            EventFactory.create(
-                id.toHexKey(),
-                pubKey,
-                createdAt,
-                kind,
-                tags,
-                content,
-                "",
-            ) as T,
-        )
-    }
-
     override fun nip04Encrypt(
         decryptedContent: String,
         toPublicKey: HexKey,