diff --git a/src/server/activitypub/followers.ts b/src/server/activitypub/followers.ts index 0db451bb30..ce7fe94e42 100644 --- a/src/server/activitypub/followers.ts +++ b/src/server/activitypub/followers.ts @@ -1,7 +1,8 @@ import { ObjectID } from 'mongodb'; import * as Router from 'koa-router'; import config from '../../config'; -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 { renderActivity } from '../../remote/activitypub/renderer'; 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/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..214d211d80 100644 --- a/src/server/api/endpoints/drive/files/delete.ts +++ b/src/server/api/endpoints/drive/files/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 DriveFile from '../../../../../models/drive-file'; import del from '../../../../../services/drive/delete-file'; import { publishDriveStream } from '../../../../../stream'; 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..52d20af64e 100644 --- a/src/server/api/endpoints/drive/files/update.ts +++ b/src/server/api/endpoints/drive/files/update.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 from '../../../../../models/drive-folder'; import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file'; import { publishDriveStream } from '../../../../../stream'; 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..b7a7e6c88c 100644 --- a/src/server/api/endpoints/drive/folders/create.ts +++ b/src/server/api/endpoints/drive/folders/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 DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import { publishDriveStream } from '../../../../../stream'; import define from '../../../define'; diff --git a/src/server/api/endpoints/drive/folders/delete.ts b/src/server/api/endpoints/drive/folders/delete.ts index 019c5eb00b..5259fe7841 100644 --- a/src/server/api/endpoints/drive/folders/delete.ts +++ b/src/server/api/endpoints/drive/folders/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 DriveFolder from '../../../../../models/drive-folder'; import define from '../../../define'; import { publishDriveStream } from '../../../../../stream'; 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..af4f2fcf6b 100644 --- a/src/server/api/endpoints/drive/folders/update.ts +++ b/src/server/api/endpoints/drive/folders/update.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, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import { publishDriveStream } from '../../../../../stream'; import define from '../../../define'; 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..029e0101fa 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..7a8d45b312 100644 --- a/src/server/api/endpoints/games/reversi/games/surrender.ts +++ b/src/server/api/endpoints/games/reversi/games/surrender.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 { publishReversiGameStream } from '../../../../../../stream'; import define from '../../../../define'; diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts index a3cc523a8c..67e6dde3d6 100644 --- a/src/server/api/endpoints/games/reversi/match.ts +++ b/src/server/api/endpoints/games/reversi/match.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 Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching'; import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game'; import User from '../../../../../models/user'; 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/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..88e184b181 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.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, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; import { publishMainStream } from '../../../../stream'; import DriveFile from '../../../../models/drive-file'; 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..bcb3c7309e 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/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 Message from '../../../../../models/messaging-message'; import { isValidText } from '../../../../../models/messaging-message'; import User from '../../../../../models/user'; 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..5741932438 100644 --- a/src/server/api/endpoints/notes/polls/vote.ts +++ b/src/server/api/endpoints/notes/polls/vote.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 Vote from '../../../../../models/poll-vote'; import Note from '../../../../../models/note'; import Watching from '../../../../../models/note-watching'; 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 index e9db12ead7..7519241e0b 100644 --- a/src/server/api/endpoints/notes/state.ts +++ b/src/server/api/endpoints/notes/state.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 define from '../../define'; import Favorite from '../../../../models/favorite'; import NoteWatching from '../../../../models/note-watching'; 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/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..ed44977a7e 100644 --- a/src/server/api/endpoints/users/lists/pull.ts +++ b/src/server/api/endpoints/users/lists/pull.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 from '../../../../../models/user-list'; import User, { pack as packUser } from '../../../../../models/user'; import { publishUserListStream } from '../../../../../stream'; diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index 828d9e0215..8be498ec2c 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.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 from '../../../../../models/user-list'; import User, { pack as packUser, isRemoteUser, fetchProxyAccount } from '../../../../../models/user'; import { publishUserListStream } from '../../../../../stream'; 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..d63f3e55a4 100644 --- a/src/server/api/endpoints/users/report-abuse.ts +++ b/src/server/api/endpoints/users/report-abuse.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 define from '../../define'; import User from '../../../../models/user'; import AbuseUserReport from '../../../../models/abuse-user-report'; 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';