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 { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class AbuseUserReport { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { App } from './app'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { App } from './app.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class AccessToken { | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { Entity, Index, Column, PrimaryColumn } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Ad { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Announcement } from './announcement'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { Announcement } from './announcement.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'announcementId'], { unique: true }) | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { Entity, Index, Column, PrimaryColumn } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Announcement { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { Antenna } from './antenna'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { Antenna } from './antenna.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['noteId', 'antennaId'], { unique: true }) | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { UserList } from './user-list'; | ||||
| import { UserGroupJoining } from './user-group-joining'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { UserList } from './user-list.js'; | ||||
| import { UserGroupJoining } from './user-group-joining.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Antenna { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Entity, PrimaryColumn, Column, Index, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class App { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class AttestationChallenge { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { App } from './app'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { App } from './app.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class AuthSession { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['blockerId', 'blockeeId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Channel } from './channel'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { Channel } from './channel.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['followerId', 'followeeId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { Channel } from './channel'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { Channel } from './channel.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['channelId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Channel { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { Clip } from './clip'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { Clip } from './clip.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['noteId', 'clipId'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Clip { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { DriveFolder } from './drive-folder'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { DriveFolder } from './drive-folder.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'folderId', 'id']) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { JoinColumn, ManyToOne, Entity, PrimaryColumn, Index, Column } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class DriveFolder { | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['name', 'host'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['followerId', 'followeeId'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['followerId', 'followeeId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { GalleryPost } from './gallery-post'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { GalleryPost } from './gallery-post.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'postId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class GalleryPost { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Hashtag { | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Instance { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { id } from '../id'; | ||||
| import { UserGroup } from './user-group'; | ||||
| import { User } from './user.js'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { UserGroup } from './user-group.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class MessagingMessage { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Clip } from './clip'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { Clip } from './clip.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Meta { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class ModerationLog { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { mutedNoteReasons } from '../../types'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { mutedNoteReasons } from '../../types.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['noteId', 'userId'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['muterId', 'muteeId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Note } from './note'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Note } from './note'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'threadId'], { unique: true }) | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Note } from './note'; | ||||
| import { id } from '../id'; | ||||
| import { Channel } from './channel'; | ||||
| import { User } from './user.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { Channel } from './channel.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Note } from './note'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { id } from '../id'; | ||||
| import { noteVisibilities } from '../../types'; | ||||
| import { Channel } from './channel'; | ||||
| import { User } from './user.js'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { noteVisibilities } from '../../types.js'; | ||||
| import { Channel } from './channel.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index('IDX_NOTE_TAGS', { synchronize: false }) | ||||
|   | ||||
| @@ -1,11 +1,11 @@ | ||||
| import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note'; | ||||
| import { FollowRequest } from './follow-request'; | ||||
| import { UserGroupInvitation } from './user-group-invitation'; | ||||
| import { AccessToken } from './access-token'; | ||||
| import { notificationTypes } from '@/types'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { FollowRequest } from './follow-request.js'; | ||||
| import { UserGroupInvitation } from './user-group-invitation.js'; | ||||
| import { AccessToken } from './access-token.js'; | ||||
| import { notificationTypes } from '@/types.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Notification { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Page } from './page'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { Page } from './page.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'pageId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'name'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, Column, ManyToOne, JoinColumn } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id.js'; | ||||
| import { User } from './user.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class PasswordResetRequest { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { Note } from './note'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId', 'choice'], { unique: true }) | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { noteVisibilities } from '../../types'; | ||||
| import { id } from '../id.js'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { noteVisibilities } from '../../types.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Poll { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class PromoNote { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class RegistrationTicket { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| // TODO: 同じdomain、同じscope、同じkeyのレコードは二つ以上存在しないように制約付けたい | ||||
| @Entity() | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Relay { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class Signin { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class SwSubscription { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { UserGroup } from './user-group'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { UserGroup } from './user-group.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'userGroupId'], { unique: true }) | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { UserGroup } from './user-group'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { UserGroup } from './user-group.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'userGroupId'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserGroup { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserKeypair { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { UserList } from './user-list'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { UserList } from './user-list.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'userListId'], { unique: true }) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserList { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { Note } from './note'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { Note } from './note.js'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['userId', 'noteId'], { unique: true }) | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserPending { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user'; | ||||
| import { Page } from './page'; | ||||
| import { ffVisibility, notificationTypes } from '@/types'; | ||||
| import { id } from '../id.js'; | ||||
| import { User } from './user.js'; | ||||
| import { Page } from './page.js'; | ||||
| import { ffVisibility, notificationTypes } from '@/types.js'; | ||||
|  | ||||
| // TODO: このテーブルで管理している情報すべてレジストリで管理するようにしても良いかも | ||||
| //       ただ、「emailVerified が true なユーザーを find する」のようなクエリは書けなくなるからウーン | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserPublickey { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm'; | ||||
| import { User } from './user'; | ||||
| import { id } from '../id'; | ||||
| import { User } from './user.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| export class UserSecurityKey { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm'; | ||||
| import { DriveFile } from './drive-file'; | ||||
| import { id } from '../id'; | ||||
| import { DriveFile } from './drive-file.js'; | ||||
| import { id } from '../id.js'; | ||||
|  | ||||
| @Entity() | ||||
| @Index(['usernameLower', 'host'], { unique: true }) | ||||
|   | ||||
| @@ -1,67 +1,67 @@ | ||||
| import { getRepository, getCustomRepository } from 'typeorm'; | ||||
| import { Announcement } from './entities/announcement'; | ||||
| import { AnnouncementRead } from './entities/announcement-read'; | ||||
| import { Instance } from './entities/instance'; | ||||
| import { Poll } from './entities/poll'; | ||||
| import { PollVote } from './entities/poll-vote'; | ||||
| import { Meta } from './entities/meta'; | ||||
| import { SwSubscription } from './entities/sw-subscription'; | ||||
| import { NoteWatching } from './entities/note-watching'; | ||||
| import { NoteThreadMuting } from './entities/note-thread-muting'; | ||||
| import { NoteUnread } from './entities/note-unread'; | ||||
| import { RegistrationTicket } from './entities/registration-tickets'; | ||||
| import { UserRepository } from './repositories/user'; | ||||
| import { NoteRepository } from './repositories/note'; | ||||
| import { DriveFileRepository } from './repositories/drive-file'; | ||||
| import { DriveFolderRepository } from './repositories/drive-folder'; | ||||
| import { AccessToken } from './entities/access-token'; | ||||
| import { UserNotePining } from './entities/user-note-pining'; | ||||
| import { SigninRepository } from './repositories/signin'; | ||||
| import { MessagingMessageRepository } from './repositories/messaging-message'; | ||||
| import { UserListRepository } from './repositories/user-list'; | ||||
| import { UserListJoining } from './entities/user-list-joining'; | ||||
| import { UserGroupRepository } from './repositories/user-group'; | ||||
| import { UserGroupJoining } from './entities/user-group-joining'; | ||||
| import { UserGroupInvitationRepository } from './repositories/user-group-invitation'; | ||||
| import { FollowRequestRepository } from './repositories/follow-request'; | ||||
| import { MutingRepository } from './repositories/muting'; | ||||
| import { BlockingRepository } from './repositories/blocking'; | ||||
| import { NoteReactionRepository } from './repositories/note-reaction'; | ||||
| import { NotificationRepository } from './repositories/notification'; | ||||
| import { NoteFavoriteRepository } from './repositories/note-favorite'; | ||||
| import { UserPublickey } from './entities/user-publickey'; | ||||
| import { UserKeypair } from './entities/user-keypair'; | ||||
| import { AppRepository } from './repositories/app'; | ||||
| import { FollowingRepository } from './repositories/following'; | ||||
| import { AbuseUserReportRepository } from './repositories/abuse-user-report'; | ||||
| import { AuthSessionRepository } from './repositories/auth-session'; | ||||
| import { UserProfile } from './entities/user-profile'; | ||||
| import { AttestationChallenge } from './entities/attestation-challenge'; | ||||
| import { UserSecurityKey } from './entities/user-security-key'; | ||||
| import { HashtagRepository } from './repositories/hashtag'; | ||||
| import { PageRepository } from './repositories/page'; | ||||
| import { PageLikeRepository } from './repositories/page-like'; | ||||
| import { GalleryPostRepository } from './repositories/gallery-post'; | ||||
| import { GalleryLikeRepository } from './repositories/gallery-like'; | ||||
| import { ModerationLogRepository } from './repositories/moderation-logs'; | ||||
| import { UsedUsername } from './entities/used-username'; | ||||
| import { ClipRepository } from './repositories/clip'; | ||||
| import { ClipNote } from './entities/clip-note'; | ||||
| import { AntennaRepository } from './repositories/antenna'; | ||||
| import { AntennaNote } from './entities/antenna-note'; | ||||
| import { PromoNote } from './entities/promo-note'; | ||||
| import { PromoRead } from './entities/promo-read'; | ||||
| import { EmojiRepository } from './repositories/emoji'; | ||||
| import { RelayRepository } from './repositories/relay'; | ||||
| import { ChannelRepository } from './repositories/channel'; | ||||
| import { MutedNote } from './entities/muted-note'; | ||||
| import { ChannelFollowing } from './entities/channel-following'; | ||||
| import { ChannelNotePining } from './entities/channel-note-pining'; | ||||
| import { RegistryItem } from './entities/registry-item'; | ||||
| import { Ad } from './entities/ad'; | ||||
| import { PasswordResetRequest } from './entities/password-reset-request'; | ||||
| import { UserPending } from './entities/user-pending'; | ||||
| import { InstanceRepository } from './repositories/instance'; | ||||
| import { Announcement } from './entities/announcement.js'; | ||||
| import { AnnouncementRead } from './entities/announcement-read.js'; | ||||
| import { Instance } from './entities/instance.js'; | ||||
| import { Poll } from './entities/poll.js'; | ||||
| import { PollVote } from './entities/poll-vote.js'; | ||||
| import { Meta } from './entities/meta.js'; | ||||
| import { SwSubscription } from './entities/sw-subscription.js'; | ||||
| import { NoteWatching } from './entities/note-watching.js'; | ||||
| import { NoteThreadMuting } from './entities/note-thread-muting.js'; | ||||
| import { NoteUnread } from './entities/note-unread.js'; | ||||
| import { RegistrationTicket } from './entities/registration-tickets.js'; | ||||
| import { UserRepository } from './repositories/user.js'; | ||||
| import { NoteRepository } from './repositories/note.js'; | ||||
| import { DriveFileRepository } from './repositories/drive-file.js'; | ||||
| import { DriveFolderRepository } from './repositories/drive-folder.js'; | ||||
| import { AccessToken } from './entities/access-token.js'; | ||||
| import { UserNotePining } from './entities/user-note-pining.js'; | ||||
| import { SigninRepository } from './repositories/signin.js'; | ||||
| import { MessagingMessageRepository } from './repositories/messaging-message.js'; | ||||
| import { UserListRepository } from './repositories/user-list.js'; | ||||
| import { UserListJoining } from './entities/user-list-joining.js'; | ||||
| import { UserGroupRepository } from './repositories/user-group.js'; | ||||
| import { UserGroupJoining } from './entities/user-group-joining.js'; | ||||
| import { UserGroupInvitationRepository } from './repositories/user-group-invitation.js'; | ||||
| import { FollowRequestRepository } from './repositories/follow-request.js'; | ||||
| import { MutingRepository } from './repositories/muting.js'; | ||||
| import { BlockingRepository } from './repositories/blocking.js'; | ||||
| import { NoteReactionRepository } from './repositories/note-reaction.js'; | ||||
| import { NotificationRepository } from './repositories/notification.js'; | ||||
| import { NoteFavoriteRepository } from './repositories/note-favorite.js'; | ||||
| import { UserPublickey } from './entities/user-publickey.js'; | ||||
| import { UserKeypair } from './entities/user-keypair.js'; | ||||
| import { AppRepository } from './repositories/app.js'; | ||||
| import { FollowingRepository } from './repositories/following.js'; | ||||
| import { AbuseUserReportRepository } from './repositories/abuse-user-report.js'; | ||||
| import { AuthSessionRepository } from './repositories/auth-session.js'; | ||||
| import { UserProfile } from './entities/user-profile.js'; | ||||
| import { AttestationChallenge } from './entities/attestation-challenge.js'; | ||||
| import { UserSecurityKey } from './entities/user-security-key.js'; | ||||
| import { HashtagRepository } from './repositories/hashtag.js'; | ||||
| import { PageRepository } from './repositories/page.js'; | ||||
| import { PageLikeRepository } from './repositories/page-like.js'; | ||||
| import { GalleryPostRepository } from './repositories/gallery-post.js'; | ||||
| import { GalleryLikeRepository } from './repositories/gallery-like.js'; | ||||
| import { ModerationLogRepository } from './repositories/moderation-logs.js'; | ||||
| import { UsedUsername } from './entities/used-username.js'; | ||||
| import { ClipRepository } from './repositories/clip.js'; | ||||
| import { ClipNote } from './entities/clip-note.js'; | ||||
| import { AntennaRepository } from './repositories/antenna.js'; | ||||
| import { AntennaNote } from './entities/antenna-note.js'; | ||||
| import { PromoNote } from './entities/promo-note.js'; | ||||
| import { PromoRead } from './entities/promo-read.js'; | ||||
| import { EmojiRepository } from './repositories/emoji.js'; | ||||
| import { RelayRepository } from './repositories/relay.js'; | ||||
| import { ChannelRepository } from './repositories/channel.js'; | ||||
| import { MutedNote } from './entities/muted-note.js'; | ||||
| import { ChannelFollowing } from './entities/channel-following.js'; | ||||
| import { ChannelNotePining } from './entities/channel-note-pining.js'; | ||||
| import { RegistryItem } from './entities/registry-item.js'; | ||||
| import { Ad } from './entities/ad.js'; | ||||
| import { PasswordResetRequest } from './entities/password-reset-request.js'; | ||||
| import { UserPending } from './entities/user-pending.js'; | ||||
| import { InstanceRepository } from './repositories/instance.js'; | ||||
|  | ||||
| export const Announcements = getRepository(Announcement); | ||||
| export const AnnouncementReads = getRepository(AnnouncementRead); | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Users } from '../index'; | ||||
| import { AbuseUserReport } from '@/models/entities/abuse-user-report'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Users } from '../index.js'; | ||||
| import { AbuseUserReport } from '@/models/entities/abuse-user-report.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
|  | ||||
| @EntityRepository(AbuseUserReport) | ||||
| export class AbuseUserReportRepository extends Repository<AbuseUserReport> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Antenna } from '@/models/entities/antenna'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { AntennaNotes, UserGroupJoinings } from '../index'; | ||||
| import { Antenna } from '@/models/entities/antenna.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { AntennaNotes, UserGroupJoinings } from '../index.js'; | ||||
|  | ||||
| @EntityRepository(Antenna) | ||||
| export class AntennaRepository extends Repository<Antenna> { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { App } from '@/models/entities/app'; | ||||
| import { AccessTokens } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { User } from '../entities/user'; | ||||
| import { App } from '@/models/entities/app.js'; | ||||
| import { AccessTokens } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { User } from '../entities/user.js'; | ||||
|  | ||||
| @EntityRepository(App) | ||||
| export class AppRepository extends Repository<App> { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Apps } from '../index'; | ||||
| import { AuthSession } from '@/models/entities/auth-session'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Apps } from '../index.js'; | ||||
| import { AuthSession } from '@/models/entities/auth-session.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(AuthSession) | ||||
| export class AuthSessionRepository extends Repository<AuthSession> { | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Users } from '../index'; | ||||
| import { Blocking } from '@/models/entities/blocking'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Users } from '../index.js'; | ||||
| import { Blocking } from '@/models/entities/blocking.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(Blocking) | ||||
| export class BlockingRepository extends Repository<Blocking> { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Channel } from '@/models/entities/channel'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { DriveFiles, ChannelFollowings, NoteUnreads } from '../index'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Channel } from '@/models/entities/channel.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { DriveFiles, ChannelFollowings, NoteUnreads } from '../index.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(Channel) | ||||
| export class ChannelRepository extends Repository<Channel> { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Clip } from '@/models/entities/clip'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Users } from '../index'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Clip } from '@/models/entities/clip.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { Users } from '../index.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
|  | ||||
| @EntityRepository(Clip) | ||||
| export class ClipRepository extends Repository<Clip> { | ||||
|   | ||||
| @@ -1,14 +1,14 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { DriveFile } from '@/models/entities/drive-file'; | ||||
| import { Users, DriveFolders } from '../index'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { toPuny } from '@/misc/convert-host'; | ||||
| import { awaitAll, Promiseable } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import config from '@/config/index'; | ||||
| import { query, appendQuery } from '@/prelude/url'; | ||||
| import { Meta } from '@/models/entities/meta'; | ||||
| import { fetchMeta } from '@/misc/fetch-meta'; | ||||
| import { DriveFile } from '@/models/entities/drive-file.js'; | ||||
| import { Users, DriveFolders } from '../index.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
| import { toPuny } from '@/misc/convert-host.js'; | ||||
| import { awaitAll, Promiseable } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import config from '@/config/index.js'; | ||||
| import { query, appendQuery } from '@/prelude/url.js'; | ||||
| import { Meta } from '@/models/entities/meta.js'; | ||||
| import { fetchMeta } from '@/misc/fetch-meta.js'; | ||||
|  | ||||
| type PackOptions = { | ||||
| 	detail?: boolean, | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { DriveFolders, DriveFiles } from '../index'; | ||||
| import { DriveFolder } from '@/models/entities/drive-folder'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { DriveFolders, DriveFiles } from '../index.js'; | ||||
| import { DriveFolder } from '@/models/entities/drive-folder.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(DriveFolder) | ||||
| export class DriveFolderRepository extends Repository<DriveFolder> { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Emoji } from '@/models/entities/emoji'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Emoji } from '@/models/entities/emoji.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(Emoji) | ||||
| export class EmojiRepository extends Repository<Emoji> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { FollowRequest } from '@/models/entities/follow-request'; | ||||
| import { Users } from '../index'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { FollowRequest } from '@/models/entities/follow-request.js'; | ||||
| import { Users } from '../index.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(FollowRequest) | ||||
| export class FollowRequestRepository extends Repository<FollowRequest> { | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Users } from '../index'; | ||||
| import { Following } from '@/models/entities/following'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Users } from '../index.js'; | ||||
| import { Following } from '@/models/entities/following.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| type LocalFollowerFollowing = Following & { | ||||
| 	followerHost: null; | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { GalleryLike } from '@/models/entities/gallery-like'; | ||||
| import { GalleryPosts } from '../index'; | ||||
| import { GalleryLike } from '@/models/entities/gallery-like.js'; | ||||
| import { GalleryPosts } from '../index.js'; | ||||
|  | ||||
| @EntityRepository(GalleryLike) | ||||
| export class GalleryLikeRepository extends Repository<GalleryLike> { | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { GalleryPost } from '@/models/entities/gallery-post'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Users, DriveFiles, GalleryLikes } from '../index'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { GalleryPost } from '@/models/entities/gallery-post.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { Users, DriveFiles, GalleryLikes } from '../index.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(GalleryPost) | ||||
| export class GalleryPostRepository extends Repository<GalleryPost> { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Hashtag } from '@/models/entities/hashtag'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Hashtag } from '@/models/entities/hashtag.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(Hashtag) | ||||
| export class HashtagRepository extends Repository<Hashtag> { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Instance } from '@/models/entities/instance'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Instance } from '@/models/entities/instance.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(Instance) | ||||
| export class InstanceRepository extends Repository<Instance> { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { MessagingMessage } from '@/models/entities/messaging-message'; | ||||
| import { Users, DriveFiles, UserGroups } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { MessagingMessage } from '@/models/entities/messaging-message.js'; | ||||
| import { Users, DriveFiles, UserGroups } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(MessagingMessage) | ||||
| export class MessagingMessageRepository extends Repository<MessagingMessage> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Users } from '../index'; | ||||
| import { ModerationLog } from '@/models/entities/moderation-log'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Users } from '../index.js'; | ||||
| import { ModerationLog } from '@/models/entities/moderation-log.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
|  | ||||
| @EntityRepository(ModerationLog) | ||||
| export class ModerationLogRepository extends Repository<ModerationLog> { | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Users } from '../index'; | ||||
| import { Muting } from '@/models/entities/muting'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Users } from '../index.js'; | ||||
| import { Muting } from '@/models/entities/muting.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(Muting) | ||||
| export class MutingRepository extends Repository<Muting> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { NoteFavorite } from '@/models/entities/note-favorite'; | ||||
| import { Notes } from '../index'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { NoteFavorite } from '@/models/entities/note-favorite.js'; | ||||
| import { Notes } from '../index.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(NoteFavorite) | ||||
| export class NoteFavoriteRepository extends Repository<NoteFavorite> { | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction'; | ||||
| import { Notes, Users } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { convertLegacyReaction } from '@/misc/reaction-lib'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction.js'; | ||||
| import { Notes, Users } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { convertLegacyReaction } from '@/misc/reaction-lib.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(NoteReaction) | ||||
| export class NoteReactionRepository extends Repository<NoteReaction> { | ||||
|   | ||||
| @@ -1,14 +1,14 @@ | ||||
| import { EntityRepository, Repository, In } from 'typeorm'; | ||||
| import * as mfm from 'mfm-js'; | ||||
| import { Note } from '@/models/entities/note'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { nyaize } from '@/misc/nyaize'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction'; | ||||
| import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis'; | ||||
| import { Note } from '@/models/entities/note.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
| import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { nyaize } from '@/misc/nyaize.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib.js'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction.js'; | ||||
| import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis.js'; | ||||
|  | ||||
| @EntityRepository(Note) | ||||
| export class NoteRepository extends Repository<Note> { | ||||
|   | ||||
| @@ -1,13 +1,13 @@ | ||||
| import { EntityRepository, In, Repository } from 'typeorm'; | ||||
| import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index'; | ||||
| import { Notification } from '@/models/entities/notification'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Note } from '@/models/entities/note'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis'; | ||||
| import { notificationTypes } from '@/types'; | ||||
| import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index.js'; | ||||
| import { Notification } from '@/models/entities/notification.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { Note } from '@/models/entities/note.js'; | ||||
| import { NoteReaction } from '@/models/entities/note-reaction.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
| import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis.js'; | ||||
| import { notificationTypes } from '@/types.js'; | ||||
|  | ||||
| @EntityRepository(Notification) | ||||
| export class NotificationRepository extends Repository<Notification> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { PageLike } from '@/models/entities/page-like'; | ||||
| import { Pages } from '../index'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { PageLike } from '@/models/entities/page-like.js'; | ||||
| import { Pages } from '../index.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(PageLike) | ||||
| export class PageLikeRepository extends Repository<PageLike> { | ||||
|   | ||||
| @@ -1,10 +1,10 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Page } from '@/models/entities/page'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { Users, DriveFiles, PageLikes } from '../index'; | ||||
| import { awaitAll } from '@/prelude/await-all'; | ||||
| import { DriveFile } from '@/models/entities/drive-file'; | ||||
| import { User } from '@/models/entities/user'; | ||||
| import { Page } from '@/models/entities/page.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { Users, DriveFiles, PageLikes } from '../index.js'; | ||||
| import { awaitAll } from '@/prelude/await-all.js'; | ||||
| import { DriveFile } from '@/models/entities/drive-file.js'; | ||||
| import { User } from '@/models/entities/user.js'; | ||||
|  | ||||
| @EntityRepository(Page) | ||||
| export class PageRepository extends Repository<Page> { | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Relay } from '@/models/entities/relay'; | ||||
| import { Relay } from '@/models/entities/relay.js'; | ||||
|  | ||||
| @EntityRepository(Relay) | ||||
| export class RelayRepository extends Repository<Relay> { | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { Signin } from '@/models/entities/signin'; | ||||
| import { Signin } from '@/models/entities/signin.js'; | ||||
|  | ||||
| @EntityRepository(Signin) | ||||
| export class SigninRepository extends Repository<Signin> { | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { UserGroupInvitation } from '@/models/entities/user-group-invitation'; | ||||
| import { UserGroups } from '../index'; | ||||
| import { UserGroupInvitation } from '@/models/entities/user-group-invitation.js'; | ||||
| import { UserGroups } from '../index.js'; | ||||
|  | ||||
| @EntityRepository(UserGroupInvitation) | ||||
| export class UserGroupInvitationRepository extends Repository<UserGroupInvitation> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { UserGroup } from '@/models/entities/user-group'; | ||||
| import { UserGroupJoinings } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { UserGroup } from '@/models/entities/user-group.js'; | ||||
| import { UserGroupJoinings } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(UserGroup) | ||||
| export class UserGroupRepository extends Repository<UserGroup> { | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { EntityRepository, Repository } from 'typeorm'; | ||||
| import { UserList } from '@/models/entities/user-list'; | ||||
| import { UserListJoinings } from '../index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { UserList } from '@/models/entities/user-list.js'; | ||||
| import { UserListJoinings } from '../index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
|  | ||||
| @EntityRepository(UserList) | ||||
| export class UserListRepository extends Repository<UserList> { | ||||
|   | ||||
| @@ -1,13 +1,13 @@ | ||||
| import { EntityRepository, Repository, In, Not } from 'typeorm'; | ||||
| import * as Ajv from 'ajv'; | ||||
| import { User, ILocalUser, IRemoteUser } from '@/models/entities/user'; | ||||
| import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '../index'; | ||||
| import config from '@/config/index'; | ||||
| import { Packed } from '@/misc/schema'; | ||||
| import { awaitAll, Promiseable } from '@/prelude/await-all'; | ||||
| import { populateEmojis } from '@/misc/populate-emojis'; | ||||
| import { getAntennas } from '@/misc/antenna-cache'; | ||||
| import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const'; | ||||
| import Ajv from 'ajv'; | ||||
| import { User, ILocalUser, IRemoteUser } from '@/models/entities/user.js'; | ||||
| import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '../index.js'; | ||||
| import config from '@/config/index.js'; | ||||
| import { Packed } from '@/misc/schema.js'; | ||||
| import { awaitAll, Promiseable } from '@/prelude/await-all.js'; | ||||
| import { populateEmojis } from '@/misc/populate-emojis.js'; | ||||
| import { getAntennas } from '@/misc/antenna-cache.js'; | ||||
| import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js'; | ||||
|  | ||||
| type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>; | ||||
| type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> = | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import config from "@/config"; | ||||
| import config from '@/config/index.js'; | ||||
|  | ||||
| export const packedFederationInstanceSchema = { | ||||
| 	type: 'object', | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import { notificationTypes } from "@/types"; | ||||
| import { notificationTypes } from '@/types.js'; | ||||
|  | ||||
| export const packedNotificationSchema = { | ||||
| 	type: 'object', | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo