summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/messaging
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/messaging
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/messaging')
-rw-r--r--src/server/api/endpoints/messaging/history.ts10
-rw-r--r--src/server/api/endpoints/messaging/messages.ts10
-rw-r--r--src/server/api/endpoints/messaging/messages/create.ts5
3 files changed, 18 insertions, 7 deletions
diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts
index c2d746e481..27e38bbdec 100644
--- a/src/server/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
@@ -3,6 +3,7 @@ import define from '../../define';
import { MessagingMessage } from '../../../../models/entities/messaging-message';
import { MessagingMessages, Mutings } from '../../../../models';
import { Brackets } from 'typeorm';
+import { types, bool } from '../../../../misc/schema';
export const meta = {
desc: {
@@ -24,10 +25,13 @@ export const meta = {
},
res: {
- type: 'array',
+ type: types.array,
+ optional: bool.false, nullable: bool.false,
items: {
- type: 'MessagingMessage',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'MessagingMessage',
+ }
},
};
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index add21e5f19..0d5295bff3 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -6,6 +6,7 @@ import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
import { MessagingMessages } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
+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: 'MessagingMessage',
- },
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'MessagingMessage',
+ }
},
errors: {
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index 30ac0849a3..388852b9cd 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -9,6 +9,7 @@ import { getUser } from '../../../common/getters';
import { MessagingMessages, DriveFiles, Mutings } from '../../../../../models';
import { MessagingMessage } from '../../../../../models/entities/messaging-message';
import { genId } from '../../../../../misc/gen-id';
+import { types, bool } from '../../../../../misc/schema';
export const meta = {
desc: {
@@ -41,7 +42,9 @@ export const meta = {
},
res: {
- type: 'MessagingMessage',
+ type: types.object,
+ optional: bool.false, nullable: bool.false,
+ ref: 'MessagingMessage',
},
errors: {