aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/utils.js6
-rw-r--r--routes/users.js10
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/utils.js b/lib/utils.js
index 6a4bc1b2..17283836 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -65,10 +65,11 @@ export const getUser = async (username, transaction) => {
});
await wait(() => !store.fetching[pubkey], 100, 10);
- user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
- user.followers = await redis.sMembers(`${pubkey}:followers`);
}
+ user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
+ user.followers = await redis.sMembers(`${pubkey}:followers`);
+
return user;
};
@@ -203,4 +204,3 @@ export const derivePayRequest = async ({ amount, memo, tip }) => {
await ln.invoice(value ? `${value}sat` : "any", new Date(), memo, 360)
).bolt11;
};
-
diff --git a/routes/users.js b/routes/users.js
index a276fd4e..7a01f25e 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -64,10 +64,11 @@ app.get("/me", auth, async (req, res) => {
});
await wait(() => !store.fetching[pubkey], 100, 10);
- user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
- user.followers = await redis.sMembers(`${pubkey}:followers`);
}
+ user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
+ user.followers = await redis.sMembers(`${pubkey}:followers`);
+
user.accounts = await req.user.getAccounts();
user.payments = payments;
user.haspin = !!user.pin;
@@ -117,10 +118,11 @@ app.get("/users/:username", async (req, res) => {
});
await wait(() => !store.fetching[pubkey], 100, 10);
- user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
- user.followers = await redis.sMembers(`${pubkey}:followers`);
}
+ user.follows = JSON.parse(await redis.get(`${pubkey}:follows`)) || [];
+ user.followers = await redis.sMembers(`${pubkey}:followers`);
+
res.send(user);
} catch (e) {
res.code(500).send(e.message);