summaryrefslogtreecommitdiff
path: root/src/api/serializers
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-09-16 17:31:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-09-16 17:31:41 +0900
commit588f35a16a706b77da2d5f7896e7174463677bb0 (patch)
tree4c2d383f3788154b51e416af6caf7ddf5b6a1ccf /src/api/serializers
parentRefactoring (diff)
parenttypo (diff)
downloadmisskey-588f35a16a706b77da2d5f7896e7174463677bb0.tar.gz
misskey-588f35a16a706b77da2d5f7896e7174463677bb0.tar.bz2
misskey-588f35a16a706b77da2d5f7896e7174463677bb0.zip
Merge branch 'master' of https://github.com/syuilo/misskey
Diffstat (limited to 'src/api/serializers')
-rw-r--r--src/api/serializers/user.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index 57599fe85c..23a176096a 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -37,7 +37,9 @@ export default (
data: false
} : {
data: false,
- profile: false
+ profile: false,
+ keywords: false,
+ domains: false
};
// Populate the user if 'user' is ID
@@ -119,6 +121,7 @@ export default (
if (opts.detail) {
if (_user.pinned_post_id) {
+ // Populate pinned post
_user.pinned_post = await serializePost(_user.pinned_post_id, meId, {
detail: true
});