Merge branch 'master' of https://github.com/coinos/coinos-server into notifications

1 files changed, 29 insertions, 13 deletions

diff --git a/lib/nostr.js b/lib/nostr.js
index 065fafb0..604d207d 100644
--- a/lib/nostr.js
+++ b/lib/nostr.js
@@ -1,16 +1,17 @@
 import config from "$config";
 import { Relay, RelayPool } from "nostr";
-import { broadcast } from "$lib/sockets";
+import { broadcast, emit } from "$lib/sockets";
 import store from "$lib/store";
 import { g, s, db } from "$lib/db";
 import { nada, wait } from "$lib/utils";
 
+export let coinos;
 export let pool;
 
 export let fillPool = () => {
   pool = RelayPool(config.relays);
   pool.on("open", relay => {
-    if (relay.url.includes(config.relay)) coinos = relay;
+    if (relay.url.includes(config.nostr)) coinos = relay;
     relay.subscribe("live", { limit: 1 });
   });
 
@@ -39,6 +40,13 @@ export let fillPool = () => {
           // coinos.send(["EVENT", ev]);
           ev.user = await getUser(pubkey);
           // broadcast("event", ev);
+
+          if (ev.kind === 4) {
+            let uid = await g(`user:${ev.tags[0][1]}`);
+            if (uid) ev.recipient = await g(`user:${uid}`);
+            ev.author = ev.user;
+            emit(uid, "event", ev);
+          }
         }
       } else if (sub.includes("profile")) {
         let { pubkey } = ev;
@@ -59,9 +67,13 @@ export let fillPool = () => {
 
         await s(`user:${pubkey}`, JSON.stringify(user));
         coinos.send(ev);
+      } else if (sub.includes("messages")) {
+        let pubkey = sub.split(":")[0];
+        await db.sAdd(`${pubkey}:messages`, ev.id);
+        await s(`ev:${ev.id}`, ev);
       } else if (sub.includes("follows")) {
         let pubkey = sub.split(":")[0];
-        await s(`${pubkey}:follows`, JSON.stringify(ev.tags));
+        await s(`${pubkey}:follows`, ev.tags);
         for (let f of ev.tags) {
           let [_, followPubkey] = f;
           await db.sAdd(`${followPubkey}:followers`, pubkey);
@@ -75,7 +87,7 @@ export let fillPool = () => {
       } else if (sub.includes("notes")) {
         let pubkey = sub.split(":")[0];
         await db.sAdd(pubkey, ev.id);
-        await s(`ev:${ev.id}`, JSON.stringify(ev));
+        await s(`ev:${ev.id}`, ev);
       }
     } catch (e) {
       console.log(e);
@@ -83,7 +95,6 @@ export let fillPool = () => {
   });
 };
 
-export let coinos;
 let now = () => Math.round(Date.now() / 1000);
 
 let timeouts = {};
@@ -96,8 +107,8 @@ export let q = async (
     let start = Date.now();
     let seen = [];
     let rejected;
-    query.since = await g(`since:${sub}`);
-    if (now() - query.since < since) return r();
+    // query.since = await g(`since:${sub}`);
+    // if (now() - query.since < since) return r();
 
     let done = { [sub]: [] };
 
@@ -156,9 +167,14 @@ export let q = async (
 
 let seen = [];
 
-let getUser = async pubkey =>
-  JSON.parse(await g(`user:${pubkey}`)) || {
-    username: pubkey.substr(0, 6),
-    pubkey,
-    anon: true
-  };
+let getUser = async pubkey => {
+  let id = await g(`user:${pubkey}`);
+  let user = await g(`user:${id}`);
+  return (
+    user || {
+      username: pubkey.substr(0, 6),
+      pubkey,
+      anon: true
+    }
+  );
+};