summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-05-05 09:28:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-05-05 09:28:55 +0900
commit7d64f8abe4c4b56d30eb3a0ac9ad6267fc469332 (patch)
tree99e91cb35fcb53bee4c27bad6d0a70aecd384411 /src/models
parent外部サービス連携ログインリンクにアイコン追加 (#4858) (diff)
downloadsharkey-7d64f8abe4c4b56d30eb3a0ac9ad6267fc469332.tar.gz
sharkey-7d64f8abe4c4b56d30eb3a0ac9ad6267fc469332.tar.bz2
sharkey-7d64f8abe4c4b56d30eb3a0ac9ad6267fc469332.zip
外部サービス連携後のPackedUserがその情報を持つように (#4850)
Diffstat (limited to 'src/models')
-rw-r--r--src/models/repositories/user.ts13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
index 74f2995c5f..0fafd30468 100644
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -128,6 +128,19 @@ export class UserRepository extends Repository<User> {
detail: true
}),
twoFactorEnabled: profile!.twoFactorEnabled,
+ twitter: profile!.twitter ? {
+ id: profile!.twitterUserId,
+ screenName: profile!.twitterScreenName
+ } : null,
+ github: profile!.github ? {
+ id: profile!.githubId,
+ login: profile!.githubLogin
+ } : null,
+ discord: profile!.discord ? {
+ id: profile!.discordId,
+ username: profile!.discordUsername,
+ discriminator: profile!.discordDiscriminator
+ } : null,
} : {}),
...(opts.detail && meId === user.id ? {