Merge branch 'main' of github.com:Trustroots/nostr-map

src/map.ts

@@ -161,18 +161,6 @@ function generateDatetimeFromNote(note: Note): string {
   const date = new Date(createdAt * 1000);
 
   return date.toLocaleString();
-
-  const month = ("0" + (date.getMonth() + 1)).slice(-2); // Months are zero-based, so add 1
-  const day = ("0" + date.getDate()).slice(-2);
-
-  // Extract the time components
-  const hours = ("0" + date.getHours()).slice(-2);
-  const minutes = ("0" + date.getMinutes()).slice(-2);
-
-  // Format the date and time strings
-  const datetime = `${hours}:${minutes} ${day}-${month}`;
-
-  return datetime;
 }
 
 function generateLinkFromNote(note: Note): string {
@@ -320,11 +308,9 @@ function createPopupHtml(createNoteCallback) {
   submitButton.onclick = () => {
     const content = contentTextArea.value;
     const expirationTime = parseInt(expirationSelect.value) || null;
-    console.log("time", expirationTime);
     const expirationDate = expirationTime
       ? Math.floor(Date.now() / 1000 + expirationTime)
       : null;
-    console.log("expiration date", expirationDate), expirationTime;
     createNoteCallback(content, expirationDate);
     map.closePopup();
   };

src/nostr/relays.ts

@@ -102,7 +102,7 @@ export const _publish = async (event: NostrEvent): Promise<void> => {
 
 type SubscribeParams = {
   filters: Filter[];
-  onEvent: (event: nostrify.NostrEvent) => void;
+  onEvent: (event: NostrEvent) => void;
 };
 export const _query = async ({
   filters,

src/nostr/subscribe.ts

@@ -119,9 +119,9 @@ export const subscribe = async ({
     : eventsBaseFilter;
   const eventsFilterWithLimit = { ...eventsFilter, limit };
 
-  const noteEventsQueue: nostrify.NostrEvent[] = [];
+  const noteEventsQueue: NostrEvent[] = [];
 
-  const onNoteEvent = (event: nostrify.NostrEvent) => {
+  const onNoteEvent = (event: NostrEvent) => {
     // if (isDev()) console.log("#gITVd2 gotNoteEvent", event);
 
     if (

src/nostr/utils.ts

@@ -54,7 +54,7 @@ export const filterForTag = (key: string) => (tags: string[]) =>
 
 type GetTagFirstValueFromEventParams = {
   /** The event to extract the tag value from */
-  event: nostrify.NostrEvent;
+  event: NostrEvent;
   /** The name (key) of the tag to get the value of */
   tag: string;
 };

src/types.ts

@@ -1,10 +1,13 @@
-import { Event } from "nostr-tools";
+import * as nostrify from "@nostrify/nostrify";
 
 export type MaybeLocalStorage = Partial<WindowLocalStorage>;
 
-export type NostrEvent = Required<Event>;
+export type NostrEvent = nostrify.NostrEvent;
 
-export type UnsignedEvent = Omit<Event, "created_at" | "pubkey">;
+export type UnsignedEvent = Omit<
+  NostrEvent,
+  "created_at" | "pubkey" | "id" | "sig"
+>;
 
 export type Note = {
   id: string;