refactor: refactoring imports
将来ESMに移行しやすいように Related: #7658 なんかmochaが起動しなくなってるけど理由不明 すぐ直したい
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import * as Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { deleteFileSync } from '../../../services/drive/delete-file';
|
||||
import { Users, DriveFiles } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { deleteFileSync } from '@/services/drive/delete-file.js';
|
||||
import { Users, DriveFiles } from '@/models/index.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('delete-drive-files');
|
||||
|
||||
|
@@ -2,13 +2,13 @@ import * as Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import addFile from '../../../services/drive/add-file';
|
||||
import dateFormat = require('dateformat');
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Blockings } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import addFile from '@/services/drive/add-file.js';
|
||||
import dateFormat from 'dateformat';
|
||||
import { getFullApAccount } from '@/misc/convert-host.js';
|
||||
import { Users, Blockings } from '@/models/index.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-blocking');
|
||||
|
||||
|
@@ -2,13 +2,13 @@ import * as Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import addFile from '../../../services/drive/add-file';
|
||||
import dateFormat = require('dateformat');
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Followings } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import addFile from '@/services/drive/add-file.js';
|
||||
import dateFormat from 'dateformat';
|
||||
import { getFullApAccount } from '@/misc/convert-host.js';
|
||||
import { Users, Followings } from '@/models/index.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-following');
|
||||
|
||||
|
@@ -2,13 +2,13 @@ import * as Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import addFile from '../../../services/drive/add-file';
|
||||
import dateFormat = require('dateformat');
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Mutings } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import addFile from '@/services/drive/add-file.js';
|
||||
import dateFormat from 'dateformat';
|
||||
import { getFullApAccount } from '@/misc/convert-host.js';
|
||||
import { Users, Mutings } from '@/models/index.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-mute');
|
||||
|
||||
|
@@ -2,14 +2,14 @@ import * as Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import addFile from '../../../services/drive/add-file';
|
||||
import dateFormat = require('dateformat');
|
||||
import { Users, Notes, Polls } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import addFile from '@/services/drive/add-file.js';
|
||||
import dateFormat from 'dateformat';
|
||||
import { Users, Notes, Polls } from '@/models/index.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
import { Poll } from '../../../models/entities/poll';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { Note } from '@/models/entities/note.js';
|
||||
import { Poll } from '@/models/entities/poll.js';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-notes');
|
||||
|
||||
|
@@ -2,13 +2,13 @@ import * as Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import addFile from '../../../services/drive/add-file';
|
||||
import dateFormat = require('dateformat');
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, UserLists, UserListJoinings } from '../../../models';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import addFile from '@/services/drive/add-file.js';
|
||||
import dateFormat from 'dateformat';
|
||||
import { getFullApAccount } from '@/misc/convert-host.js';
|
||||
import { Users, UserLists, UserListJoinings } from '@/models/index.js';
|
||||
import { In } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-user-lists');
|
||||
|
||||
|
@@ -1,13 +1,13 @@
|
||||
import * as Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import follow from '../../../services/following/create';
|
||||
import { parseAcct } from '@/misc/acct';
|
||||
import { resolveUser } from '../../../remote/resolve-user';
|
||||
import { downloadTextFile } from '@/misc/download-text-file';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||
import { Users, DriveFiles } from '../../../models';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import follow from '@/services/following/create.js';
|
||||
import { parseAcct } from '@/misc/acct.js';
|
||||
import { resolveUser } from '@/remote/resolve-user.js';
|
||||
import { downloadTextFile } from '@/misc/download-text-file.js';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host.js';
|
||||
import { Users, DriveFiles } from '@/models/index.js';
|
||||
import { DbUserImportJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('import-following');
|
||||
|
||||
|
@@ -1,14 +1,14 @@
|
||||
import * as Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { parseAcct } from '@/misc/acct';
|
||||
import { resolveUser } from '../../../remote/resolve-user';
|
||||
import { pushUserToUserList } from '../../../services/user-list/push';
|
||||
import { downloadTextFile } from '@/misc/download-text-file';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||
import { DriveFiles, Users, UserLists, UserListJoinings } from '../../../models';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { parseAcct } from '@/misc/acct.js';
|
||||
import { resolveUser } from '@/remote/resolve-user.js';
|
||||
import { pushUserToUserList } from '@/services/user-list/push.js';
|
||||
import { downloadTextFile } from '@/misc/download-text-file.js';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host.js';
|
||||
import { DriveFiles, Users, UserLists, UserListJoinings } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { DbUserImportJobData } from '@/queue/types.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('import-user-lists');
|
||||
|
||||
|
@@ -1,13 +1,13 @@
|
||||
import * as Bull from 'bull';
|
||||
import { DbJobData } from '@/queue/types';
|
||||
import { deleteDriveFiles } from './delete-drive-files';
|
||||
import { exportNotes } from './export-notes';
|
||||
import { exportFollowing } from './export-following';
|
||||
import { exportMute } from './export-mute';
|
||||
import { exportBlocking } from './export-blocking';
|
||||
import { exportUserLists } from './export-user-lists';
|
||||
import { importFollowing } from './import-following';
|
||||
import { importUserLists } from './import-user-lists';
|
||||
import { DbJobData } from '@/queue/types.js';
|
||||
import { deleteDriveFiles } from './delete-drive-files.js';
|
||||
import { exportNotes } from './export-notes.js';
|
||||
import { exportFollowing } from './export-following.js';
|
||||
import { exportMute } from './export-mute.js';
|
||||
import { exportBlocking } from './export-blocking.js';
|
||||
import { exportUserLists } from './export-user-lists.js';
|
||||
import { importFollowing } from './import-following.js';
|
||||
import { importUserLists } from './import-user-lists.js';
|
||||
|
||||
const jobs = {
|
||||
deleteDriveFiles,
|
||||
|
Reference in New Issue
Block a user