4 files changed, 129 insertions, 47 deletions
diff --git a/front/src/logic/api.ts b/front/src/logic/api.ts
index b8acba2..52635e5 100644
--- a/front/src/logic/api.ts
+++ b/front/src/logic/api.ts
@@ -8,7 +8,7 @@ export async function start(): Promise<Urbit> {
   const ship = await res.text();
   airlock.ship = ship.slice(1);
   airlock.our = ship;
-  airlock.desk = "nostril";
+  airlock.desk = "nostrill";
   await airlock.poke({ app: "hood", mark: "helm-hi", json: "opening airlock" });
   await airlock.eventSource();
   return airlock;
diff --git a/front/src/logic/nostril.ts b/front/src/logic/nostril.ts
deleted file mode 100644
index 4e5549d..0000000
--- a/front/src/logic/nostril.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { Event } from "@/types/nostr";
-import type { FC, FlatFeed, Poast } from "@/types/trill";
-import { engagementBunt, openLock } from "./bunts";
-export function eventsToFc(relayData: Record<string, Event[]>): FC {
-  const start = null;
-  const end = null;
-  const feed = Object.values(relayData).reduce((acc: FlatFeed, events) => {
-    const poasts = events.map(eventToPoast);
-    for (const p of poasts) {
-      if (p) acc[p.id] = p;
-    }
-    return acc;
-  }, {});
-  return { feed, start, end };
-}
-export function eventToPoast(event: Event): Poast | null {
-  if (event.kind !== 1) return null;
-  const contents = [{ paragraph: [{ text: event.content }] }];
-  const ts = event.created_at * 1000;
-  const id = `${ts}`;
-  const poast: Poast = {
-    id,
-    host: event.pubkey,
-    author: event.pubkey,
-    contents,
-    thread: id,
-    parent: null,
-    read: openLock,
-    write: openLock,
-    tags: [],
-    time: ts,
-    engagement: engagementBunt,
-    children: [],
-  };
-  return poast;
-}
diff --git a/front/src/logic/nostrill.ts b/front/src/logic/nostrill.ts
new file mode 100644
index 0000000..bf9212d
--- /dev/null
+++ b/front/src/logic/nostrill.ts
@@ -0,0 +1,118 @@
+import type { Event } from "@/types/nostr";
+import type { Content, FC, Poast } from "@/types/trill";
+import { engagementBunt, openLock } from "./bunts";
+export function eventsToFc(postEvents: Event[]): FC {
+  const fc = postEvents.reduce(
+    (acc: FC, event: Event) => {
+      const p = eventToPoast(event);
+      if (!p) return acc;
+      acc.feed[p.id] = p;
+      if (!acc.start || event.created_at < Number(acc.start)) acc.start = p.id;
+      if (!acc.end || event.created_at > Number(acc.end)) acc.end = p.id;
+      return acc;
+    },
+    { feed: {}, start: null, end: null } as FC,
+  );
+  return fc;
+}
+export function eventToPoast(event: Event): Poast | null {
+  if (event.kind !== 1) return null;
+  const contents: Content = [{ paragraph: [{ text: event.content }] }];
+  const ts = event.created_at * 1000;
+  const id = `${ts}`;
+  const poast: Poast = {
+    id,
+    host: event.pubkey,
+    author: event.pubkey,
+    contents,
+    thread: id,
+    parent: null,
+    read: openLock,
+    write: openLock,
+    tags: [],
+    time: ts,
+    engagement: engagementBunt,
+    children: [],
+  };
+  for (const tag of event.tags) {
+    const f = tag[0];
+    if (!f) continue;
+    const ff = f.toLowerCase();
+    console.log("tag", ff);
+    if (ff === "e") {
+      const [, eventId, _relayURL, marker, _pubkey, ..._] = tag;
+      // TODO
+      if (marker === "root") poast.thread = eventId;
+      else if (marker === "reply") poast.parent = eventId;
+    }
+    //
+    if (ff === "r")
+      contents.push({
+        paragraph: [{ link: { show: tag[1]!, href: tag[1]! } }],
+      });
+    if (ff === "p")
+      contents.push({
+        paragraph: [{ ship: tag[1]! }],
+      });
+    if (ff === "q")
+      contents.push({
+        ref: {
+          type: "nostr",
+          ship: tag[1]!,
+          path: tag[2] || "" + `/${tag[3] || ""}`,
+        },
+      });
+  }
+  return poast;
+}
+
+// NOTE common tags:
+// imeta
+// client
+// nonce
+// proxy
+
+// export function parseEventTags(event: Event) {
+//   const effects: any[] = [];
+//   for (const tag of event.tags) {
+//     const f = tag[0];
+//     if (!f) continue;
+//     const ff = f.toLowerCase();
+//     switch (ff) {
+//       case "p": {
+//         const [, pubkey, relayURL, ..._] = tag;
+//         // people mention
+//         break;
+//       }
+//       case "e": {
+//         // marker to be "root" or "reply"
+//         // event mention
+//         break;
+//       }
+//       case "q": {
+//         const [, eventId, relayURL, pubkey, ..._] = tag;
+//         // event mention
+//         break;
+//       }
+//       case "t": {
+//         const [, hashtag, ..._] = tag;
+//         // event mention
+//         break;
+//       }
+//       case "r": {
+//         const [, url, ..._] = tag;
+//         // event mention
+//         break;
+//       }
+//       case "alt": {
+//         const [, summary, ..._] = tag;
+//         // event mention
+//         break;
+//       }
+//       default: {
+//         break;
+//       }
+//     }
+//   }
+//   return effects;
+// }
diff --git a/front/src/logic/requests/nostril.ts b/front/src/logic/requests/nostrill.ts
index 6f0edcf..6334c34 100644
--- a/front/src/logic/requests/nostril.ts
+++ b/front/src/logic/requests/nostrill.ts
@@ -1,8 +1,8 @@
 import type Urbit from "urbit-api";
-import type { Cursor, PostID, SentPoast } from "@/types/trill";
+import type { Cursor, PostID } from "@/types/trill";
 import type { Ship } from "@/types/urbit";
 import { FeedPostCount } from "../constants";
-import type { UserProfile } from "@/types/nostril";
+import type { UserProfile } from "@/types/nostrill";
 
 // Subscribe
 type Handler = (date: any) => void;
@@ -12,24 +12,24 @@ export default class IO {
     this.airlock = airlock;
   }
   private async poke(json: any) {
-    return this.airlock.poke({ app: "nostril", mark: "json", json });
+    return this.airlock.poke({ app: "nostrill", mark: "json", json });
   }
   private async scry(path: string) {
-    return this.airlock.scry({ app: "nostril", path });
+    return this.airlock.scry({ app: "nostrill", path });
   }
   private async sub(path: string, handler: Handler) {
     const err = (err: any, _id: string) =>
-      console.log(err, "error on nostril subscription");
+      console.log(err, "error on nostrill subscription");
     const quit = (data: any) =>
-      console.log(data, "nostril subscription kicked");
+      console.log(data, "nostrill subscription kicked");
     const res = await this.airlock.subscribe({
-      app: "nostril",
+      app: "nostrill",
       path,
       event: handler,
       err,
       quit,
     });
-    console.log(res, "subscribed to nostril agent");
+    console.log(res, "subscribed to nostrill agent");
   }
   async unsub(sub: number) {
     return await this.airlock.unsubscribe(sub);
@@ -65,8 +65,8 @@ export default class IO {
   async pokeAlive() {
     return await this.poke({ alive: true });
   }
-  async addPost(pubkey: string, content: string) {
-    const json = { add: { pubkey, content } };
+  async addPost(content: string) {
+    const json = { add: { content } };
     return this.poke({ post: json });
   }
   // async addPost(post: SentPoast, gossip: boolean) {