diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-06-02 00:15:17 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-06-02 00:15:17 +0900 |
| commit | 484d17f53f26ff3e8961d86f03ef94f62f8f62ed (patch) | |
| tree | 5d010a52387c3bedf69bdee4ab872c39c25e5bd0 /src/server/api | |
| parent | Merge branch 'master' into locked-account (diff) | |
| download | sharkey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.tar.gz sharkey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.tar.bz2 sharkey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.zip | |
wip
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/following/requests/accept.ts (renamed from src/server/api/endpoints/following/request/accept.ts) | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/following/requests/reject.ts (renamed from src/server/api/endpoints/following/request/reject.ts) | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts index bd8f30b38f..ad51a249bf 100644 --- a/src/server/api/endpoints.ts +++ b/src/server/api/endpoints.ts @@ -449,12 +449,12 @@ const endpoints: Endpoint[] = [ kind: 'following-write' }, { - name: 'following/request/accept', + name: 'following/requests/accept', withCredential: true, kind: 'following-write' }, { - name: 'following/request/reject', + name: 'following/requests/reject', withCredential: true, kind: 'following-write' }, diff --git a/src/server/api/endpoints/following/request/accept.ts b/src/server/api/endpoints/following/requests/accept.ts index bf0aff4b77..f8df3b7850 100644 --- a/src/server/api/endpoints/following/request/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -1,5 +1,5 @@ import $ from 'cafy'; import ID from '../../../../../cafy-id'; -import acceptFollowRequest from '../../../../../services/user/accept-follow-request'; +import acceptFollowRequest from '../../../../../services/following/requests/accept'; import User from '../../../../../models/user'; /** diff --git a/src/server/api/endpoints/following/request/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index 5a995e1962..4900127a57 100644 --- a/src/server/api/endpoints/following/request/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -1,5 +1,5 @@ import $ from 'cafy'; import ID from '../../../../../cafy-id'; -import rejectFollowRequest from '../../../../../services/user/reject-follow-request'; +import rejectFollowRequest from '../../../../../services/following/requests/reject'; import User from '../../../../../models/user'; /** diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 103cd3ac36..8ee3c84861 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -5,7 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; import event from '../../../../publishers/stream'; import DriveFile from '../../../../models/drive-file'; -import acceptAllFollowRequests from '../../../../services/user/accept-all-follow-requests'; +import acceptAllFollowRequests from '../../../../services/following/requests/accept-all'; /** * Update myself |