diff options
Diffstat (limited to 'src/server/api/endpoints')
87 files changed, 248 insertions, 108 deletions
diff --git a/src/server/api/endpoints/admin/abuse-user-reports.ts b/src/server/api/endpoints/admin/abuse-user-reports.ts index c88174f13f..0de3d3e8fa 100644 --- a/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Report, { packMany } from '../../../../models/abuse-user-report'; import define from '../../define'; diff --git a/src/server/api/endpoints/aggregation/hashtags.ts b/src/server/api/endpoints/aggregation/hashtags.ts index 7577711b5f..13d0e1e2a6 100644 --- a/src/server/api/endpoints/aggregation/hashtags.ts +++ b/src/server/api/endpoints/aggregation/hashtags.ts @@ -29,22 +29,22 @@ export default define(meta, (ps) => new Promise(async (res, rej) => { $group: { _id: { tag: '$tagsLower', userId: '$userId' } } - }]) as Array<{ + }]) as { _id: { tag: string; userId: any; } - }>; + }[]; //#endregion if (data.length == 0) { return res([]); } - let tags: Array<{ + let tags: { name: string; count: number; - }> = []; + }[] = []; // カウント for (const x of data.map(x => x._id).filter(x => !hidedTags.includes(x.tag))) { diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts index 21e6350113..cb47b40abf 100644 --- a/src/server/api/endpoints/app/show.ts +++ b/src/server/api/endpoints/app/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import App, { pack } from '../../../../models/app'; import define from '../../define'; diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 76cec064ed..6fa7efb558 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import * as ms from 'ms'; import User, { pack } from '../../../../models/user'; import Blocking from '../../../../models/blocking'; diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts index 86360bfb35..c176da1ea8 100644 --- a/src/server/api/endpoints/blocking/delete.ts +++ b/src/server/api/endpoints/blocking/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import * as ms from 'ms'; import User, { pack } from '../../../../models/user'; import Blocking from '../../../../models/blocking'; diff --git a/src/server/api/endpoints/blocking/list.ts b/src/server/api/endpoints/blocking/list.ts index e2649573d5..0413c32b7a 100644 --- a/src/server/api/endpoints/blocking/list.ts +++ b/src/server/api/endpoints/blocking/list.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Blocking, { packMany } from '../../../../models/blocking'; import define from '../../define'; diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts index 20955e0e4e..99e5e36ef3 100644 --- a/src/server/api/endpoints/drive/files.ts +++ b/src/server/api/endpoints/drive/files.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import DriveFile, { packMany } from '../../../../models/drive-file'; import define from '../../define'; diff --git a/src/server/api/endpoints/drive/files/attached_notes.ts b/src/server/api/endpoints/drive/files/attached_notes.ts index ec5acbd751..6442b15195 100644 --- a/src/server/api/endpoints/drive/files/attached_notes.ts +++ b/src/server/api/endpoints/drive/files/attached_notes.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFile from '../../../../../models/drive-file'; import define from '../../../define'; import { packMany } from '../../../../../models/note'; diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts index 47a407eff5..eacaa3f64f 100644 --- a/src/server/api/endpoints/drive/files/create.ts +++ b/src/server/api/endpoints/drive/files/create.ts @@ -1,5 +1,6 @@ import * as ms from 'ms'; -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import { validateFileName, pack } from '../../../../../models/drive-file'; import create from '../../../../../services/drive/add-file'; import define from '../../../define'; diff --git a/src/server/api/endpoints/drive/files/delete.ts b/src/server/api/endpoints/drive/files/delete.ts index 0c2799c708..c322587d8f 100644 --- a/src/server/api/endpoints/drive/files/delete.ts +++ b/src/server/api/endpoints/drive/files/delete.ts @@ -1,7 +1,8 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFile from '../../../../../models/drive-file'; import del from '../../../../../services/drive/delete-file'; -import { publishDriveStream } from '../../../../../stream'; +import { publishDriveStream } from '../../../../../services/stream'; import define from '../../../define'; export const meta = { diff --git a/src/server/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts index 25135e83a2..691ad6123d 100644 --- a/src/server/api/endpoints/drive/files/find.ts +++ b/src/server/api/endpoints/drive/files/find.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFile, { pack } from '../../../../../models/drive-file'; import define from '../../../define'; diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts index a17ff2bf34..4db493c1d0 100644 --- a/src/server/api/endpoints/drive/files/update.ts +++ b/src/server/api/endpoints/drive/files/update.ts @@ -1,7 +1,8 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder from '../../../../../models/drive-folder'; import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file'; -import { publishDriveStream } from '../../../../../stream'; +import { publishDriveStream } from '../../../../../services/stream'; import define from '../../../define'; import Note from '../../../../../models/note'; diff --git a/src/server/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts index bea61dbeb1..c67df49ea0 100644 --- a/src/server/api/endpoints/drive/files/upload_from_url.ts +++ b/src/server/api/endpoints/drive/files/upload_from_url.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import * as ms from 'ms'; import { pack } from '../../../../../models/drive-file'; import uploadFromUrl from '../../../../../services/drive/upload-from-url'; diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts index 3a76ecd27d..7ada01d90b 100644 --- a/src/server/api/endpoints/drive/folders.ts +++ b/src/server/api/endpoints/drive/folders.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import DriveFolder, { pack } from '../../../../models/drive-folder'; import define from '../../define'; diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts index 63c6a436d4..1aca521a76 100644 --- a/src/server/api/endpoints/drive/folders/create.ts +++ b/src/server/api/endpoints/drive/folders/create.ts @@ -1,6 +1,7 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; -import { publishDriveStream } from '../../../../../stream'; +import { publishDriveStream } from '../../../../../services/stream'; import define from '../../../define'; export const meta = { diff --git a/src/server/api/endpoints/drive/folders/delete.ts b/src/server/api/endpoints/drive/folders/delete.ts index 019c5eb00b..228e262ccd 100644 --- a/src/server/api/endpoints/drive/folders/delete.ts +++ b/src/server/api/endpoints/drive/folders/delete.ts @@ -1,7 +1,8 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder from '../../../../../models/drive-folder'; import define from '../../../define'; -import { publishDriveStream } from '../../../../../stream'; +import { publishDriveStream } from '../../../../../services/stream'; import DriveFile from '../../../../../models/drive-file'; export const meta = { diff --git a/src/server/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts index fac5f05063..453153c507 100644 --- a/src/server/api/endpoints/drive/folders/find.ts +++ b/src/server/api/endpoints/drive/folders/find.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder, { pack } from '../../../../../models/drive-folder'; import define from '../../../define'; diff --git a/src/server/api/endpoints/drive/folders/show.ts b/src/server/api/endpoints/drive/folders/show.ts index 49e51544b6..9a7a11c6dd 100644 --- a/src/server/api/endpoints/drive/folders/show.ts +++ b/src/server/api/endpoints/drive/folders/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder, { pack } from '../../../../../models/drive-folder'; import define from '../../../define'; diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts index f10f9c820d..3207594367 100644 --- a/src/server/api/endpoints/drive/folders/update.ts +++ b/src/server/api/endpoints/drive/folders/update.ts @@ -1,6 +1,7 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; -import { publishDriveStream } from '../../../../../stream'; +import { publishDriveStream } from '../../../../../services/stream'; import define from '../../../define'; export const meta = { diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts index c8342c66b5..ec373889b5 100644 --- a/src/server/api/endpoints/drive/stream.ts +++ b/src/server/api/endpoints/drive/stream.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import DriveFile, { packMany } from '../../../../models/drive-file'; import define from '../../define'; diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts index 9786d19907..b12b17d671 100644 --- a/src/server/api/endpoints/following/create.ts +++ b/src/server/api/endpoints/following/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import * as ms from 'ms'; import User, { pack } from '../../../../models/user'; import Following from '../../../../models/following'; diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts index c7f1288ad6..dcc32079cc 100644 --- a/src/server/api/endpoints/following/delete.ts +++ b/src/server/api/endpoints/following/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import * as ms from 'ms'; import User, { pack } from '../../../../models/user'; import Following from '../../../../models/following'; diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts index 2cca3a1ccb..4d817ad982 100644 --- a/src/server/api/endpoints/following/requests/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import acceptFollowRequest from '../../../../../services/following/requests/accept'; import User from '../../../../../models/user'; import define from '../../../define'; diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index f2dec9ffae..dff255eff5 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import cancelFollowRequest from '../../../../../services/following/requests/cancel'; import User, { pack } from '../../../../../models/user'; import define from '../../../define'; diff --git a/src/server/api/endpoints/following/requests/list.ts b/src/server/api/endpoints/following/requests/list.ts index c561ea066c..eee98a3658 100644 --- a/src/server/api/endpoints/following/requests/list.ts +++ b/src/server/api/endpoints/following/requests/list.ts @@ -1,4 +1,5 @@ -//import $ from 'cafy'; import ID, { transform } from '../../../../../cafy-id'; +// import $ from 'cafy'; +// import ID, { transform } from '../../../../../cafy-id'; import FollowRequest, { pack } from '../../../../../models/follow-request'; import define from '../../../define'; diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index cce41e2df4..59257d1373 100644 --- a/src/server/api/endpoints/following/requests/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import rejectFollowRequest from '../../../../../services/following/requests/reject'; import User from '../../../../../models/user'; import define from '../../../define'; diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts index 2bebe36ef8..e0c4a2772d 100644 --- a/src/server/api/endpoints/games/reversi/games.ts +++ b/src/server/api/endpoints/games/reversi/games.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import ReversiGame, { pack } from '../../../../../models/games/reversi/game'; import define from '../../../define'; diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts index 0882456102..212d72bb7b 100644 --- a/src/server/api/endpoints/games/reversi/games/show.ts +++ b/src/server/api/endpoints/games/reversi/games/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../../misc/cafy-id'; import ReversiGame, { pack } from '../../../../../../models/games/reversi/game'; import Reversi from '../../../../../../games/reversi/core'; import define from '../../../../define'; diff --git a/src/server/api/endpoints/games/reversi/games/surrender.ts b/src/server/api/endpoints/games/reversi/games/surrender.ts index aab88da664..a19743fee9 100644 --- a/src/server/api/endpoints/games/reversi/games/surrender.ts +++ b/src/server/api/endpoints/games/reversi/games/surrender.ts @@ -1,6 +1,7 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../../misc/cafy-id'; import ReversiGame, { pack } from '../../../../../../models/games/reversi/game'; -import { publishReversiGameStream } from '../../../../../../stream'; +import { publishReversiGameStream } from '../../../../../../services/stream'; import define from '../../../../define'; export const meta = { diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts index a3cc523a8c..febf815067 100644 --- a/src/server/api/endpoints/games/reversi/match.ts +++ b/src/server/api/endpoints/games/reversi/match.ts @@ -1,8 +1,9 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching'; import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game'; import User from '../../../../../models/user'; -import { publishMainStream, publishReversiStream } from '../../../../../stream'; +import { publishMainStream, publishReversiStream } from '../../../../../services/stream'; import { eighteight } from '../../../../../games/reversi/maps'; import define from '../../../define'; diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts index a26dbf0941..d4efe5d910 100644 --- a/src/server/api/endpoints/hashtags/trend.ts +++ b/src/server/api/endpoints/hashtags/trend.ts @@ -40,22 +40,22 @@ export default define(meta, () => new Promise(async (res, rej) => { $group: { _id: { tag: '$tagsLower', userId: '$userId' } } - }]) as Array<{ + }]) as { _id: { tag: string; userId: any; } - }>; + }[]; //#endregion if (data.length == 0) { return res([]); } - const tags: Array<{ + const tags: { name: string; count: number; - }> = []; + }[] = []; // カウント for (const x of data.map(x => x._id).filter(x => !hidedTags.includes(x.tag))) { @@ -108,7 +108,7 @@ export default define(meta, () => new Promise(async (res, rej) => { //#endregion //#region 2(または3)で話題と判定されたタグそれぞれについて過去の投稿数グラフを取得する - const countPromises: Array<Promise<any[]>> = []; + const countPromises: Promise<any[]>[] = []; const range = 20; diff --git a/src/server/api/endpoints/i/export-notes.ts b/src/server/api/endpoints/i/export-notes.ts new file mode 100644 index 0000000000..6da6e68b9d --- /dev/null +++ b/src/server/api/endpoints/i/export-notes.ts @@ -0,0 +1,18 @@ +import define from '../../define'; +import { createExportNotesJob } from '../../../../queue'; +import ms = require('ms'); + +export const meta = { + secure: true, + requireCredential: true, + limit: { + duration: ms('1day'), + max: 1, + }, +}; + +export default define(meta, (ps, user) => new Promise(async (res, rej) => { + createExportNotesJob(user); + + res(); +})); diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts index 67a3638885..3bfed4cbbc 100644 --- a/src/server/api/endpoints/i/favorites.ts +++ b/src/server/api/endpoints/i/favorites.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Favorite, { packMany } from '../../../../models/favorite'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index 4d8aee0caa..264ed3c9ce 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Notification from '../../../../models/notification'; import { packMany } from '../../../../models/notification'; import { getFriendIds } from '../../common/get-friends'; diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts index ab8d8a1853..79a3e42fb7 100644 --- a/src/server/api/endpoints/i/pin.ts +++ b/src/server/api/endpoints/i/pin.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import { pack } from '../../../../models/user'; import { addPinned } from '../../../../services/i/pin'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/read_all_messaging_messages.ts b/src/server/api/endpoints/i/read_all_messaging_messages.ts index a1fe82c4cb..739acf93c6 100644 --- a/src/server/api/endpoints/i/read_all_messaging_messages.ts +++ b/src/server/api/endpoints/i/read_all_messaging_messages.ts @@ -1,5 +1,5 @@ import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import Message from '../../../../models/messaging-message'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/read_all_unread_notes.ts b/src/server/api/endpoints/i/read_all_unread_notes.ts index 7d63de4e19..509450e43c 100644 --- a/src/server/api/endpoints/i/read_all_unread_notes.ts +++ b/src/server/api/endpoints/i/read_all_unread_notes.ts @@ -1,5 +1,5 @@ import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import NoteUnread from '../../../../models/note-unread'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts index 5dfc3cd664..16c2983184 100644 --- a/src/server/api/endpoints/i/regenerate_token.ts +++ b/src/server/api/endpoints/i/regenerate_token.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import generateUserToken from '../../common/generate-native-user-token'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts index acf9349cd2..c30e3f8fb8 100644 --- a/src/server/api/endpoints/i/signin_history.ts +++ b/src/server/api/endpoints/i/signin_history.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Signin, { pack } from '../../../../models/signin'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/unpin.ts b/src/server/api/endpoints/i/unpin.ts index 27342fb43c..405c3cb9c5 100644 --- a/src/server/api/endpoints/i/unpin.ts +++ b/src/server/api/endpoints/i/unpin.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import { pack } from '../../../../models/user'; import { removePinned } from '../../../../services/i/pin'; import define from '../../define'; diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index d087687a51..0ad7e0f33f 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -1,6 +1,7 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import DriveFile from '../../../../models/drive-file'; import acceptAllFollowRequests from '../../../../services/following/requests/accept-all'; import { publishToFollowers } from '../../../../services/i/update'; diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts index 66435ec9b2..2b2f3d3c7b 100644 --- a/src/server/api/endpoints/i/update_client_setting.ts +++ b/src/server/api/endpoints/i/update_client_setting.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; export const meta = { diff --git a/src/server/api/endpoints/i/update_email.ts b/src/server/api/endpoints/i/update_email.ts index eeac460796..c3aafc8d8b 100644 --- a/src/server/api/endpoints/i/update_email.ts +++ b/src/server/api/endpoints/i/update_email.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import User, { pack } from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; import * as nodemailer from 'nodemailer'; import fetchMeta from '../../../../misc/fetch-meta'; diff --git a/src/server/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts index f472600ee0..805c52d728 100644 --- a/src/server/api/endpoints/i/update_home.ts +++ b/src/server/api/endpoints/i/update_home.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; export const meta = { diff --git a/src/server/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts index 792c4b7877..0e1c3313e0 100644 --- a/src/server/api/endpoints/i/update_mobile_home.ts +++ b/src/server/api/endpoints/i/update_mobile_home.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; export const meta = { diff --git a/src/server/api/endpoints/i/update_widget.ts b/src/server/api/endpoints/i/update_widget.ts index da96ec6fc1..e3e91c1f08 100644 --- a/src/server/api/endpoints/i/update_widget.ts +++ b/src/server/api/endpoints/i/update_widget.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import User from '../../../../models/user'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; export const meta = { diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts index 3d033f1109..486bc56b98 100644 --- a/src/server/api/endpoints/messaging/messages.ts +++ b/src/server/api/endpoints/messaging/messages.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Message from '../../../../models/messaging-message'; import User from '../../../../models/user'; import { pack } from '../../../../models/messaging-message'; diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index 3630dc0d54..8300f69e53 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -1,13 +1,14 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Message from '../../../../../models/messaging-message'; import { isValidText } from '../../../../../models/messaging-message'; import User from '../../../../../models/user'; import Mute from '../../../../../models/mute'; import DriveFile from '../../../../../models/drive-file'; import { pack } from '../../../../../models/messaging-message'; -import { publishMainStream } from '../../../../../stream'; -import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../stream'; -import pushSw from '../../../../../push-sw'; +import { publishMainStream } from '../../../../../services/stream'; +import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../services/stream'; +import pushSw from '../../../../../services/push-notification'; import define from '../../../define'; export const meta = { diff --git a/src/server/api/endpoints/messaging/messages/delete.ts b/src/server/api/endpoints/messaging/messages/delete.ts index 103b680da8..4f3fabb4ce 100644 --- a/src/server/api/endpoints/messaging/messages/delete.ts +++ b/src/server/api/endpoints/messaging/messages/delete.ts @@ -2,7 +2,7 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; import Message from '../../../../../models/messaging-message'; import define from '../../../define'; -import { publishMessagingStream } from '../../../../../stream'; +import { publishMessagingStream } from '../../../../../services/stream'; import * as ms from 'ms'; export const meta = { diff --git a/src/server/api/endpoints/messaging/messages/read.ts b/src/server/api/endpoints/messaging/messages/read.ts index eb1799cfc6..8343ea28ca 100644 --- a/src/server/api/endpoints/messaging/messages/read.ts +++ b/src/server/api/endpoints/messaging/messages/read.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Message from '../../../../../models/messaging-message'; import read from '../../../common/read-messaging-message'; import define from '../../../define'; diff --git a/src/server/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts index 13323da324..d25887fb45 100644 --- a/src/server/api/endpoints/mute/create.ts +++ b/src/server/api/endpoints/mute/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import User from '../../../../models/user'; import Mute from '../../../../models/mute'; import define from '../../define'; diff --git a/src/server/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts index 3808c15270..4c59ede6d2 100644 --- a/src/server/api/endpoints/mute/delete.ts +++ b/src/server/api/endpoints/mute/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import User from '../../../../models/user'; import Mute from '../../../../models/mute'; import define from '../../define'; diff --git a/src/server/api/endpoints/mute/list.ts b/src/server/api/endpoints/mute/list.ts index c337ba4ec9..23c90ab9d2 100644 --- a/src/server/api/endpoints/mute/list.ts +++ b/src/server/api/endpoints/mute/list.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Mute, { packMany } from '../../../../models/mute'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes.ts b/src/server/api/endpoints/notes.ts index b489197076..fce373f03e 100644 --- a/src/server/api/endpoints/notes.ts +++ b/src/server/api/endpoints/notes.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../misc/cafy-id'; import Note, { packMany } from '../../../models/note'; import define from '../define'; diff --git a/src/server/api/endpoints/notes/conversation.ts b/src/server/api/endpoints/notes/conversation.ts index 5e6e5ddb0f..6a19832f93 100644 --- a/src/server/api/endpoints/notes/conversation.ts +++ b/src/server/api/endpoints/notes/conversation.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note, { packMany, INote } from '../../../../models/note'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index 696a27afb4..5dba01d9ab 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform, transformMany } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform, transformMany } from '../../../../misc/cafy-id'; import * as ms from 'ms'; import { length } from 'stringz'; import Note, { INote, isValidCw, pack } from '../../../../models/note'; diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts index 0ddcb7c443..261c7ad547 100644 --- a/src/server/api/endpoints/notes/delete.ts +++ b/src/server/api/endpoints/notes/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import deleteNote from '../../../../services/note/delete'; import User from '../../../../models/user'; diff --git a/src/server/api/endpoints/notes/favorites/create.ts b/src/server/api/endpoints/notes/favorites/create.ts index a50b5002c2..8ec0891a31 100644 --- a/src/server/api/endpoints/notes/favorites/create.ts +++ b/src/server/api/endpoints/notes/favorites/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Favorite from '../../../../../models/favorite'; import Note from '../../../../../models/note'; import define from '../../../define'; diff --git a/src/server/api/endpoints/notes/favorites/delete.ts b/src/server/api/endpoints/notes/favorites/delete.ts index 0aad61fedd..f0b9e249f7 100644 --- a/src/server/api/endpoints/notes/favorites/delete.ts +++ b/src/server/api/endpoints/notes/favorites/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Favorite from '../../../../../models/favorite'; import Note from '../../../../../models/note'; import define from '../../../define'; diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts index 48dbaefed8..63b5b2d2b5 100644 --- a/src/server/api/endpoints/notes/global-timeline.ts +++ b/src/server/api/endpoints/notes/global-timeline.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { packMany } from '../../../../models/note'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index 4b716d0c76..55b6af9131 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { getFriends } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts index e84d981c22..5d6e4b2e1a 100644 --- a/src/server/api/endpoints/notes/local-timeline.ts +++ b/src/server/api/endpoints/notes/local-timeline.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { packMany } from '../../../../models/note'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts index 48814279e7..c8def2aef7 100644 --- a/src/server/api/endpoints/notes/mentions.ts +++ b/src/server/api/endpoints/notes/mentions.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { getFriendIds, getFriends } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts index f99fb099c7..68c3898e05 100644 --- a/src/server/api/endpoints/notes/polls/vote.ts +++ b/src/server/api/endpoints/notes/polls/vote.ts @@ -1,10 +1,11 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Vote from '../../../../../models/poll-vote'; import Note from '../../../../../models/note'; import Watching from '../../../../../models/note-watching'; import watch from '../../../../../services/note/watch'; -import { publishNoteStream } from '../../../../../stream'; -import notify from '../../../../../notify'; +import { publishNoteStream } from '../../../../../services/stream'; +import notify from '../../../../../services/create-notification'; import define from '../../../define'; import createNote from '../../../../../services/note/create'; import User from '../../../../../models/user'; diff --git a/src/server/api/endpoints/notes/reactions.ts b/src/server/api/endpoints/notes/reactions.ts index a1b249638f..4486ce2c70 100644 --- a/src/server/api/endpoints/notes/reactions.ts +++ b/src/server/api/endpoints/notes/reactions.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import Reaction, { pack } from '../../../../models/note-reaction'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts index 4037e89943..2612b129d0 100644 --- a/src/server/api/endpoints/notes/reactions/create.ts +++ b/src/server/api/endpoints/notes/reactions/create.ts @@ -1,5 +1,6 @@ import * as mongo from 'mongodb'; -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import createReaction from '../../../../../services/note/reaction/create'; import { validateReaction } from '../../../../../models/note-reaction'; import define from '../../../define'; diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts index 01151ef9b0..da3c2e3567 100644 --- a/src/server/api/endpoints/notes/reactions/delete.ts +++ b/src/server/api/endpoints/notes/reactions/delete.ts @@ -1,5 +1,6 @@ import * as mongo from 'mongodb'; -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import define from '../../../define'; import * as ms from 'ms'; import deleteReaction from '../../../../../services/note/reaction/delete'; diff --git a/src/server/api/endpoints/notes/renotes.ts b/src/server/api/endpoints/notes/renotes.ts index 2a434dd06e..d9009e1598 100644 --- a/src/server/api/endpoints/notes/renotes.ts +++ b/src/server/api/endpoints/notes/renotes.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note, { packMany } from '../../../../models/note'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/replies.ts b/src/server/api/endpoints/notes/replies.ts index 9308c440b1..b455610773 100644 --- a/src/server/api/endpoints/notes/replies.ts +++ b/src/server/api/endpoints/notes/replies.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note, { packMany } from '../../../../models/note'; import define from '../../define'; import { getFriends } from '../../common/get-friends'; diff --git a/src/server/api/endpoints/notes/search_by_tag.ts b/src/server/api/endpoints/notes/search_by_tag.ts index 995030e03a..b9a1b6b1b8 100644 --- a/src/server/api/endpoints/notes/search_by_tag.ts +++ b/src/server/api/endpoints/notes/search_by_tag.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { getFriendIds } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; diff --git a/src/server/api/endpoints/notes/show.ts b/src/server/api/endpoints/notes/show.ts index 53246102d0..41134a2202 100644 --- a/src/server/api/endpoints/notes/show.ts +++ b/src/server/api/endpoints/notes/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note, { pack } from '../../../../models/note'; import define from '../../define'; diff --git a/src/server/api/endpoints/notes/state.ts b/src/server/api/endpoints/notes/state.ts new file mode 100644 index 0000000000..7519241e0b --- /dev/null +++ b/src/server/api/endpoints/notes/state.ts @@ -0,0 +1,49 @@ +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; +import define from '../../define'; +import Favorite from '../../../../models/favorite'; +import NoteWatching from '../../../../models/note-watching'; + +export const meta = { + stability: 'stable', + + desc: { + 'ja-JP': '指定した投稿の状態を取得します。', + 'en-US': 'Get state of a note.' + }, + + requireCredential: true, + + params: { + noteId: { + validator: $.type(ID), + transform: transform, + desc: { + 'ja-JP': '対象の投稿のID', + 'en-US': 'Target note ID.' + } + } + } +}; + +export default define(meta, (ps, user) => new Promise(async (res, rej) => { + const [favorite, watching] = await Promise.all([ + Favorite.count({ + userId: user._id, + noteId: ps.noteId + }, { + limit: 1 + }), + NoteWatching.count({ + userId: user._id, + noteId: ps.noteId + }, { + limit: 1 + }) + ]); + + res({ + isFavorited: favorite !== 0, + isWatching: watching !== 0 + }); +})); diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index 6c3142b091..b0b02c4c9d 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { getFriends } from '../../common/get-friends'; import { packMany } from '../../../../models/note'; diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts index 0cceeb95da..279511e834 100644 --- a/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/src/server/api/endpoints/notes/user-list-timeline.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import { packMany } from '../../../../models/note'; import UserList from '../../../../models/user-list'; diff --git a/src/server/api/endpoints/notes/watching/create.ts b/src/server/api/endpoints/notes/watching/create.ts index 7660e651fb..5efe69a3b4 100644 --- a/src/server/api/endpoints/notes/watching/create.ts +++ b/src/server/api/endpoints/notes/watching/create.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Note from '../../../../../models/note'; import define from '../../../define'; import watch from '../../../../../services/note/watch'; diff --git a/src/server/api/endpoints/notes/watching/delete.ts b/src/server/api/endpoints/notes/watching/delete.ts index 97804e3bac..2d99cc8254 100644 --- a/src/server/api/endpoints/notes/watching/delete.ts +++ b/src/server/api/endpoints/notes/watching/delete.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import Note from '../../../../../models/note'; import define from '../../../define'; import unwatch from '../../../../../services/note/unwatch'; diff --git a/src/server/api/endpoints/notifications/mark_all_as_read.ts b/src/server/api/endpoints/notifications/mark_all_as_read.ts index 1b5208d447..de5a12707b 100644 --- a/src/server/api/endpoints/notifications/mark_all_as_read.ts +++ b/src/server/api/endpoints/notifications/mark_all_as_read.ts @@ -1,5 +1,5 @@ import Notification from '../../../../models/notification'; -import { publishMainStream } from '../../../../stream'; +import { publishMainStream } from '../../../../services/stream'; import User from '../../../../models/user'; import define from '../../define'; diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts index e7f74b0651..d04b01b09e 100644 --- a/src/server/api/endpoints/users/followers.ts +++ b/src/server/api/endpoints/users/followers.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import User from '../../../../models/user'; import Following from '../../../../models/following'; import { pack } from '../../../../models/user'; diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts index 371a54f901..bcfa777d66 100644 --- a/src/server/api/endpoints/users/following.ts +++ b/src/server/api/endpoints/users/following.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import User from '../../../../models/user'; import Following from '../../../../models/following'; import { pack } from '../../../../models/user'; 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 353ccef1e9..6bbac6a29d 100644 --- a/src/server/api/endpoints/users/get_frequently_replied_users.ts +++ b/src/server/api/endpoints/users/get_frequently_replied_users.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import Note from '../../../../models/note'; import User, { pack } from '../../../../models/user'; import define from '../../define'; diff --git a/src/server/api/endpoints/users/lists/pull.ts b/src/server/api/endpoints/users/lists/pull.ts index f1b25127b3..86eaa1dd8d 100644 --- a/src/server/api/endpoints/users/lists/pull.ts +++ b/src/server/api/endpoints/users/lists/pull.ts @@ -1,7 +1,8 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import UserList from '../../../../../models/user-list'; import User, { pack as packUser } from '../../../../../models/user'; -import { publishUserListStream } from '../../../../../stream'; +import { publishUserListStream } from '../../../../../services/stream'; import define from '../../../define'; export const meta = { diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index 828d9e0215..6e2dbed518 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.ts @@ -1,7 +1,8 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import UserList from '../../../../../models/user-list'; import User, { pack as packUser, isRemoteUser, fetchProxyAccount } from '../../../../../models/user'; -import { publishUserListStream } from '../../../../../stream'; +import { publishUserListStream } from '../../../../../services/stream'; import { renderActivity } from '../../../../../remote/activitypub/renderer'; import renderFollow from '../../../../../remote/activitypub/renderer/follow'; import { deliver } from '../../../../../queue'; diff --git a/src/server/api/endpoints/users/lists/show.ts b/src/server/api/endpoints/users/lists/show.ts index 2662ab2769..c508659a15 100644 --- a/src/server/api/endpoints/users/lists/show.ts +++ b/src/server/api/endpoints/users/lists/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; import UserList, { pack } from '../../../../../models/user-list'; import define from '../../../define'; diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index fdb862de09..c7f63d783e 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import getHostLower from '../../common/get-host-lower'; import Note, { packMany } from '../../../../models/note'; import User from '../../../../models/user'; diff --git a/src/server/api/endpoints/users/relation.ts b/src/server/api/endpoints/users/relation.ts index c63ec337bf..43d5e70640 100644 --- a/src/server/api/endpoints/users/relation.ts +++ b/src/server/api/endpoints/users/relation.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform, ObjectId } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform, ObjectId } from '../../../../misc/cafy-id'; import { getRelation } from '../../../../models/user'; import define from '../../define'; diff --git a/src/server/api/endpoints/users/report-abuse.ts b/src/server/api/endpoints/users/report-abuse.ts index 19beee4330..c592e5cfd4 100644 --- a/src/server/api/endpoints/users/report-abuse.ts +++ b/src/server/api/endpoints/users/report-abuse.ts @@ -1,8 +1,9 @@ -import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform } from '../../../../misc/cafy-id'; import define from '../../define'; import User from '../../../../models/user'; import AbuseUserReport from '../../../../models/abuse-user-report'; -import { publishAdminStream } from '../../../../stream'; +import { publishAdminStream } from '../../../../services/stream'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts index 83897dd45c..67548599ba 100644 --- a/src/server/api/endpoints/users/show.ts +++ b/src/server/api/endpoints/users/show.ts @@ -1,4 +1,5 @@ -import $ from 'cafy'; import ID, { transform, transformMany } from '../../../../misc/cafy-id'; +import $ from 'cafy'; +import ID, { transform, transformMany } from '../../../../misc/cafy-id'; import User, { pack, isRemoteUser } from '../../../../models/user'; import resolveRemoteUser from '../../../../remote/resolve-user'; import define from '../../define'; |