diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-31 20:50:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 20:50:40 +0900 |
| commit | eafb0f61ef6465697a0fbd9b931fc306417cd2a1 (patch) | |
| tree | 7d6c502c1e2c61eb3327f678f766f23bda10c1e7 /src/server/api/endpoints/i | |
| parent | デフォルトでドライブ容量は128MiBにした (diff) | |
| parent | Implement remote status retrieval (diff) | |
| download | sharkey-eafb0f61ef6465697a0fbd9b931fc306417cd2a1.tar.gz sharkey-eafb0f61ef6465697a0fbd9b931fc306417cd2a1.tar.bz2 sharkey-eafb0f61ef6465697a0fbd9b931fc306417cd2a1.zip | |
Merge pull request #1341 from akihikodaki/github
Implement remote status retrieval
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/regenerate_token.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update_client_setting.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update_home.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update_mobile_home.ts | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/server/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts index c35778ac0b..0af622fd90 100644 --- a/src/server/api/endpoints/i/regenerate_token.ts +++ b/src/server/api/endpoints/i/regenerate_token.ts @@ -4,7 +4,7 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; import User from '../../../../models/user'; -import event from '../../event'; +import event from '../../../../common/event'; import generateUserToken from '../../common/generate-native-user-token'; /** diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 8e198f3ad0..b465e763e1 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; -import event from '../../event'; +import event from '../../../../common/event'; import config from '../../../../conf'; /** diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts index 03867b4017..79789e6640 100644 --- a/src/server/api/endpoints/i/update_client_setting.ts +++ b/src/server/api/endpoints/i/update_client_setting.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import User, { pack } from '../../../../models/user'; -import event from '../../event'; +import event from '../../../../common/event'; /** * Update myself diff --git a/src/server/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts index 713cf9fcc8..437f51d6fb 100644 --- a/src/server/api/endpoints/i/update_home.ts +++ b/src/server/api/endpoints/i/update_home.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import User from '../../../../models/user'; -import event from '../../event'; +import event from '../../../../common/event'; module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'home' parameter diff --git a/src/server/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts index 6f28cebf9c..783ca09d1d 100644 --- a/src/server/api/endpoints/i/update_mobile_home.ts +++ b/src/server/api/endpoints/i/update_mobile_home.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import User from '../../../../models/user'; -import event from '../../event'; +import event from '../../../../common/event'; module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'home' parameter |