mirror of
https://github.com/sim1222/misskey.git
synced 2025-08-04 07:26:29 +09:00
refactor: Use ESM (#8358)
* wip * wip * fix * clean up * Update tsconfig.json * Update activitypub.ts * wip
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Blockings } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Blockings } from '@/models/index.js';
|
||||
import { Brackets, SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
// ここでいうBlockedは被Blockedの意
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { ChannelFollowings } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { ChannelFollowings } from '@/models/index.js';
|
||||
import { Brackets, SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
export function generateChannelQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { id } from '@/models/id';
|
||||
import { UserProfiles } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { id } from '@/models/id.js';
|
||||
import { UserProfiles } from '@/models/index.js';
|
||||
import { SelectQueryBuilder, Brackets } from 'typeorm';
|
||||
|
||||
function createMutesQuery(id: string) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { MutedNotes } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { MutedNotes } from '@/models/index.js';
|
||||
import { SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
export function generateMutedNoteQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { NoteThreadMutings } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { NoteThreadMutings } from '@/models/index.js';
|
||||
import { Brackets, SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
export function generateMutedNoteThreadQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Mutings } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Mutings } from '@/models/index.js';
|
||||
import { SelectQueryBuilder, Brackets } from 'typeorm';
|
||||
|
||||
export function generateMutedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }, exclude?: User) {
|
||||
|
@ -1,3 +1,3 @@
|
||||
import { secureRndstr } from '@/misc/secure-rndstr';
|
||||
import { secureRndstr } from '@/misc/secure-rndstr.js';
|
||||
|
||||
export default () => secureRndstr(16, true);
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Brackets, SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: Pick<User, 'id' | 'showTimelineReplies'> | null) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Followings } from '@/models/index';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Followings } from '@/models/index.js';
|
||||
import { Brackets, SelectQueryBuilder } from 'typeorm';
|
||||
|
||||
export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { IdentifiableError } from '@/misc/identifiable-error';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Note } from '@/models/entities/note';
|
||||
import { Notes, Users } from '@/models/index';
|
||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Note } from '@/models/entities/note.js';
|
||||
import { Notes, Users } from '@/models/index.js';
|
||||
|
||||
/**
|
||||
* Get note for API processing
|
||||
|
@ -1,9 +1,9 @@
|
||||
import rndstr from 'rndstr';
|
||||
import { Note } from '@/models/entities/note';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Notes, UserProfiles, NoteReactions } from '@/models/index';
|
||||
import { generateMutedUserQuery } from './generate-muted-user-query';
|
||||
import { generateBlockedUserQuery } from './generate-block-query';
|
||||
import { Note } from '@/models/entities/note.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Notes, UserProfiles, NoteReactions } from '@/models/index.js';
|
||||
import { generateMutedUserQuery } from './generate-muted-user-query.js';
|
||||
import { generateBlockedUserQuery } from './generate-block-query.js';
|
||||
|
||||
// TODO: リアクション、Renote、返信などをしたノートは除外する
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
import rndstr from 'rndstr';
|
||||
import { Note } from '@/models/entities/note';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { PromoReads, PromoNotes, Notes, Users } from '@/models/index';
|
||||
import { Note } from '@/models/entities/note.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { PromoReads, PromoNotes, Notes, Users } from '@/models/index.js';
|
||||
|
||||
export async function injectPromo(timeline: Note[], user?: User | null) {
|
||||
if (timeline.length < 5) return;
|
||||
|
@ -1,17 +1,17 @@
|
||||
import { publishMainStream, publishGroupMessagingStream } from '@/services/stream';
|
||||
import { publishMessagingStream } from '@/services/stream';
|
||||
import { publishMessagingIndexStream } from '@/services/stream';
|
||||
import { User, IRemoteUser } from '@/models/entities/user';
|
||||
import { MessagingMessage } from '@/models/entities/messaging-message';
|
||||
import { MessagingMessages, UserGroupJoinings, Users } from '@/models/index';
|
||||
import { publishMainStream, publishGroupMessagingStream } from '@/services/stream.js';
|
||||
import { publishMessagingStream } from '@/services/stream.js';
|
||||
import { publishMessagingIndexStream } from '@/services/stream.js';
|
||||
import { User, IRemoteUser } from '@/models/entities/user.js';
|
||||
import { MessagingMessage } from '@/models/entities/messaging-message.js';
|
||||
import { MessagingMessages, UserGroupJoinings, Users } from '@/models/index.js';
|
||||
import { In } from 'typeorm';
|
||||
import { IdentifiableError } from '@/misc/identifiable-error';
|
||||
import { UserGroup } from '@/models/entities/user-group';
|
||||
import { toArray } from '@/prelude/array';
|
||||
import { renderReadActivity } from '@/remote/activitypub/renderer/read';
|
||||
import { renderActivity } from '@/remote/activitypub/renderer/index';
|
||||
import { deliver } from '@/queue/index';
|
||||
import orderedCollection from '@/remote/activitypub/renderer/ordered-collection';
|
||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
||||
import { UserGroup } from '@/models/entities/user-group.js';
|
||||
import { toArray } from '@/prelude/array.js';
|
||||
import { renderReadActivity } from '@/remote/activitypub/renderer/read.js';
|
||||
import { renderActivity } from '@/remote/activitypub/renderer/index.js';
|
||||
import { deliver } from '@/queue/index.js';
|
||||
import orderedCollection from '@/remote/activitypub/renderer/ordered-collection.js';
|
||||
|
||||
/**
|
||||
* Mark messages as read
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { publishMainStream } from '@/services/stream';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Notification } from '@/models/entities/notification';
|
||||
import { Notifications, Users } from '@/models/index';
|
||||
import { publishMainStream } from '@/services/stream.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Notification } from '@/models/entities/notification.js';
|
||||
import { Notifications, Users } from '@/models/index.js';
|
||||
import { In } from 'typeorm';
|
||||
|
||||
export async function readNotification(
|
||||
|
@ -1,10 +1,10 @@
|
||||
import * as Koa from 'koa';
|
||||
import Koa from 'koa';
|
||||
|
||||
import config from '@/config/index';
|
||||
import { ILocalUser } from '@/models/entities/user';
|
||||
import { Signins } from '@/models/index';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { publishMainStream } from '@/services/stream';
|
||||
import config from '@/config/index.js';
|
||||
import { ILocalUser } from '@/models/entities/user.js';
|
||||
import { Signins } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { publishMainStream } from '@/services/stream.js';
|
||||
|
||||
export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
|
||||
if (redirect) {
|
||||
|
@ -1,15 +1,15 @@
|
||||
import * as bcrypt from 'bcryptjs';
|
||||
import { generateKeyPair } from 'crypto';
|
||||
import generateUserToken from './generate-native-user-token';
|
||||
import { User } from '@/models/entities/user';
|
||||
import { Users, UsedUsernames } from '@/models/index';
|
||||
import { UserProfile } from '@/models/entities/user-profile';
|
||||
import bcrypt from 'bcryptjs';
|
||||
import { generateKeyPair } from 'node:crypto';
|
||||
import generateUserToken from './generate-native-user-token.js';
|
||||
import { User } from '@/models/entities/user.js';
|
||||
import { Users, UsedUsernames } from '@/models/index.js';
|
||||
import { UserProfile } from '@/models/entities/user-profile.js';
|
||||
import { getConnection } from 'typeorm';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
import { toPunyNullable } from '@/misc/convert-host';
|
||||
import { UserKeypair } from '@/models/entities/user-keypair';
|
||||
import { usersChart } from '@/services/chart/index';
|
||||
import { UsedUsername } from '@/models/entities/used-username';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { toPunyNullable } from '@/misc/convert-host.js';
|
||||
import { UserKeypair } from '@/models/entities/user-keypair.js';
|
||||
import { usersChart } from '@/services/chart/index.js';
|
||||
import { UsedUsername } from '@/models/entities/used-username.js';
|
||||
|
||||
export async function signup(opts: {
|
||||
username: User['username'];
|
||||
|
Reference in New Issue
Block a user