diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-29 09:30:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-29 09:30:00 +0900 |
| commit | 1625b37b44ab658d5c7123c6fc53ef1917978637 (patch) | |
| tree | 7124486579814dbe8edf12d4b76f1315eedbf390 /src/server/api | |
| parent | 1.3.0 (diff) | |
| parent | wip (diff) | |
| download | sharkey-1625b37b44ab658d5c7123c6fc53ef1917978637.tar.gz sharkey-1625b37b44ab658d5c7123c6fc53ef1917978637.tar.bz2 sharkey-1625b37b44ab658d5c7123c6fc53ef1917978637.zip | |
Merge pull request #1559 from syuilo/visibility
Implement Visibility
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/notes/create.ts | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index af4f365226..52c6068fd0 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -3,7 +3,7 @@ */ import $ from 'cafy'; import ID from '../../../../cafy-id'; import Note, { INote, isValidText, isValidCw, pack } from '../../../../models/note'; -import { ILocalUser } from '../../../../models/user'; +import User, { ILocalUser } from '../../../../models/user'; import Channel, { IChannel } from '../../../../models/channel'; import DriveFile from '../../../../models/drive-file'; import create from '../../../../services/note/create'; @@ -14,9 +14,20 @@ import { IApp } from '../../../../models/app'; */ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => { // Get 'visibility' parameter - const [visibility = 'public', visibilityErr] = $(params.visibility).optional.string().or(['public', 'unlisted', 'private', 'direct']).get(); + const [visibility = 'public', visibilityErr] = $(params.visibility).optional.string().or(['public', 'home', 'followers', 'specified', 'private']).get(); if (visibilityErr) return rej('invalid visibility'); + // Get 'visibleUserIds' parameter + const [visibleUserIds, visibleUserIdsErr] = $(params.visibleUserIds).optional.array($().type(ID)).unique().min(1).get(); + if (visibleUserIdsErr) return rej('invalid visibleUserIds'); + + let visibleUsers = []; + if (visibleUserIds !== undefined) { + visibleUsers = await Promise.all(visibleUserIds.map(id => User.findOne({ + _id: id + }))); + } + // Get 'text' parameter const [text = null, textErr] = $(params.text).optional.nullable.string().pipe(isValidText).get(); if (textErr) return rej('invalid text'); @@ -191,6 +202,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res app, viaMobile, visibility, + visibleUsers, geo }); |