refactor: Use ESM (#8358)
* wip * wip * fix * clean up * Update tsconfig.json * Update activitypub.ts * wip
This commit is contained in:
@ -1,12 +1,12 @@
|
||||
import * as Bull from 'bull';
|
||||
import { queueLogger } from '../../logger';
|
||||
import { DriveFiles, Notes, UserProfiles, Users } from '@/models/index';
|
||||
import { DbUserDeleteJobData } from '@/queue/types';
|
||||
import { Note } from '@/models/entities/note';
|
||||
import { DriveFile } from '@/models/entities/drive-file';
|
||||
import Bull from 'bull';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { DriveFiles, Notes, UserProfiles, Users } from '@/models/index.js';
|
||||
import { DbUserDeleteJobData } from '@/queue/types.js';
|
||||
import { Note } from '@/models/entities/note.js';
|
||||
import { DriveFile } from '@/models/entities/drive-file.js';
|
||||
import { MoreThan } from 'typeorm';
|
||||
import { deleteFileSync } from '@/services/drive/delete-file';
|
||||
import { sendEmail } from '@/services/send-email';
|
||||
import { deleteFileSync } from '@/services/drive/delete-file.js';
|
||||
import { sendEmail } from '@/services/send-email.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('delete-account');
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { deleteFileSync } from '@/services/drive/delete-file';
|
||||
import { Users, DriveFiles } from '@/models/index';
|
||||
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');
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Blockings } from '@/models/index';
|
||||
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');
|
||||
|
||||
|
@ -1,17 +1,17 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { ulid } from 'ulid';
|
||||
const mime = require('mime-types');
|
||||
const archiver = require('archiver');
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import mime from 'mime-types';
|
||||
import archiver from 'archiver';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { Users, Emojis } from '@/models/index';
|
||||
import { } from '@/queue/types';
|
||||
import { downloadUrl } from '@/misc/download-url';
|
||||
import config from '@/config/index';
|
||||
import { Users, Emojis } from '@/models/index.js';
|
||||
import { } from '@/queue/types.js';
|
||||
import { downloadUrl } from '@/misc/download-url.js';
|
||||
import config from '@/config/index.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-custom-emojis');
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Followings, Mutings } from '@/models/index';
|
||||
import { getFullApAccount } from '@/misc/convert-host.js';
|
||||
import { Users, Followings, Mutings } from '@/models/index.js';
|
||||
import { In, MoreThan, Not } from 'typeorm';
|
||||
import { DbUserJobData } from '@/queue/types';
|
||||
import { Following } from '@/models/entities/following';
|
||||
import { DbUserJobData } from '@/queue/types.js';
|
||||
import { Following } from '@/models/entities/following.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('export-following');
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, Mutings } from '@/models/index';
|
||||
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');
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { Users, Notes, Polls } from '@/models/index';
|
||||
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');
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
import * as fs from 'node:fs';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { format as dateFormat } from 'date-fns';
|
||||
import { getFullApAccount } from '@/misc/convert-host';
|
||||
import { Users, UserLists, UserListJoinings } from '@/models/index';
|
||||
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 Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import * as Acct from 'misskey-js/built/acct';
|
||||
import { resolveUser } from '@/remote/resolve-user';
|
||||
import { downloadTextFile } from '@/misc/download-text-file';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||
import { Users, DriveFiles, Blockings } from '@/models/index';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import block from '@/services/blocking/create';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import * as Acct 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, Blockings } from '@/models/index.js';
|
||||
import { DbUserImportJobData } from '@/queue/types.js';
|
||||
import block from '@/services/blocking/create.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('import-blocking');
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
import * as tmp from 'tmp';
|
||||
import * as fs from 'fs';
|
||||
const unzipper = require('unzipper');
|
||||
import * as fs from 'node:fs';
|
||||
import unzipper from 'unzipper';
|
||||
import { getConnection } from 'typeorm';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import { downloadUrl } from '@/misc/download-url';
|
||||
import { DriveFiles, Emojis } from '@/models/index';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { addFile } from '@/services/drive/add-file';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import { downloadUrl } from '@/misc/download-url.js';
|
||||
import { DriveFiles, Emojis } from '@/models/index.js';
|
||||
import { DbUserImportJobData } from '@/queue/types.js';
|
||||
import { addFile } from '@/services/drive/add-file.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('import-custom-emojis');
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import follow from '@/services/following/create';
|
||||
import * as Acct from 'misskey-js/built/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/index';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import follow from '@/services/following/create.js';
|
||||
import * as Acct 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 Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import * as Acct from 'misskey-js/built/acct';
|
||||
import { resolveUser } from '@/remote/resolve-user';
|
||||
import { downloadTextFile } from '@/misc/download-text-file';
|
||||
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||
import { Users, DriveFiles, Mutings } from '@/models/index';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import * as Acct 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, Mutings } from '@/models/index.js';
|
||||
import { DbUserImportJobData } from '@/queue/types.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
|
||||
const logger = queueLogger.createSubLogger('import-muting');
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
import * as Bull from 'bull';
|
||||
import Bull from 'bull';
|
||||
|
||||
import { queueLogger } from '../../logger';
|
||||
import * as Acct from 'misskey-js/built/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/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { DbUserImportJobData } from '@/queue/types';
|
||||
import { queueLogger } from '../../logger.js';
|
||||
import * as Acct 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,18 +1,18 @@
|
||||
import * as Bull from 'bull';
|
||||
import { DbJobData } from '@/queue/types';
|
||||
import { deleteDriveFiles } from './delete-drive-files';
|
||||
import { exportCustomEmojis } from './export-custom-emojis';
|
||||
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 { deleteAccount } from './delete-account';
|
||||
import { importMuting } from './import-muting';
|
||||
import { importBlocking } from './import-blocking';
|
||||
import { importCustomEmojis } from './import-custom-emojis';
|
||||
import Bull from 'bull';
|
||||
import { DbJobData } from '@/queue/types.js';
|
||||
import { deleteDriveFiles } from './delete-drive-files.js';
|
||||
import { exportCustomEmojis } from './export-custom-emojis.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';
|
||||
import { deleteAccount } from './delete-account.js';
|
||||
import { importMuting } from './import-muting.js';
|
||||
import { importBlocking } from './import-blocking.js';
|
||||
import { importCustomEmojis } from './import-custom-emojis.js';
|
||||
|
||||
const jobs = {
|
||||
deleteDriveFiles,
|
||||
|
Reference in New Issue
Block a user