sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Use ESM (#8358)

Browse Source 
* wip

* wip

* fix

* clean up

* Update tsconfig.json

* Update activitypub.ts

* wip
This commit is contained in:
syuilo
2022-02-27 11:07:39 +09:00
committed by GitHub
parent 0a882471f3
commit d071d18dd7
737 changed files with 4135 additions and 3678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/server/api/endpoints/i/2fa/done.ts
View File

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

14
packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
View File

@@ -1,16 +1,16 @@
import * as bcrypt from 'bcryptjs';
import { promisify } from 'util';
import bcrypt from 'bcryptjs';
import { promisify } from 'node:util';
import * as cbor from 'cbor';
import define from '../../../define';
import define from '../../../define.js';
import {
UserProfiles,
UserSecurityKeys,
AttestationChallenges,
Users,
} from '@/models/index';
import config from '@/config/index';
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;
const rpIdHashReal = hash(Buffer.from(config.hostname, 'utf-8'));

4
packages/backend/src/server/api/endpoints/i/2fa/password-less.ts
View File

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

14
packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
View File

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

8
packages/backend/src/server/api/endpoints/i/2fa/register.ts
View File

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

8
packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
View File

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

4
packages/backend/src/server/api/endpoints/i/apps.ts
View File

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

4
packages/backend/src/server/api/endpoints/i/authorized-apps.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/change-password.ts
View File

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

12
packages/backend/src/server/api/endpoints/i/delete-account.ts
View File

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

4
packages/backend/src/server/api/endpoints/i/export-blocking.ts
View File

@@ -1,5 +1,5 @@
import define from '../../define';
import { createExportBlockingJob } from '@/queue/index';
import define from '../../define.js';
import { createExportBlockingJob } from '@/queue/index.js';
import ms from 'ms';
export const meta = {

4
packages/backend/src/server/api/endpoints/i/export-following.ts
View File

@@ -1,5 +1,5 @@
import define from '../../define';
import { createExportFollowingJob } from '@/queue/index';
import define from '../../define.js';
import { createExportFollowingJob } from '@/queue/index.js';
import ms from 'ms';
export const meta = {

4
packages/backend/src/server/api/endpoints/i/export-mute.ts
View File

@@ -1,5 +1,5 @@
import define from '../../define';
import { createExportMuteJob } from '@/queue/index';
import define from '../../define.js';
import { createExportMuteJob } from '@/queue/index.js';
import ms from 'ms';
export const meta = {

4
packages/backend/src/server/api/endpoints/i/export-notes.ts
View File

@@ -1,5 +1,5 @@
import define from '../../define';
import { createExportNotesJob } from '@/queue/index';
import define from '../../define.js';
import { createExportNotesJob } from '@/queue/index.js';
import ms from 'ms';
export const meta = {

4
packages/backend/src/server/api/endpoints/i/export-user-lists.ts
View File

@@ -1,5 +1,5 @@
import define from '../../define';
import { createExportUserListsJob } from '@/queue/index';
import define from '../../define.js';
import { createExportUserListsJob } from '@/queue/index.js';
import ms from 'ms';
export const meta = {

6
packages/backend/src/server/api/endpoints/i/favorites.ts
View File

@@ -1,6 +1,6 @@
import define from '../../define';
import { NoteFavorites } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
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'],

6
packages/backend/src/server/api/endpoints/i/gallery/likes.ts
View File

@@ -1,6 +1,6 @@
import define from '../../../define';
import { GalleryLikes } from '@/models/index';
import { makePaginationQuery } from '../../../common/make-pagination-query';
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'],

6
packages/backend/src/server/api/endpoints/i/gallery/posts.ts
View File

@@ -1,6 +1,6 @@
import define from '../../../define';
import { GalleryPosts } from '@/models/index';
import { makePaginationQuery } from '../../../common/make-pagination-query';
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'],

4
packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
View File

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

8
packages/backend/src/server/api/endpoints/i/import-blocking.ts
View File

@@ -1,8 +1,8 @@
import define from '../../define';
import { createImportBlockingJob } from '@/queue/index';
import define from '../../define.js';
import { createImportBlockingJob } from '@/queue/index.js';
import ms from 'ms';
import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

8
packages/backend/src/server/api/endpoints/i/import-following.ts
View File

@@ -1,8 +1,8 @@
import define from '../../define';
import { createImportFollowingJob } from '@/queue/index';
import define from '../../define.js';
import { createImportFollowingJob } from '@/queue/index.js';
import ms from 'ms';
import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

8
packages/backend/src/server/api/endpoints/i/import-muting.ts
View File

@@ -1,8 +1,8 @@
import define from '../../define';
import { createImportMutingJob } from '@/queue/index';
import define from '../../define.js';
import { createImportMutingJob } from '@/queue/index.js';
import ms from 'ms';
import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

8
packages/backend/src/server/api/endpoints/i/import-user-lists.ts
View File

@@ -1,8 +1,8 @@
import define from '../../define';
import { createImportUserListsJob } from '@/queue/index';
import define from '../../define.js';
import { createImportUserListsJob } from '@/queue/index.js';
import ms from 'ms';
import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index';
import { ApiError } from '../../error.js';
import { DriveFiles } from '@/models/index.js';
export const meta = {
secure: true,

14
packages/backend/src/server/api/endpoints/i/notifications.ts
View File

@@ -1,10 +1,10 @@
import { readNotification } from '../../common/read-notification';
import define from '../../define';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { generateMutedInstanceNotificationQuery } from '../../common/generate-muted-instance-query';
import { Notifications, Followings, Mutings, Users } from '@/models/index';
import { notificationTypes } from '@/types';
import read from '@/services/note/read';
import { readNotification } from '../../common/read-notification.js';
import define from '../../define.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
import { generateMutedInstanceNotificationQuery } from '../../common/generate-muted-instance-query.js';
import { Notifications, Followings, Mutings, Users } from '@/models/index.js';
import { notificationTypes } from '@/types.js';
import read from '@/services/note/read.js';
import { Brackets } from 'typeorm';
export const meta = {

6
packages/backend/src/server/api/endpoints/i/page-likes.ts
View File

@@ -1,6 +1,6 @@
import define from '../../define';
import { PageLikes } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
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'],

6
packages/backend/src/server/api/endpoints/i/pages.ts
View File

@@ -1,6 +1,6 @@
import define from '../../define';
import { Pages } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
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'],

8
packages/backend/src/server/api/endpoints/i/pin.ts
View File

@@ -1,7 +1,7 @@
import { addPinned } from '@/services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '@/models/index';
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'],

6
packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts
View File

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

10
packages/backend/src/server/api/endpoints/i/read-announcement.ts
View File

@@ -1,8 +1,8 @@
import define from '../../define';
import { ApiError } from '../../error';
import { genId } from '@/misc/gen-id';
import { AnnouncementReads, Announcements, Users } from '@/models/index';
import { publishMainStream } from '@/services/stream';
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'],

10
packages/backend/src/server/api/endpoints/i/regenerate-token.ts
View File

@@ -1,8 +1,8 @@
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/index';
import bcrypt from 'bcryptjs';
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,

4
packages/backend/src/server/api/endpoints/i/registry/get-all.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
View File

@@ -1,6 +1,6 @@
import define from '../../../define';
import { RegistryItems } from '@/models/index';
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,

6
packages/backend/src/server/api/endpoints/i/registry/get.ts
View File

@@ -1,6 +1,6 @@
import define from '../../../define';
import { RegistryItems } from '@/models/index';
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,

4
packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
View File

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

4
packages/backend/src/server/api/endpoints/i/registry/keys.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/registry/remove.ts
View File

@@ -1,6 +1,6 @@
import define from '../../../define';
import { RegistryItems } from '@/models/index';
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,

4
packages/backend/src/server/api/endpoints/i/registry/scopes.ts
View File

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

8
packages/backend/src/server/api/endpoints/i/registry/set.ts
View File

@@ -1,7 +1,7 @@
import { publishMainStream } from '@/services/stream';
import define from '../../../define';
import { RegistryItems } from '@/models/index';
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,

6
packages/backend/src/server/api/endpoints/i/revoke-token.ts
View File

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

6
packages/backend/src/server/api/endpoints/i/signin-history.ts
View File

@@ -1,6 +1,6 @@
import define from '../../define';
import { Signins } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
import define from '../../define.js';
import { Signins } from '@/models/index.js';
import { makePaginationQuery } from '../../common/make-pagination-query.js';
export const meta = {
requireCredential: true,

8
packages/backend/src/server/api/endpoints/i/unpin.ts
View File

@@ -1,7 +1,7 @@
import { removePinned } from '@/services/i/pin';
import define from '../../define';
import { ApiError } from '../../error';
import { Users } from '@/models/index';
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'],

16
packages/backend/src/server/api/endpoints/i/update-email.ts
View File

@@ -1,13 +1,13 @@
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/index';
import config from '@/config/index.js';
import ms from 'ms';
import * as bcrypt from 'bcryptjs';
import { Users, UserProfiles } from '@/models/index';
import { sendEmail } from '@/services/send-email';
import { ApiError } from '../../error';
import { validateEmailForAccount } from '@/services/validate-email-for-account';
import bcrypt from 'bcryptjs';
import { Users, UserProfiles } from '@/models/index.js';
import { sendEmail } from '@/services/send-email.js';
import { ApiError } from '../../error.js';
import { validateEmailForAccount } from '@/services/validate-email-for-account.js';
export const meta = {
requireCredential: true,

30
packages/backend/src/server/api/endpoints/i/update.ts
View File

@@ -1,19 +1,19 @@
const RE2 = require('re2');
import RE2 from 're2';
import * as mfm from 'mfm-js';
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 { updateUsertags } from '@/services/update-hashtag';
import { ApiError } from '../../error';
import { Users, DriveFiles, UserProfiles, Pages } from '@/models/index';
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 { langmap } from '@/misc/langmap';
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 { 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';
import { langmap } from '@/misc/langmap.js';
export const meta = {
tags: ['account'],

6
packages/backend/src/server/api/endpoints/i/user-group-invites.ts
View File

@@ -1,6 +1,6 @@
import define from '../../define';
import { UserGroupInvitations } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
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'],