refactor: Use ESM (#8358)
* wip * wip * fix * clean up * Update tsconfig.json * Update activitypub.ts * wip
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import define from '../../define';
|
||||
import { Clips } from '@/models/index';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import define from '../../define.js';
|
||||
import { Clips } from '@/models/index.js';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users', 'clips'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { Users, Followings, UserProfiles } from '@/models/index';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { toPunyNullable } from '@/misc/convert-host';
|
||||
import define from '../../define.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { Users, Followings, UserProfiles } from '@/models/index.js';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query.js';
|
||||
import { toPunyNullable } from '@/misc/convert-host.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { Users, Followings, UserProfiles } from '@/models/index';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { toPunyNullable } from '@/misc/convert-host';
|
||||
import define from '../../define.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { Users, Followings, UserProfiles } from '@/models/index.js';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query.js';
|
||||
import { toPunyNullable } from '@/misc/convert-host.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -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: ['users', 'gallery'],
|
||||
|
@@ -1,9 +1,9 @@
|
||||
import define from '../../define';
|
||||
import { maximum } from '@/prelude/array';
|
||||
import { ApiError } from '../../error';
|
||||
import { getUser } from '../../common/getters';
|
||||
import define from '../../define.js';
|
||||
import { maximum } from '@/prelude/array.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { getUser } from '../../common/getters.js';
|
||||
import { Not, In, IsNull } from 'typeorm';
|
||||
import { Notes, Users } from '@/models/index';
|
||||
import { Notes, Users } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../../define';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { UserGroup } from '@/models/entities/user-group';
|
||||
import { UserGroupJoining } from '@/models/entities/user-group-joining';
|
||||
import define from '../../../define.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { UserGroup } from '@/models/entities/user-group.js';
|
||||
import { UserGroupJoining } from '@/models/entities/user-group-joining.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserGroups } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserGroups } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../../../define';
|
||||
import { ApiError } from '../../../../error';
|
||||
import { UserGroupJoinings, UserGroupInvitations } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { UserGroupJoining } from '@/models/entities/user-group-joining';
|
||||
import define from '../../../../define.js';
|
||||
import { ApiError } from '../../../../error.js';
|
||||
import { UserGroupJoinings, UserGroupInvitations } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { UserGroupJoining } from '@/models/entities/user-group-joining.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../../define';
|
||||
import { ApiError } from '../../../../error';
|
||||
import { UserGroupInvitations } from '@/models/index';
|
||||
import define from '../../../../define.js';
|
||||
import { ApiError } from '../../../../error.js';
|
||||
import { UserGroupInvitations } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,10 +1,10 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getUser } from '../../../common/getters';
|
||||
import { UserGroups, UserGroupJoinings, UserGroupInvitations } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { UserGroupInvitation } from '@/models/entities/user-group-invitation';
|
||||
import { createNotification } from '@/services/create-notification';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { getUser } from '../../../common/getters.js';
|
||||
import { UserGroups, UserGroupJoinings, UserGroupInvitations } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { UserGroupInvitation } from '@/models/entities/user-group-invitation.js';
|
||||
import { createNotification } from '@/services/create-notification.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import define from '../../../define';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
import { Not, In } from 'typeorm';
|
||||
|
||||
export const meta = {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import define from '../../../define';
|
||||
import { UserGroups } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { UserGroups } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'account'],
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getUser } from '../../../common/getters';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { getUser } from '../../../common/getters.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'account'],
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getUser } from '../../../common/getters';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { getUser } from '../../../common/getters.js';
|
||||
import { UserGroups, UserGroupJoinings } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups', 'users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserGroups } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserGroups } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['groups'],
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import define from '../../../define';
|
||||
import { UserLists } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { UserList } from '@/models/entities/user-list';
|
||||
import define from '../../../define.js';
|
||||
import { UserLists } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { UserList } from '@/models/entities/user-list.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserLists } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserLists } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists'],
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import define from '../../../define';
|
||||
import { UserLists } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { UserLists } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists', 'account'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import { publishUserListStream } from '@/services/stream';
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getUser } from '../../../common/getters';
|
||||
import { UserLists, UserListJoinings, Users } from '@/models/index';
|
||||
import { publishUserListStream } from '@/services/stream.js';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { getUser } from '../../../common/getters.js';
|
||||
import { UserLists, UserListJoinings, Users } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists', 'users'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getUser } from '../../../common/getters';
|
||||
import { pushUserToUserList } from '@/services/user-list/push';
|
||||
import { UserLists, UserListJoinings, Blockings } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { getUser } from '../../../common/getters.js';
|
||||
import { pushUserToUserList } from '@/services/user-list/push.js';
|
||||
import { UserLists, UserListJoinings, Blockings } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists', 'users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserLists } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserLists } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists', 'account'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { UserLists } from '@/models/index';
|
||||
import define from '../../../define.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { UserLists } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['lists'],
|
||||
|
@@ -1,13 +1,13 @@
|
||||
import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { getUser } from '../../common/getters';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { Notes } from '@/models/index';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
||||
import define from '../../define.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { getUser } from '../../common/getters.js';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query.js';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
|
||||
import { Notes } from '@/models/index.js';
|
||||
import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { generateBlockedUserQuery } from '../../common/generate-block-query';
|
||||
import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query';
|
||||
import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
|
||||
import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users', 'notes'],
|
||||
|
@@ -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: ['users', 'pages'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../define';
|
||||
import { NoteReactions, UserProfiles } from '@/models/index';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { ApiError } from '../../error';
|
||||
import define from '../../define.js';
|
||||
import { NoteReactions, UserProfiles } from '@/models/index.js';
|
||||
import { makePaginationQuery } from '../../common/make-pagination-query.js';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users', 'reactions'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import ms from 'ms';
|
||||
import define from '../../define';
|
||||
import { Users, Followings } from '@/models/index';
|
||||
import { generateMutedUserQueryForUsers } from '../../common/generate-muted-user-query';
|
||||
import { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../common/generate-block-query';
|
||||
import define from '../../define.js';
|
||||
import { Users, Followings } from '@/models/index.js';
|
||||
import { generateMutedUserQueryForUsers } from '../../common/generate-muted-user-query.js';
|
||||
import { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../common/generate-block-query.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import define from '../../define';
|
||||
import { Users } from '@/models/index';
|
||||
import define from '../../define.js';
|
||||
import { Users } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,12 +1,12 @@
|
||||
import * as sanitizeHtml from 'sanitize-html';
|
||||
import define from '../../define';
|
||||
import { publishAdminStream } from '@/services/stream';
|
||||
import { ApiError } from '../../error';
|
||||
import { getUser } from '../../common/getters';
|
||||
import { AbuseUserReports, Users } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { sendEmail } from '@/services/send-email';
|
||||
import { fetchMeta } from '@/misc/fetch-meta';
|
||||
import define from '../../define.js';
|
||||
import { publishAdminStream } from '@/services/stream.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { getUser } from '../../common/getters.js';
|
||||
import { AbuseUserReports, Users } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { sendEmail } from '@/services/send-email.js';
|
||||
import { fetchMeta } from '@/misc/fetch-meta.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../define';
|
||||
import { Followings, Users } from '@/models/index';
|
||||
import define from '../../define.js';
|
||||
import { Followings, Users } from '@/models/index.js';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { USER_ACTIVE_THRESHOLD } from '@/const';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { USER_ACTIVE_THRESHOLD } from '@/const.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../define';
|
||||
import { UserProfiles, Users } from '@/models/index';
|
||||
import { User } from '@/models/entities/user';
|
||||
import define from '../../define.js';
|
||||
import { UserProfiles, Users } from '@/models/index.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Brackets } from 'typeorm';
|
||||
|
||||
export const meta = {
|
||||
|
@@ -1,10 +1,10 @@
|
||||
import { resolveUser } from '@/remote/resolve-user';
|
||||
import define from '../../define';
|
||||
import { apiLogger } from '../../logger';
|
||||
import { ApiError } from '../../error';
|
||||
import { Users } from '@/models/index';
|
||||
import { resolveUser } from '@/remote/resolve-user.js';
|
||||
import define from '../../define.js';
|
||||
import { apiLogger } from '../../logger.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { Users } from '@/models/index.js';
|
||||
import { In } from 'typeorm';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { DriveFiles, Followings, NoteFavorites, NoteReactions, Notes, PageLikes, PollVotes, Users } from '@/models/index';
|
||||
import define from '../../define.js';
|
||||
import { ApiError } from '../../error.js';
|
||||
import { DriveFiles, Followings, NoteFavorites, NoteReactions, Notes, PageLikes, PollVotes, Users } from '@/models/index.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['users'],
|
||||
|
Reference in New Issue
Block a user