summaryrefslogtreecommitdiff
path: root/src/models/entities
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-19 21:55:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-19 21:55:45 +0900
commit42cc93dd0f189995f29fc87d2734fc809105a7cf (patch)
tree7a74658a76d71d4c07bf89a7028fa1786af0e13e /src/models/entities
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadmisskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.gz
misskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.bz2
misskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.zip
fix: mochaが動かないため拡張子なしに戻した
Diffstat (limited to 'src/models/entities')
-rw-r--r--src/models/entities/abuse-user-report.ts4
-rw-r--r--src/models/entities/access-token.ts6
-rw-r--r--src/models/entities/ad.ts2
-rw-r--r--src/models/entities/announcement-read.ts6
-rw-r--r--src/models/entities/announcement.ts2
-rw-r--r--src/models/entities/antenna-note.ts6
-rw-r--r--src/models/entities/antenna.ts8
-rw-r--r--src/models/entities/app.ts4
-rw-r--r--src/models/entities/attestation-challenge.ts4
-rw-r--r--src/models/entities/auth-session.ts6
-rw-r--r--src/models/entities/blocking.ts4
-rw-r--r--src/models/entities/channel-following.ts6
-rw-r--r--src/models/entities/channel-note-pining.ts6
-rw-r--r--src/models/entities/channel.ts6
-rw-r--r--src/models/entities/clip-note.ts6
-rw-r--r--src/models/entities/clip.ts4
-rw-r--r--src/models/entities/drive-file.ts6
-rw-r--r--src/models/entities/drive-folder.ts4
-rw-r--r--src/models/entities/emoji.ts2
-rw-r--r--src/models/entities/follow-request.ts4
-rw-r--r--src/models/entities/following.ts4
-rw-r--r--src/models/entities/gallery-like.ts6
-rw-r--r--src/models/entities/gallery-post.ts6
-rw-r--r--src/models/entities/games/reversi/game.ts4
-rw-r--r--src/models/entities/games/reversi/matching.ts4
-rw-r--r--src/models/entities/hashtag.ts4
-rw-r--r--src/models/entities/instance.ts2
-rw-r--r--src/models/entities/log.ts2
-rw-r--r--src/models/entities/messaging-message.ts8
-rw-r--r--src/models/entities/meta.ts6
-rw-r--r--src/models/entities/moderation-log.ts4
-rw-r--r--src/models/entities/muted-note.ts8
-rw-r--r--src/models/entities/muting.ts4
-rw-r--r--src/models/entities/note-favorite.ts6
-rw-r--r--src/models/entities/note-reaction.ts6
-rw-r--r--src/models/entities/note-unread.ts8
-rw-r--r--src/models/entities/note-watching.ts6
-rw-r--r--src/models/entities/note.ts10
-rw-r--r--src/models/entities/notification.ts14
-rw-r--r--src/models/entities/page-like.ts6
-rw-r--r--src/models/entities/page.ts6
-rw-r--r--src/models/entities/password-reset-request.ts4
-rw-r--r--src/models/entities/poll-vote.ts6
-rw-r--r--src/models/entities/poll.ts8
-rw-r--r--src/models/entities/promo-note.ts6
-rw-r--r--src/models/entities/promo-read.ts6
-rw-r--r--src/models/entities/registration-tickets.ts2
-rw-r--r--src/models/entities/registry-item.ts4
-rw-r--r--src/models/entities/relay.ts2
-rw-r--r--src/models/entities/signin.ts4
-rw-r--r--src/models/entities/sw-subscription.ts4
-rw-r--r--src/models/entities/user-group-invitation.ts6
-rw-r--r--src/models/entities/user-group-joining.ts6
-rw-r--r--src/models/entities/user-group.ts4
-rw-r--r--src/models/entities/user-keypair.ts4
-rw-r--r--src/models/entities/user-list-joining.ts6
-rw-r--r--src/models/entities/user-list.ts4
-rw-r--r--src/models/entities/user-note-pining.ts6
-rw-r--r--src/models/entities/user-profile.ts8
-rw-r--r--src/models/entities/user-publickey.ts4
-rw-r--r--src/models/entities/user-security-key.ts4
-rw-r--r--src/models/entities/user.ts4
62 files changed, 161 insertions, 161 deletions
diff --git a/src/models/entities/abuse-user-report.ts b/src/models/entities/abuse-user-report.ts
index cb13921222..c0cff139f6 100644
--- a/src/models/entities/abuse-user-report.ts
+++ b/src/models/entities/abuse-user-report.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class AbuseUserReport {
diff --git a/src/models/entities/access-token.ts b/src/models/entities/access-token.ts
index c2d034af87..5f41b3c1fc 100644
--- a/src/models/entities/access-token.ts
+++ b/src/models/entities/access-token.ts
@@ -1,7 +1,7 @@
import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
-import { User } from './user.js';
-import { App } from './app.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { App } from './app';
+import { id } from '../id';
@Entity()
export class AccessToken {
diff --git a/src/models/entities/ad.ts b/src/models/entities/ad.ts
index 1b0cfa06d3..b2fc04c4f0 100644
--- a/src/models/entities/ad.ts
+++ b/src/models/entities/ad.ts
@@ -1,5 +1,5 @@
import { Entity, Index, Column, PrimaryColumn } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class Ad {
diff --git a/src/models/entities/announcement-read.ts b/src/models/entities/announcement-read.ts
index 56ee2e6905..892beb826f 100644
--- a/src/models/entities/announcement-read.ts
+++ b/src/models/entities/announcement-read.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { Announcement } from './announcement.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { Announcement } from './announcement';
+import { id } from '../id';
@Entity()
@Index(['userId', 'announcementId'], { unique: true })
diff --git a/src/models/entities/announcement.ts b/src/models/entities/announcement.ts
index 1569ca89c7..06d379c229 100644
--- a/src/models/entities/announcement.ts
+++ b/src/models/entities/announcement.ts
@@ -1,5 +1,5 @@
import { Entity, Index, Column, PrimaryColumn } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class Announcement {
diff --git a/src/models/entities/antenna-note.ts b/src/models/entities/antenna-note.ts
index ecf2973919..9b911524ef 100644
--- a/src/models/entities/antenna-note.ts
+++ b/src/models/entities/antenna-note.ts
@@ -1,7 +1,7 @@
import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
-import { Note } from './note.js';
-import { Antenna } from './antenna.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { Antenna } from './antenna';
+import { id } from '../id';
@Entity()
@Index(['noteId', 'antennaId'], { unique: true })
diff --git a/src/models/entities/antenna.ts b/src/models/entities/antenna.ts
index 5dc814e1d5..bcfe09a829 100644
--- a/src/models/entities/antenna.ts
+++ b/src/models/entities/antenna.ts
@@ -1,8 +1,8 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { UserList } from './user-list.js';
-import { UserGroupJoining } from './user-group-joining.js';
+import { User } from './user';
+import { id } from '../id';
+import { UserList } from './user-list';
+import { UserGroupJoining } from './user-group-joining';
@Entity()
export class Antenna {
diff --git a/src/models/entities/app.ts b/src/models/entities/app.ts
index c3a6a0a107..ea87546311 100644
--- a/src/models/entities/app.ts
+++ b/src/models/entities/app.ts
@@ -1,6 +1,6 @@
import { Entity, PrimaryColumn, Column, Index, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class App {
diff --git a/src/models/entities/attestation-challenge.ts b/src/models/entities/attestation-challenge.ts
index 26a212e0c6..942747c02f 100644
--- a/src/models/entities/attestation-challenge.ts
+++ b/src/models/entities/attestation-challenge.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class AttestationChallenge {
diff --git a/src/models/entities/auth-session.ts b/src/models/entities/auth-session.ts
index f0480abcc6..4eec27e3f6 100644
--- a/src/models/entities/auth-session.ts
+++ b/src/models/entities/auth-session.ts
@@ -1,7 +1,7 @@
import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
-import { User } from './user.js';
-import { App } from './app.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { App } from './app';
+import { id } from '../id';
@Entity()
export class AuthSession {
diff --git a/src/models/entities/blocking.ts b/src/models/entities/blocking.ts
index 2fff80cfc1..48487cb086 100644
--- a/src/models/entities/blocking.ts
+++ b/src/models/entities/blocking.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['blockerId', 'blockeeId'], { unique: true })
diff --git a/src/models/entities/channel-following.ts b/src/models/entities/channel-following.ts
index 6e5c9cba04..fca801e5ab 100644
--- a/src/models/entities/channel-following.ts
+++ b/src/models/entities/channel-following.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { Channel } from './channel.js';
+import { User } from './user';
+import { id } from '../id';
+import { Channel } from './channel';
@Entity()
@Index(['followerId', 'followeeId'], { unique: true })
diff --git a/src/models/entities/channel-note-pining.ts b/src/models/entities/channel-note-pining.ts
index 751af4a183..26a7eb501f 100644
--- a/src/models/entities/channel-note-pining.ts
+++ b/src/models/entities/channel-note-pining.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { Note } from './note.js';
-import { Channel } from './channel.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { Channel } from './channel';
+import { id } from '../id';
@Entity()
@Index(['channelId', 'noteId'], { unique: true })
diff --git a/src/models/entities/channel.ts b/src/models/entities/channel.ts
index adf937c0b4..f2d713612d 100644
--- a/src/models/entities/channel.ts
+++ b/src/models/entities/channel.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { DriveFile } from './drive-file.js';
+import { User } from './user';
+import { id } from '../id';
+import { DriveFile } from './drive-file';
@Entity()
export class Channel {
diff --git a/src/models/entities/clip-note.ts b/src/models/entities/clip-note.ts
index 41d92b0c74..7d96b2ef7a 100644
--- a/src/models/entities/clip-note.ts
+++ b/src/models/entities/clip-note.ts
@@ -1,7 +1,7 @@
import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
-import { Note } from './note.js';
-import { Clip } from './clip.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { Clip } from './clip';
+import { id } from '../id';
@Entity()
@Index(['noteId', 'clipId'], { unique: true })
diff --git a/src/models/entities/clip.ts b/src/models/entities/clip.ts
index 1cdf4c52eb..66b5b8847e 100644
--- a/src/models/entities/clip.ts
+++ b/src/models/entities/clip.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class Clip {
diff --git a/src/models/entities/drive-file.ts b/src/models/entities/drive-file.ts
index 41d68a1334..698dfac222 100644
--- a/src/models/entities/drive-file.ts
+++ b/src/models/entities/drive-file.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { DriveFolder } from './drive-folder.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { DriveFolder } from './drive-folder';
+import { id } from '../id';
@Entity()
@Index(['userId', 'folderId', 'id'])
diff --git a/src/models/entities/drive-folder.ts b/src/models/entities/drive-folder.ts
index f137dd5c6a..a80d075855 100644
--- a/src/models/entities/drive-folder.ts
+++ b/src/models/entities/drive-folder.ts
@@ -1,6 +1,6 @@
import { JoinColumn, ManyToOne, Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class DriveFolder {
diff --git a/src/models/entities/emoji.ts b/src/models/entities/emoji.ts
index 3da4c6b416..d6080ae099 100644
--- a/src/models/entities/emoji.ts
+++ b/src/models/entities/emoji.ts
@@ -1,5 +1,5 @@
import { PrimaryColumn, Entity, Index, Column } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
@Index(['name', 'host'], { unique: true })
diff --git a/src/models/entities/follow-request.ts b/src/models/entities/follow-request.ts
index e661c9933a..22ec263962 100644
--- a/src/models/entities/follow-request.ts
+++ b/src/models/entities/follow-request.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['followerId', 'followeeId'], { unique: true })
diff --git a/src/models/entities/following.ts b/src/models/entities/following.ts
index 5f9b548dab..ee3286a1a1 100644
--- a/src/models/entities/following.ts
+++ b/src/models/entities/following.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['followerId', 'followeeId'], { unique: true })
diff --git a/src/models/entities/gallery-like.ts b/src/models/entities/gallery-like.ts
index f1610b8aae..7d084a2275 100644
--- a/src/models/entities/gallery-like.ts
+++ b/src/models/entities/gallery-like.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { GalleryPost } from './gallery-post.js';
+import { User } from './user';
+import { id } from '../id';
+import { GalleryPost } from './gallery-post';
@Entity()
@Index(['userId', 'postId'], { unique: true })
diff --git a/src/models/entities/gallery-post.ts b/src/models/entities/gallery-post.ts
index cc4ed640a4..f59cd671f3 100644
--- a/src/models/entities/gallery-post.ts
+++ b/src/models/entities/gallery-post.ts
@@ -1,7 +1,7 @@
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { DriveFile } from './drive-file.js';
+import { User } from './user';
+import { id } from '../id';
+import { DriveFile } from './drive-file';
@Entity()
export class GalleryPost {
diff --git a/src/models/entities/games/reversi/game.ts b/src/models/entities/games/reversi/game.ts
index b63c72e9fb..9deacaf5c6 100644
--- a/src/models/entities/games/reversi/game.ts
+++ b/src/models/entities/games/reversi/game.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from '../../user.js';
-import { id } from '../../../id.js';
+import { User } from '../../user';
+import { id } from '../../../id';
@Entity()
export class ReversiGame {
diff --git a/src/models/entities/games/reversi/matching.ts b/src/models/entities/games/reversi/matching.ts
index 690a080b2b..477a29316e 100644
--- a/src/models/entities/games/reversi/matching.ts
+++ b/src/models/entities/games/reversi/matching.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from '../../user.js';
-import { id } from '../../../id.js';
+import { User } from '../../user';
+import { id } from '../../../id';
@Entity()
export class ReversiMatching {
diff --git a/src/models/entities/hashtag.ts b/src/models/entities/hashtag.ts
index b99ac80b58..842cdaa562 100644
--- a/src/models/entities/hashtag.ts
+++ b/src/models/entities/hashtag.ts
@@ -1,6 +1,6 @@
import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class Hashtag {
diff --git a/src/models/entities/instance.ts b/src/models/entities/instance.ts
index f4637096fa..7c8719e06a 100644
--- a/src/models/entities/instance.ts
+++ b/src/models/entities/instance.ts
@@ -1,5 +1,5 @@
import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class Instance {
diff --git a/src/models/entities/log.ts b/src/models/entities/log.ts
index 17c5cba7d6..182a9fbed8 100644
--- a/src/models/entities/log.ts
+++ b/src/models/entities/log.ts
@@ -1,5 +1,5 @@
import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class Log {
diff --git a/src/models/entities/messaging-message.ts b/src/models/entities/messaging-message.ts
index 04a1637f44..ac0764674c 100644
--- a/src/models/entities/messaging-message.ts
+++ b/src/models/entities/messaging-message.ts
@@ -1,8 +1,8 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { DriveFile } from './drive-file.js';
-import { id } from '../id.js';
-import { UserGroup } from './user-group.js';
+import { User } from './user';
+import { DriveFile } from './drive-file';
+import { id } from '../id';
+import { UserGroup } from './user-group';
@Entity()
export class MessagingMessage {
diff --git a/src/models/entities/meta.ts b/src/models/entities/meta.ts
index a03891622d..2a0632c87c 100644
--- a/src/models/entities/meta.ts
+++ b/src/models/entities/meta.ts
@@ -1,7 +1,7 @@
import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { Clip } from './clip.js';
+import { User } from './user';
+import { id } from '../id';
+import { Clip } from './clip';
@Entity()
export class Meta {
diff --git a/src/models/entities/moderation-log.ts b/src/models/entities/moderation-log.ts
index d96b63f523..33d3d683ae 100644
--- a/src/models/entities/moderation-log.ts
+++ b/src/models/entities/moderation-log.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class ModerationLog {
diff --git a/src/models/entities/muted-note.ts b/src/models/entities/muted-note.ts
index 07763b2dbf..521876688c 100644
--- a/src/models/entities/muted-note.ts
+++ b/src/models/entities/muted-note.ts
@@ -1,8 +1,8 @@
import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { mutedNoteReasons } from '../../types.js';
+import { Note } from './note';
+import { User } from './user';
+import { id } from '../id';
+import { mutedNoteReasons } from '../../types';
@Entity()
@Index(['noteId', 'userId'], { unique: true })
diff --git a/src/models/entities/muting.ts b/src/models/entities/muting.ts
index 9c9134949f..0084213bcc 100644
--- a/src/models/entities/muting.ts
+++ b/src/models/entities/muting.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['muterId', 'muteeId'], { unique: true })
diff --git a/src/models/entities/note-favorite.ts b/src/models/entities/note-favorite.ts
index 54792d225b..0713c3ae56 100644
--- a/src/models/entities/note-favorite.ts
+++ b/src/models/entities/note-favorite.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/note-reaction.ts b/src/models/entities/note-reaction.ts
index 5bca5c3d36..674dc3639e 100644
--- a/src/models/entities/note-reaction.ts
+++ b/src/models/entities/note-reaction.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { Note } from './note.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { Note } from './note';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/note-unread.ts b/src/models/entities/note-unread.ts
index 5a88c7f7d5..57dda4fafd 100644
--- a/src/models/entities/note-unread.ts
+++ b/src/models/entities/note-unread.ts
@@ -1,8 +1,8 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { Note } from './note.js';
-import { id } from '../id.js';
-import { Channel } from './channel.js';
+import { User } from './user';
+import { Note } from './note';
+import { id } from '../id';
+import { Channel } from './channel';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/note-watching.ts b/src/models/entities/note-watching.ts
index 458fac3a40..741a1c0c8b 100644
--- a/src/models/entities/note-watching.ts
+++ b/src/models/entities/note-watching.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { Note } from './note.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { Note } from './note';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/note.ts b/src/models/entities/note.ts
index 74d69de13c..9a85532637 100644
--- a/src/models/entities/note.ts
+++ b/src/models/entities/note.ts
@@ -1,9 +1,9 @@
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-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';
+import { User } from './user';
+import { DriveFile } from './drive-file';
+import { id } from '../id';
+import { noteVisibilities } from '../../types';
+import { Channel } from './channel';
@Entity()
@Index('IDX_NOTE_TAGS', { synchronize: false })
diff --git a/src/models/entities/notification.ts b/src/models/entities/notification.ts
index 1114910a80..988fdb341f 100644
--- a/src/models/entities/notification.ts
+++ b/src/models/entities/notification.ts
@@ -1,11 +1,11 @@
import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm';
-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';
+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';
@Entity()
export class Notification {
diff --git a/src/models/entities/page-like.ts b/src/models/entities/page-like.ts
index 49f3f0ef52..ca84ece8fd 100644
--- a/src/models/entities/page-like.ts
+++ b/src/models/entities/page-like.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { Page } from './page.js';
+import { User } from './user';
+import { id } from '../id';
+import { Page } from './page';
@Entity()
@Index(['userId', 'pageId'], { unique: true })
diff --git a/src/models/entities/page.ts b/src/models/entities/page.ts
index 7bc35aa69a..ed0411a3d0 100644
--- a/src/models/entities/page.ts
+++ b/src/models/entities/page.ts
@@ -1,7 +1,7 @@
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
-import { DriveFile } from './drive-file.js';
+import { User } from './user';
+import { id } from '../id';
+import { DriveFile } from './drive-file';
@Entity()
@Index(['userId', 'name'], { unique: true })
diff --git a/src/models/entities/password-reset-request.ts b/src/models/entities/password-reset-request.ts
index 95ba14db18..6d41d38a93 100644
--- a/src/models/entities/password-reset-request.ts
+++ b/src/models/entities/password-reset-request.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
-import { id } from '../id.js';
-import { User } from './user.js';
+import { id } from '../id';
+import { User } from './user';
@Entity()
export class PasswordResetRequest {
diff --git a/src/models/entities/poll-vote.ts b/src/models/entities/poll-vote.ts
index f8b5ad7d81..709376f909 100644
--- a/src/models/entities/poll-vote.ts
+++ b/src/models/entities/poll-vote.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { Note } from './note.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { Note } from './note';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId', 'choice'], { unique: true })
diff --git a/src/models/entities/poll.ts b/src/models/entities/poll.ts
index a201b1198b..e3bbb1c3f2 100644
--- a/src/models/entities/poll.ts
+++ b/src/models/entities/poll.ts
@@ -1,8 +1,8 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { id } from '../id.js';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { noteVisibilities } from '../../types.js';
+import { id } from '../id';
+import { Note } from './note';
+import { User } from './user';
+import { noteVisibilities } from '../../types';
@Entity()
export class Poll {
diff --git a/src/models/entities/promo-note.ts b/src/models/entities/promo-note.ts
index d21b2adac3..474f1cb235 100644
--- a/src/models/entities/promo-note.ts
+++ b/src/models/entities/promo-note.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class PromoNote {
diff --git a/src/models/entities/promo-read.ts b/src/models/entities/promo-read.ts
index d949061b99..2e0977b6b5 100644
--- a/src/models/entities/promo-read.ts
+++ b/src/models/entities/promo-read.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/registration-tickets.ts b/src/models/entities/registration-tickets.ts
index 139e40f85e..d962f78a78 100644
--- a/src/models/entities/registration-tickets.ts
+++ b/src/models/entities/registration-tickets.ts
@@ -1,5 +1,5 @@
import { PrimaryColumn, Entity, Index, Column } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class RegistrationTicket {
diff --git a/src/models/entities/registry-item.ts b/src/models/entities/registry-item.ts
index f1904e6120..54d2ef2082 100644
--- a/src/models/entities/registry-item.ts
+++ b/src/models/entities/registry-item.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
// TODO: 同じdomain、同じscope、同じkeyのレコードは二つ以上存在しないように制約付けたい
@Entity()
diff --git a/src/models/entities/relay.ts b/src/models/entities/relay.ts
index 94d1929574..4c82ccb125 100644
--- a/src/models/entities/relay.ts
+++ b/src/models/entities/relay.ts
@@ -1,5 +1,5 @@
import { PrimaryColumn, Entity, Index, Column } from 'typeorm';
-import { id } from '../id.js';
+import { id } from '../id';
@Entity()
export class Relay {
diff --git a/src/models/entities/signin.ts b/src/models/entities/signin.ts
index 1db5c48ca1..7e047084b1 100644
--- a/src/models/entities/signin.ts
+++ b/src/models/entities/signin.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class Signin {
diff --git a/src/models/entities/sw-subscription.ts b/src/models/entities/sw-subscription.ts
index 254dd70b4f..7c3f6f0a6c 100644
--- a/src/models/entities/sw-subscription.ts
+++ b/src/models/entities/sw-subscription.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class SwSubscription {
diff --git a/src/models/entities/user-group-invitation.ts b/src/models/entities/user-group-invitation.ts
index 9e71c78e1d..6fe8f20134 100644
--- a/src/models/entities/user-group-invitation.ts
+++ b/src/models/entities/user-group-invitation.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { UserGroup } from './user-group.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { UserGroup } from './user-group';
+import { id } from '../id';
@Entity()
@Index(['userId', 'userGroupId'], { unique: true })
diff --git a/src/models/entities/user-group-joining.ts b/src/models/entities/user-group-joining.ts
index fbed44c79f..e09c3230f1 100644
--- a/src/models/entities/user-group-joining.ts
+++ b/src/models/entities/user-group-joining.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { UserGroup } from './user-group.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { UserGroup } from './user-group';
+import { id } from '../id';
@Entity()
@Index(['userId', 'userGroupId'], { unique: true })
diff --git a/src/models/entities/user-group.ts b/src/models/entities/user-group.ts
index ae4cd5485f..f4bac03223 100644
--- a/src/models/entities/user-group.ts
+++ b/src/models/entities/user-group.ts
@@ -1,6 +1,6 @@
import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class UserGroup {
diff --git a/src/models/entities/user-keypair.ts b/src/models/entities/user-keypair.ts
index 026f823f7b..603321d758 100644
--- a/src/models/entities/user-keypair.ts
+++ b/src/models/entities/user-keypair.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class UserKeypair {
diff --git a/src/models/entities/user-list-joining.ts b/src/models/entities/user-list-joining.ts
index 91cff3cd54..bb7dc40b95 100644
--- a/src/models/entities/user-list-joining.ts
+++ b/src/models/entities/user-list-joining.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { UserList } from './user-list.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { UserList } from './user-list';
+import { id } from '../id';
@Entity()
@Index(['userId', 'userListId'], { unique: true })
diff --git a/src/models/entities/user-list.ts b/src/models/entities/user-list.ts
index 51031e3c1f..35a83ef8c3 100644
--- a/src/models/entities/user-list.ts
+++ b/src/models/entities/user-list.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class UserList {
diff --git a/src/models/entities/user-note-pining.ts b/src/models/entities/user-note-pining.ts
index 0495c4b2f5..04a6f8f645 100644
--- a/src/models/entities/user-note-pining.ts
+++ b/src/models/entities/user-note-pining.ts
@@ -1,7 +1,7 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { Note } from './note.js';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { Note } from './note';
+import { User } from './user';
+import { id } from '../id';
@Entity()
@Index(['userId', 'noteId'], { unique: true })
diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts
index fd05522797..3a9043fac6 100644
--- a/src/models/entities/user-profile.ts
+++ b/src/models/entities/user-profile.ts
@@ -1,8 +1,8 @@
import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { id } from '../id.js';
-import { User } from './user.js';
-import { Page } from './page.js';
-import { notificationTypes } from '../../types.js';
+import { id } from '../id';
+import { User } from './user';
+import { Page } from './page';
+import { notificationTypes } from '../../types';
// TODO: このテーブルで管理している情報すべてレジストリで管理するようにしても良いかも
// ただ、「emailVerified が true なユーザーを find する」のようなクエリは書けなくなるからウーン
diff --git a/src/models/entities/user-publickey.ts b/src/models/entities/user-publickey.ts
index adfff74f8a..21edc3e9e2 100644
--- a/src/models/entities/user-publickey.ts
+++ b/src/models/entities/user-publickey.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class UserPublickey {
diff --git a/src/models/entities/user-security-key.ts b/src/models/entities/user-security-key.ts
index ec8ac81c47..d54c728e53 100644
--- a/src/models/entities/user-security-key.ts
+++ b/src/models/entities/user-security-key.ts
@@ -1,6 +1,6 @@
import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
-import { User } from './user.js';
-import { id } from '../id.js';
+import { User } from './user';
+import { id } from '../id';
@Entity()
export class UserSecurityKey {
diff --git a/src/models/entities/user.ts b/src/models/entities/user.ts
index 36c5068205..060ec06b9a 100644
--- a/src/models/entities/user.ts
+++ b/src/models/entities/user.ts
@@ -1,6 +1,6 @@
import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { DriveFile } from './drive-file.js';
-import { id } from '../id.js';
+import { DriveFile } from './drive-file';
+import { id } from '../id';
@Entity()
@Index(['usernameLower', 'host'], { unique: true })