diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-08-10 10:38:00 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-08-10 10:38:00 +0900 |
| commit | dc51eef27c97798bfa3fed62c0d4013a5efbd3f8 (patch) | |
| tree | 5515abf36a63e31a07a7a5f2812bda986cdae4aa | |
| parent | chore(client): Design tweaks (diff) | |
| parent | Dockerのビルド時にgitを入れるように (#6639) (diff) | |
| download | sharkey-dc51eef27c97798bfa3fed62c0d4013a5efbd3f8.tar.gz sharkey-dc51eef27c97798bfa3fed62c0d4013a5efbd3f8.tar.bz2 sharkey-dc51eef27c97798bfa3fed62c0d4013a5efbd3f8.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | src/server/api/endpoints/admin/show-user.ts | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 7b159efe09..9eb69e2302 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN apk add --no-cache \ autoconf \ automake \ file \ + git \ g++ \ gcc \ libc-dev \ diff --git a/src/server/api/endpoints/admin/show-user.ts b/src/server/api/endpoints/admin/show-user.ts index 81a311b725..ea4df141f3 100644 --- a/src/server/api/endpoints/admin/show-user.ts +++ b/src/server/api/endpoints/admin/show-user.ts @@ -35,5 +35,8 @@ export default define(meta, async (ps, me) => { throw new Error('cannot show info of admin'); } - return user; + return { + ...user, + token: user.token != null ? '<MASKED>' : user.token, + }; }); |