summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-03-29 21:44:39 +0900
committerGitHub <noreply@github.com>2018-03-29 21:44:39 +0900
commit78f7464891306d77e032e95d80278652c9121c8f (patch)
treede58f1014bc0d99d9e8993695c4aa2bd74e1983d /src/server/api/endpoints/users
parentUpdate show.ts (diff)
downloadsharkey-78f7464891306d77e032e95d80278652c9121c8f.tar.gz
sharkey-78f7464891306d77e032e95d80278652c9121c8f.tar.bz2
sharkey-78f7464891306d77e032e95d80278652c9121c8f.zip
Update show.ts
Diffstat (limited to 'src/server/api/endpoints/users')
-rw-r--r--src/server/api/endpoints/users/show.ts18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 1e488dd359..fb6996e2ea 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -75,18 +75,17 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
// Lookup user
if (typeof host === 'string') {
const usernameLower = username.toLowerCase();
- const hostLower_ascii = toASCII(host).toLowerCase();
- const hostLower = toUnicode(hostLower_ascii);
+ const hostLowerAscii = toASCII(host).toLowerCase();
+ const hostLower = toUnicode(hostLowerAscii);
user = await findUser({ usernameLower, hostLower });
if (user === null) {
- const acct_lower = `${usernameLower}@${hostLower_ascii}`;
+ const acctLower = `${usernameLower}@${hostLowerAscii}`;
let activityStreams;
let finger;
let followersCount;
let followingCount;
- let likes_count;
let postsCount;
if (!validateUsername(username)) {
@@ -94,7 +93,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
}
try {
- finger = await webFingerAndVerify(acct_lower, acct_lower);
+ finger = await webFingerAndVerify(acctLower, acctLower);
} catch (exception) {
return rej('WebFinger lookup failed');
}
@@ -130,12 +129,11 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
}
try {
- [followersCount, followingCount, likes_count, postsCount] = await Promise.all([
+ [followersCount, followingCount, postsCount] = await Promise.all([
getCollectionCount(activityStreams.followers),
getCollectionCount(activityStreams.following),
- getCollectionCount(activityStreams.liked),
getCollectionCount(activityStreams.outbox),
- webFingerAndVerify(activityStreams.id, acct_lower),
+ webFingerAndVerify(activityStreams.id, acctLower),
]);
} catch (exception) {
return rej('failed to fetch assets');
@@ -153,10 +151,8 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
followingCount,
name: activityStreams.name,
postsCount,
- likes_count,
- liked_count: 0,
driveCapacity: 1024 * 1024 * 8, // 8MiB
- username: username,
+ username,
usernameLower,
host: toUnicode(finger.subject.replace(/^.*?@/, '')),
hostLower,