refactor: refactoring imports

将来ESMに移行しやすいように
Related: #7658

なんかmochaが起動しなくなってるけど理由不明
すぐ直したい
This commit is contained in:
syuilo 2021-08-19 18:33:41 +09:00
parent 31e3aaeda0
commit b9cb6d1c10
663 changed files with 3194 additions and 3134 deletions

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import * as speakeasy from 'speakeasy';
import define from '../../../define';
import { UserProfiles } from '../../../../../models';
import define from '../../../define.js';
import { UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -2,16 +2,16 @@ import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import { promisify } from 'util';
import * as cbor from 'cbor';
import define from '../../../define';
import define from '../../../define.js';
import {
UserProfiles,
UserSecurityKeys,
AttestationChallenges,
Users
} from '../../../../../models';
import config from '@/config';
import { procedures, hash } from '../../../2fa';
import { publishMainStream } from '../../../../../services/stream';
} from '@/models/index.js';
import config from '@/config/index.js';
import { procedures, hash } from '../../../2fa.js';
import { publishMainStream } from '@/services/stream.js';
const cborDecodeFirst = promisify(cbor.decodeFirst) as any;

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../../define';
import { UserProfiles } from '../../../../../models';
import define from '../../../define.js';
import { UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import define from '../../../define';
import { UserProfiles, AttestationChallenges } from '../../../../../models';
import define from '../../../define.js';
import { UserProfiles, AttestationChallenges } from '@/models/index.js';
import { promisify } from 'util';
import * as crypto from 'crypto';
import { genId } from '@/misc/gen-id';
import { hash } from '../../../2fa';
import { genId } from '@/misc/gen-id.js';
import { hash } from '../../../2fa.js';
const randomBytes = promisify(crypto.randomBytes);

View file

@ -2,9 +2,9 @@ import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy';
import * as QRCode from 'qrcode';
import config from '@/config';
import define from '../../../define';
import { UserProfiles } from '../../../../../models';
import config from '@/config/index.js';
import define from '../../../define.js';
import { UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import define from '../../../define';
import { UserProfiles, UserSecurityKeys, Users } from '../../../../../models';
import { publishMainStream } from '../../../../../services/stream';
import define from '../../../define.js';
import { UserProfiles, UserSecurityKeys, Users } from '@/models/index.js';
import { publishMainStream } from '@/services/stream.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import define from '../../../define';
import { UserProfiles } from '../../../../../models';
import define from '../../../define.js';
import { UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../define';
import { AccessTokens } from '../../../../models';
import define from '../../define.js';
import { AccessTokens } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../define';
import { AccessTokens, Apps } from '../../../../models';
import define from '../../define.js';
import { AccessTokens, Apps } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import define from '../../define';
import { UserProfiles } from '../../../../models';
import define from '../../define.js';
import { UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,9 +1,9 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import define from '../../define';
import { Users, UserProfiles } from '../../../../models';
import { doPostSuspend } from '../../../../services/suspend-user';
import { publishUserEvent } from '@/services/stream';
import define from '../../define.js';
import { Users, UserProfiles } from '@/models/index.js';
import { doPostSuspend } from '@/services/suspend-user.js';
import { publishUserEvent } from '@/services/stream.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import define from '../../define';
import { createExportBlockingJob } from '../../../../queue';
import ms = require('ms');
import define from '../../define.js';
import { createExportBlockingJob } from '@/queue/index.js';
import * as ms from 'ms';
export const meta = {
secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define';
import { createExportFollowingJob } from '../../../../queue';
import ms = require('ms');
import define from '../../define.js';
import { createExportFollowingJob } from '@/queue/index.js';
import * as ms from 'ms';
export const meta = {
secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define';
import { createExportMuteJob } from '../../../../queue';
import ms = require('ms');
import define from '../../define.js';
import { createExportMuteJob } from '@/queue/index.js';
import * as ms from 'ms';
export const meta = {
secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define';
import { createExportNotesJob } from '../../../../queue';
import ms = require('ms');
import define from '../../define.js';
import { createExportNotesJob } from '@/queue/index.js';
import * as ms from 'ms';
export const meta = {
secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define';
import { createExportUserListsJob } from '../../../../queue';
import ms = require('ms');
import define from '../../define.js';
import { createExportUserListsJob } from '@/queue/index.js';
import * as ms from 'ms';
export const meta = {
secure: true,

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { NoteFavorites } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { NoteFavorites } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'notes', 'favorites'],

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../../define';
import { GalleryLikes } from '../../../../../models';
import { makePaginationQuery } from '../../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../../define.js';
import { GalleryLikes } from '@/models/index.js';
import { makePaginationQuery } from '../../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'gallery'],

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../../define';
import { GalleryPosts } from '../../../../../models';
import { makePaginationQuery } from '../../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../../define.js';
import { GalleryPosts } from '@/models/index.js';
import { makePaginationQuery } from '../../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'gallery'],

View file

@ -1,5 +1,5 @@
import define from '../../define';
import { MutedNotes } from '../../../../models';
import define from '../../define.js';
import { MutedNotes } from '@/models/index.js';
export const meta = {
tags: ['account'],

View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { createImportFollowingJob } from '../../../../queue';
import ms = require('ms');
import { ApiError } from '../../error';
import { DriveFiles } from '../../../../models';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { createImportFollowingJob } from '@/queue/index.js';
import * as ms from 'ms';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { createImportUserListsJob } from '../../../../queue';
import ms = require('ms');
import { ApiError } from '../../error';
import { DriveFiles } from '../../../../models';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { createImportUserListsJob } from '@/queue/index.js';
import * as ms from 'ms';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

View file

@ -1,11 +1,11 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import { readNotification } from '../../common/read-notification';
import define from '../../define';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { Notifications, Followings, Mutings, Users } from '../../../../models';
import { notificationTypes } from '../../../../types';
import read from '@/services/note/read';
import { ID } from '@/misc/cafy-id.js';
import { readNotification } from '../../common/read-notification.js';
import define from '../../define.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
import { Notifications, Followings, Mutings, Users } from '@/models/index.js';
import { notificationTypes } from '../../../../types.js';
import read from '@/services/note/read.js';
export const meta = {
tags: ['account', 'notifications'],

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { PageLikes } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { PageLikes } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'pages'],

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { Pages } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { Pages } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'pages'],

View file

@ -1,9 +1,9 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import { addPinned } from '../../../../services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '../../../../models';
import { ID } from '@/misc/cafy-id.js';
import { addPinned } from '@/services/i/pin.js';
import define from '../../define.js';
import { ApiError } from '../../error.js';
import { Users } from '@/models/index.js';
export const meta = {
tags: ['account', 'notes'],

View file

@ -1,6 +1,6 @@
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
import { MessagingMessages, UserGroupJoinings } from '../../../../models';
import { publishMainStream } from '@/services/stream.js';
import define from '../../define.js';
import { MessagingMessages, UserGroupJoinings } from '@/models/index.js';
export const meta = {
tags: ['account', 'messaging'],

View file

@ -1,6 +1,6 @@
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
import { NoteUnreads } from '../../../../models';
import { publishMainStream } from '@/services/stream.js';
import define from '../../define.js';
import { NoteUnreads } from '@/models/index.js';
export const meta = {
tags: ['account'],

View file

@ -1,10 +1,10 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { ApiError } from '../../error';
import { genId } from '@/misc/gen-id';
import { AnnouncementReads, Announcements, Users } from '../../../../models';
import { publishMainStream } from '../../../../services/stream';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { ApiError } from '../../error.js';
import { genId } from '@/misc/gen-id.js';
import { AnnouncementReads, Announcements, Users } from '@/models/index.js';
import { publishMainStream } from '@/services/stream.js';
export const meta = {
tags: ['account'],

View file

@ -1,9 +1,9 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import { publishMainStream, publishUserEvent } from '../../../../services/stream';
import generateUserToken from '../../common/generate-native-user-token';
import define from '../../define';
import { Users, UserProfiles } from '../../../../models';
import { publishMainStream, publishUserEvent } from '@/services/stream.js';
import generateUserToken from '../../common/generate-native-user-token.js';
import define from '../../define.js';
import { Users, UserProfiles } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import { ApiError } from '../../../error';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import { ApiError } from '../../../error';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,6 +1,6 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,7 +1,7 @@
import $ from 'cafy';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import { ApiError } from '../../../error';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,5 +1,5 @@
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { publishMainStream } from '../../../../../services/stream';
import define from '../../../define';
import { RegistryItems } from '../../../../../models';
import { genId } from '@/misc/gen-id';
import { publishMainStream } from '@/services/stream.js';
import define from '../../../define.js';
import { RegistryItems } from '@/models/index.js';
import { genId } from '@/misc/gen-id.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import define from '../../define';
import { AccessTokens } from '../../../../models';
import { ID } from '@/misc/cafy-id';
import { publishUserEvent } from '@/services/stream';
import define from '../../define.js';
import { AccessTokens } from '@/models/index.js';
import { ID } from '@/misc/cafy-id.js';
import { publishUserEvent } from '@/services/stream.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { Signins } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { Signins } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,9 +1,9 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import { removePinned } from '../../../../services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '../../../../models';
import { ID } from '@/misc/cafy-id.js';
import { removePinned } from '@/services/i/pin.js';
import define from '../../define.js';
import { ApiError } from '../../error.js';
import { Users } from '@/models/index.js';
export const meta = {
tags: ['account', 'notes'],

View file

@ -1,13 +1,13 @@
import $ from 'cafy';
import { publishMainStream } from '../../../../services/stream';
import define from '../../define';
import { publishMainStream } from '@/services/stream.js';
import define from '../../define.js';
import rndstr from 'rndstr';
import config from '@/config';
import config from '@/config/index.js';
import * as ms from 'ms';
import * as bcrypt from 'bcryptjs';
import { Users, UserProfiles } from '../../../../models';
import { sendEmail } from '../../../../services/send-email';
import { ApiError } from '../../error';
import { Users, UserProfiles } from '@/models/index.js';
import { sendEmail } from '@/services/send-email.js';
import { ApiError } from '../../error.js';
export const meta = {
requireCredential: true as const,

View file

@ -1,20 +1,20 @@
import $ from 'cafy';
import * as mfm from 'mfm-js';
import { ID } from '@/misc/cafy-id';
import { publishMainStream, publishUserEvent } from '../../../../services/stream';
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
import { publishToFollowers } from '../../../../services/i/update';
import define from '../../define';
import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm';
import { extractHashtags } from '@/misc/extract-hashtags';
import { ID } from '@/misc/cafy-id.js';
import { publishMainStream, publishUserEvent } from '@/services/stream.js';
import acceptAllFollowRequests from '@/services/following/requests/accept-all.js';
import { publishToFollowers } from '@/services/i/update.js';
import define from '../../define.js';
import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
import { extractHashtags } from '@/misc/extract-hashtags.js';
import * as langmap from 'langmap';
import { updateUsertags } from '../../../../services/update-hashtag';
import { ApiError } from '../../error';
import { Users, DriveFiles, UserProfiles, Pages } from '../../../../models';
import { User } from '../../../../models/entities/user';
import { UserProfile } from '../../../../models/entities/user-profile';
import { notificationTypes } from '../../../../types';
import { normalizeForSearch } from '@/misc/normalize-for-search';
import { updateUsertags } from '@/services/update-hashtag.js';
import { ApiError } from '../../error.js';
import { Users, DriveFiles, UserProfiles, Pages } from '@/models/index.js';
import { User } from '@/models/entities/user.js';
import { UserProfile } from '@/models/entities/user-profile.js';
import { notificationTypes } from '../../../../types.js';
import { normalizeForSearch } from '@/misc/normalize-for-search.js';
export const meta = {
tags: ['account'],

View file

@ -1,8 +1,8 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { UserGroupInvitations } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { ID } from '@/misc/cafy-id.js';
import define from '../../define.js';
import { UserGroupInvitations } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
tags: ['account', 'groups'],