summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/users
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-23 22:35:26 +0900
committerGitHub <noreply@github.com>2019-04-23 22:35:26 +0900
commit0463c6bb0f8fd32740ceb61ccce04c662272a618 (patch)
treea28cbdf6c9cdc14648b8c0e46248665a3ad7e5af /src/server/api/endpoints/users
parentFix #4768 (diff)
downloadsharkey-0463c6bb0f8fd32740ceb61ccce04c662272a618.tar.gz
sharkey-0463c6bb0f8fd32740ceb61ccce04c662272a618.tar.bz2
sharkey-0463c6bb0f8fd32740ceb61ccce04c662272a618.zip
Refactor API (#4770)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update description.ts * wip
Diffstat (limited to 'src/server/api/endpoints/users')
-rw-r--r--src/server/api/endpoints/users/followers.ts10
-rw-r--r--src/server/api/endpoints/users/following.ts10
-rw-r--r--src/server/api/endpoints/users/get-frequently-replied-users.ts8
-rw-r--r--src/server/api/endpoints/users/lists/create.ts13
-rw-r--r--src/server/api/endpoints/users/lists/list.ts10
-rw-r--r--src/server/api/endpoints/users/lists/show.ts5
-rw-r--r--src/server/api/endpoints/users/notes.ts10
-rw-r--r--src/server/api/endpoints/users/recommendation.ts8
-rw-r--r--src/server/api/endpoints/users/search.ts8
-rw-r--r--src/server/api/endpoints/users/show.ts5
10 files changed, 64 insertions, 23 deletions
diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts
index 0cb68353ca..465b71e2e6 100644
--- a/src/server/api/endpoints/users/followers.ts
+++ b/src/server/api/endpoints/users/followers.ts
@@ -5,6 +5,7 @@ import { ApiError } from '../../error';
import { Users, Followings } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { toPunyNullable } from '../../../../misc/convert-host';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -48,10 +49,13 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'Following',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'Following',
+ }
},
errors: {
diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts
index 2e273dc0c2..2a7748ac64 100644
--- a/src/server/api/endpoints/users/following.ts
+++ b/src/server/api/endpoints/users/following.ts
@@ -5,6 +5,7 @@ import { ApiError } from '../../error';
import { Users, Followings } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { toPunyNullable } from '../../../../misc/convert-host';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -48,10 +49,13 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'Following',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'Following',
+ }
},
errors: {
diff --git a/src/server/api/endpoints/users/get-frequently-replied-users.ts b/src/server/api/endpoints/users/get-frequently-replied-users.ts
index a1d140c6c9..420936c089 100644
--- a/src/server/api/endpoints/users/get-frequently-replied-users.ts
+++ b/src/server/api/endpoints/users/get-frequently-replied-users.ts
@@ -6,6 +6,7 @@ import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
import { Not, In } from 'typeorm';
import { Notes, Users } from '../../../../models';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
tags: ['users'],
@@ -28,9 +29,12 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'User',
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'User',
}
},
diff --git a/src/server/api/endpoints/users/lists/create.ts b/src/server/api/endpoints/users/lists/create.ts
index 21dc6d331d..79efffbf9e 100644
--- a/src/server/api/endpoints/users/lists/create.ts
+++ b/src/server/api/endpoints/users/lists/create.ts
@@ -3,6 +3,7 @@ import define from '../../../define';
import { UserLists } from '../../../../../models';
import { genId } from '../../../../../misc/gen-id';
import { UserList } from '../../../../../models/entities/user-list';
+import { types, bool } from '../../../../../misc/schema';
export const meta = {
desc: {
@@ -17,10 +18,16 @@ export const meta = {
kind: 'write:account',
params: {
- title: {
+ name: {
validator: $.str.range(1, 100)
}
- }
+ },
+
+ res: {
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'UserList',
+ },
};
export default define(meta, async (ps, user) => {
@@ -28,7 +35,7 @@ export default define(meta, async (ps, user) => {
id: genId(),
createdAt: new Date(),
userId: user.id,
- name: ps.title,
+ name: ps.name,
} as UserList);
return await UserLists.pack(userList);
diff --git a/src/server/api/endpoints/users/lists/list.ts b/src/server/api/endpoints/users/lists/list.ts
index b05fc45527..684086b5c6 100644
--- a/src/server/api/endpoints/users/lists/list.ts
+++ b/src/server/api/endpoints/users/lists/list.ts
@@ -1,5 +1,6 @@
import define from '../../../define';
import { UserLists } from '../../../../../models';
+import { types, bool } from '../../../../../misc/schema';
export const meta = {
desc: {
@@ -13,10 +14,13 @@ export const meta = {
kind: 'read:account',
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'UserList',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'UserList',
+ }
},
};
diff --git a/src/server/api/endpoints/users/lists/show.ts b/src/server/api/endpoints/users/lists/show.ts
index 1a997ec7c5..395f9352d4 100644
--- a/src/server/api/endpoints/users/lists/show.ts
+++ b/src/server/api/endpoints/users/lists/show.ts
@@ -3,6 +3,7 @@ import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
import { ApiError } from '../../../error';
import { UserLists } from '../../../../../models';
+import { types, bool } from '../../../../../misc/schema';
export const meta = {
desc: {
@@ -23,7 +24,9 @@ export const meta = {
},
res: {
- type: 'UserList'
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'UserList',
},
errors: {
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index 4691a99394..fdc50e4dae 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -8,6 +8,7 @@ import { generateVisibilityQuery } from '../../common/generate-visibility-query'
import { Notes } from '../../../../models';
import { generateMuteQuery } from '../../common/generate-mute-query';
import { Brackets } from 'typeorm';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -119,10 +120,13 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'Note',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'Note',
+ }
},
errors: {
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 9e16e34e39..67b646a35f 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -3,6 +3,7 @@ import $ from 'cafy';
import define from '../../define';
import { Users, Followings } from '../../../../models';
import { generateMuteQueryForUsers } from '../../common/generate-mute-query';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -28,9 +29,12 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'User',
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'User',
}
},
};
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 96da221d97..2809465fd7 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -2,6 +2,7 @@ import $ from 'cafy';
import define from '../../define';
import { Users } from '../../../../models';
import { User } from '../../../../models/entities/user';
+import { bool, types } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -54,9 +55,12 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'User',
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'User',
}
},
};
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index a401166c55..820c44e81b 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -6,6 +6,7 @@ import { ApiError } from '../../error';
import { ID } from '../../../../misc/cafy-id';
import { Users } from '../../../../models';
import { In } from 'typeorm';
+import { bool, types } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -42,7 +43,9 @@ export const meta = {
},
res: {
- type: 'User',
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'User',
},
errors: {