public fields

3 files changed, 12 insertions, 35 deletions

diff --git a/lib/utils.ts b/lib/utils.ts
index 9cb6a690..fc0ee176 100644
--- a/lib/utils.ts
+++ b/lib/utils.ts
@@ -51,25 +51,7 @@ export const bip21 = (address, { amount, memo, tip, type }) => {
   return `${network}:${address}?${url.toString()}`;
 };
 
-export const fields = [
-  "pubkey",
-  "password",
-  "username",
-  "currency",
-  "currencies",
-  "fiat",
-  "otpsecret",
-  "balance",
-  "ip",
-  "pin",
-  "display",
-  "haspin",
-  "profile",
-  "prompt",
-  "banner",
-];
-
-export const getUser = async (username, fields = whitelist) => {
+export const getUser = async (username, fields) => {
   let update;
   if (username === "undefined") fail("invalid user");
   const user = await migrate(username);
@@ -97,7 +79,7 @@ export const getUser = async (username, fields = whitelist) => {
 
   if (update) s(`user:${user.id}`, user);
 
-  return user;
+  return fields ? pick(user, fields) : user;
 };
 
 export const getInvoice = async (hash) => {
@@ -208,7 +190,7 @@ export const fmt = (sats) =>
 
 export const link = (id) => `${URL}/payment/${id}`;
 
-export const publicFields = [
+export const fields = [
   "about",
   "anon",
   "banner",
diff --git a/routes/nostr.ts b/routes/nostr.ts
index 6c252927..ae2be7e9 100644
--- a/routes/nostr.ts
+++ b/routes/nostr.ts
@@ -1,21 +1,18 @@
 import config from "$config";
-import { db, g, s } from "$lib/db";
+import { db, g } from "$lib/db";
 import {
   anon,
   getCount,
   getProfile,
   getRelays,
-  pool,
   send,
   serverPubkey,
 } from "$lib/nostr";
-import { count, scan } from "$lib/strfry";
-import { bail, fail, getUser, publicFields } from "$lib/utils";
+import { scan } from "$lib/strfry";
+import { bail, fail, fields, getUser } from "$lib/utils";
 import { decode } from "nostr-tools/nip19";
 import type { ProfilePointer } from "nostr-tools/nip19";
 
-const opts = { maxWait: 2000 };
-
 export default {
   async event(req, res) {
     const {
@@ -78,7 +75,7 @@ export default {
         const profiles = await scan({ authors: pubkeys, kinds: [0] });
         for (const p of profiles) {
           const { content, pubkey } = p;
-          let user = await getUser(pubkey, publicFields);
+          let user = await getUser(pubkey, fields);
           user = { ...user, ...JSON.parse(content) };
           user.pubkey = pubkey;
           follows.push(user);
@@ -89,8 +86,7 @@ export default {
           pubkeys
             .filter((p) => !keys.includes(p))
             .map(
-              async (pubkey) =>
-                (await getUser(pubkey, publicFields)) || anon(pubkey),
+              async (pubkey) => (await getUser(pubkey, fields)) || anon(pubkey),
             ),
         );
 
@@ -120,7 +116,7 @@ export default {
       const profiles = await scan({ authors: pubkeys, kinds: [0] });
       for (const p of profiles) {
         const { content, pubkey } = p;
-        let user = await getUser(pubkey, publicFields);
+        let user = await getUser(pubkey, fields);
         user = { ...user, ...JSON.parse(content) };
         user.pubkey = pubkey;
         followers.push(user);
@@ -131,8 +127,7 @@ export default {
         pubkeys
           .filter((p) => !keys.includes(p))
           .map(
-            async (pubkey) =>
-              (await getUser(pubkey, publicFields)) || anon(pubkey),
+            async (pubkey) => (await getUser(pubkey, fields)) || anon(pubkey),
           ),
       );
 
diff --git a/routes/users.ts b/routes/users.ts
index dc3636e8..1da397ca 100644
--- a/routes/users.ts
+++ b/routes/users.ts
@@ -10,7 +10,7 @@ import { reconcile, types } from "$lib/payments";
 import register from "$lib/register";
 import { emit } from "$lib/sockets";
 import upload from "$lib/upload";
-import { bail, fail, publicFields, getUser, pick } from "$lib/utils";
+import { bail, fail, fields, getUser, pick } from "$lib/utils";
 import whitelist from "$lib/whitelist";
 import rpc from "@coinos/rpc";
 import { bytesToHex, randomBytes } from "@noble/hashes/utils";
@@ -117,7 +117,7 @@ export default {
       if (user.pubkey) user.npub = nip19.npubEncode(user.pubkey);
       user.prompt = !!user.prompt;
 
-      res.send(pick(user, publicFields));
+      res.send(pick(user, fields));
     } catch (e) {
       err("problem getting user", e.message);
       res.code(500).send(e.message);