prioritize uuid in jwt payload

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/nostr.js b/lib/nostr.js
index e1d2f68e..d170fed3 100644
--- a/lib/nostr.js
+++ b/lib/nostr.js
@@ -161,7 +161,6 @@ pool.on("event", async (relay, sub, ev) => {
       coinos.send(ev);
     } else if (sub.includes("notes")) {
       let pubkey = sub.split(":")[0];
-      if (relay.url === config.relay) console.log(ev)
       await redis.sAdd(pubkey, ev.id);
       await redis.set(`ev:${ev.id}`, JSON.stringify(ev));
     }
diff --git a/lib/passport.js b/lib/passport.js
index 1244aab5..8b58e305 100644
--- a/lib/passport.js
+++ b/lib/passport.js
@@ -38,10 +38,10 @@ fastifyPassport.use(
         let { username, uuid } = payload;
         let where = {};
 
-        if (username)
+        if (uuid) where.uuid = uuid;
+        else if (username)
           where.username = { [Op.or]: [username, username.replace(/ /g, "")] };
 
-        if (uuid) where.uuid = uuid;
 
         let user = await db.User.findOne({
           where,
@@ -51,6 +51,7 @@ fastifyPassport.use(
         if (user.locked) throw new Error("account is locked");
         next(null, user);
       } catch (e) {
+        console.log("payload", payload)
         if (!e.message.includes("locked")) {
           console.log(e);
           err("problem logging in", e);