From ce5916e692e146778ed298b18fcfda0ffe63bf2d Mon Sep 17 00:00:00 2001
From: "@s.roertgen" <sroertgen@gmail.com>
Date: Tue, 20 Aug 2024 23:02:26 +0200
Subject: [PATCH] anonymous posting possible

---
 src/ied/events.cljs | 47 +++++++++++++++++++++++++++------------------
 src/ied/nostr.cljs  |  7 ++++---
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/ied/events.cljs b/src/ied/events.cljs
index fd7edb5..2f88529 100644
--- a/src/ied/events.cljs
+++ b/src/ied/events.cljs
@@ -11,9 +11,8 @@
    [wscljs.format :as fmt]
    [clojure.string :as str]
    [clojure.set :as set]
-   
-   ["js-confetti" :as jsConfetti]
-   ))
+
+   ["js-confetti" :as jsConfetti]))
 
 (def list-kinds [30001 30004])
 
@@ -196,15 +195,18 @@
                          :content ""
                          :tags [["d" (:id resource)]
                                 ["author" "" (:author resource)]]}]
-              {::sign-and-publish-event event})))
+              {::sign-and-publish-event [event (:sk cofx)]})))
 
 ;; TODO maybe we need some validation before publishing
 (re-frame/reg-fx
  ::sign-and-publish-event
- (fn [unsignedEvent]
+ (fn [[unsignedEvent sk]]
    (if (nostr/valid-unsigned-nostr-event? unsignedEvent)
      (p/let [_ (js/console.log (clj->js unsignedEvent))
-             signedEvent (.nostr.signEvent js/window (clj->js unsignedEvent))
+             _ (js/console.log (nostr/sk-as-hex sk))
+             signedEvent (if (nil? sk)
+                           (.nostr.signEvent js/window (clj->js unsignedEvent))
+                           (nostr/finalize-event unsignedEvent sk))
              _ (js/console.log "Signed event: " (clj->js signedEvent))]
        (re-frame/dispatch [::send-to-relays signedEvent]))
      (.error js/console "Event is not a valid nostr event: " (clj->js unsignedEvent)))))
@@ -236,6 +238,16 @@
  (fn [cofx _data] ;; _data unused
    (assoc cofx :now (quot (.now js/Date) 1000))))
 
+(re-frame/reg-cofx
+ :sk
+ (fn [cofx _]
+   (assoc cofx :sk (:sk cofx))))
+
+(re-frame/reg-cofx
+ :pk
+ (fn [cofx _]
+   (assoc cofx :pk (:pk cofx))))
+
 (defn convert-amb-to-nostr-event
   [json-string created_at]
   (let [parsed-json (js->clj (js/JSON.parse json-string) :keywordize-keys true)
@@ -258,7 +270,7 @@
  [(re-frame/inject-cofx  :now)]
  (fn-traced [cofx [_ json-string]]
             (let [event (convert-amb-to-nostr-event json-string (:now cofx))]
-              {::sign-and-publish-event event})))
+              {::sign-and-publish-event [event (-> cofx :db :sk)]})))
 
 (re-frame/reg-event-fx
  ::toggle-selected-events
@@ -294,7 +306,7 @@
                 :created_at (:now cofx)
                 :content ""
                 :tags new-tags}]
-     {::sign-and-publish-event event})))
+     {::sign-and-publish-event [event (:sk cofx)]})))
 
 (re-frame/reg-event-fx
  ::add-metadata-events-to-lists
@@ -366,7 +378,7 @@
                             :created_at (:now cofx)
                             :content ""
                             :tags tags}]
-     {::sign-and-publish-event create-list-event})))
+     {::sign-and-publish-event [create-list-event (:sk cofx)]})))
 
 (re-frame/reg-event-fx
  ::delete-list
@@ -382,7 +394,7 @@
                                   ["a" (str (:kind l) ":" (:pubkey l) ":" (second (first (filter
                                                                                           #(= "d" (first %))
                                                                                           (:tags l)))))])]}]
-     {::sign-and-publish-event deletion-event})))
+     {::sign-and-publish-event [deletion-event (:sk cofx)]})))
 
 (re-frame/reg-event-db
  ::toggle-show-lists-modal
@@ -412,7 +424,7 @@
                 :created_at (:now cofx)
                 :content ""
                 :tags filtered-tags}]
-     {::sign-and-publish-event event})))
+     {::sign-and-publish-event [event (:sk cofx)]})))
 
 (re-frame/reg-event-db
  ::create-sk
@@ -437,11 +449,8 @@
    {::get-amb-json-from-uri uri}))
 
 (re-frame/reg-event-fx
-  ::add-confetti
-  (fn [_ _]
-    ;; Initialize jsConfetti instance if needed
-    (let [confetti-instance (new jsConfetti)]
-      ;; Trigger the confetti
-      (.addConfetti confetti-instance ))
-    ;; No further effects needed
-    {}))
+ ::add-confetti
+ (fn [_ _]
+   (let [confetti-instance (new jsConfetti)]
+     (.addConfetti confetti-instance))
+   {}))
diff --git a/src/ied/nostr.cljs b/src/ied/nostr.cljs
index 4985da2..558f25b 100644
--- a/src/ied/nostr.cljs
+++ b/src/ied/nostr.cljs
@@ -34,10 +34,11 @@
           hashArray (.from js/Array (new js/Uint8Array hash))
           byteArray (js/Uint8Array. hashArray)
           hexArray (byte-array-to-hex byteArray)]
+    (.log js/console hexArray)
     hexArray))
 
-(defn signEvent [hashedEvent sk]
-  (.sign secp hashedEvent sk))
+(defn finalize-event [event sk]
+  (.finalizeEvent nostr (clj->js event) sk))
 
 (defn generate-sk []
   ;; Generate a secure (private) key as byte array
@@ -105,7 +106,7 @@
 
 (defn get-image-from-metadata-event [event]
   (or (let [img-url (second (first (filter #(= "image" (first %)) (:tags event))))]
-       (if (= "" img-url ) false img-url))
+        (if (= "" img-url) false img-url))
       "/assets/edu-feed-logo.webp"))
 
 (defn get-description-from-metadata-event [event]