v12 (#5712)

Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
Co-authored-by: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>

src/models/entities/announcement-read.ts

@@ -0,0 +1,36 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { Announcement } from './announcement';
+import { id } from '../id';
+
+@Entity()
+@Index(['userId', 'announcementId'], { unique: true })
+export class AnnouncementRead {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the AnnouncementRead.'
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column(id())
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Index()
+	@Column(id())
+	public announcementId: Announcement['id'];
+
+	@ManyToOne(type => Announcement, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public announcement: Announcement | null;
+}

src/models/entities/announcement.ts

@@ -0,0 +1,43 @@
+import { Entity, Index, Column, PrimaryColumn } from 'typeorm';
+import { id } from '../id';
+
+@Entity()
+export class Announcement {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Announcement.'
+	})
+	public createdAt: Date;
+
+	@Column('timestamp with time zone', {
+		comment: 'The updated date of the Announcement.',
+		nullable: true
+	})
+	public updatedAt: Date | null;
+
+	@Column('varchar', {
+		length: 8192, nullable: false
+	})
+	public text: string;
+
+	@Column('varchar', {
+		length: 256, nullable: false
+	})
+	public title: string;
+
+	@Column('varchar', {
+		length: 1024, nullable: true
+	})
+	public imageUrl: string | null;
+
+	constructor(data: Partial<Announcement>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
+}

src/models/entities/antenna-note.ts

@@ -0,0 +1,43 @@
+import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Note } from './note';
+import { Antenna } from './antenna';
+import { id } from '../id';
+
+@Entity()
+@Index(['noteId', 'antennaId'], { unique: true })
+export class AntennaNote {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The note ID.'
+	})
+	public noteId: Note['id'];
+
+	@ManyToOne(type => Note, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public note: Note | null;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The antenna ID.'
+	})
+	public antennaId: Antenna['id'];
+
+	@ManyToOne(type => Antenna, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public antenna: Antenna | null;
+
+	@Index()
+	@Column('boolean', {
+		default: false
+	})
+	public read: boolean;
+}

src/models/entities/antenna.ts

@@ -0,0 +1,81 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { id } from '../id';
+import { UserList } from './user-list';
+
+@Entity()
+export class Antenna {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Antenna.'
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The owner ID.'
+	})
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Column('varchar', {
+		length: 128,
+		comment: 'The name of the Antenna.'
+	})
+	public name: string;
+
+	@Column('enum', { enum: ['home', 'all', 'users', 'list'] })
+	public src: 'home' | 'all' | 'users' | 'list';
+
+	@Column({
+		...id(),
+		nullable: true
+	})
+	public userListId: UserList['id'] | null;
+
+	@ManyToOne(type => UserList, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public userList: UserList | null;
+
+	@Column('varchar', {
+		length: 1024, array: true,
+		default: '{}'
+	})
+	public users: string[];
+
+	@Column('jsonb', {
+		default: []
+	})
+	public keywords: string[][];
+
+	@Column('boolean', {
+		default: false
+	})
+	public caseSensitive: boolean;
+
+	@Column('boolean', {
+		default: false
+	})
+	public withReplies: boolean;
+
+	@Column('boolean')
+	public withFile: boolean;
+
+	@Column('varchar', {
+		length: 2048, nullable: true,
+	})
+	public expression: string | null;
+
+	@Column('boolean')
+	public notify: boolean;
+}

src/models/entities/clip-note.ts

@@ -0,0 +1,37 @@
+import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
+import { Note } from './note';
+import { Clip } from './clip';
+import { id } from '../id';
+
+@Entity()
+@Index(['noteId', 'clipId'], { unique: true })
+export class ClipNote {
+	@PrimaryColumn(id())
+	public id: string;
+	
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The note ID.'
+	})
+	public noteId: Note['id'];
+
+	@ManyToOne(type => Note, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public note: Note | null;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The clip ID.'
+	})
+	public clipId: Clip['id'];
+
+	@ManyToOne(type => Clip, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public clip: Clip | null;
+}

src/models/entities/clip.ts

@@ -0,0 +1,38 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { id } from '../id';
+
+@Entity()
+export class Clip {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the Clip.'
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The owner ID.'
+	})
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Column('varchar', {
+		length: 128,
+		comment: 'The name of the Clip.'
+	})
+	public name: string;
+
+	@Column('boolean', {
+		default: false
+	})
+	public isPublic: boolean;
+}

src/models/entities/meta.ts

@@ -34,11 +34,6 @@ export class Meta {
 	})
 	public maintainerEmail: string | null;
 
-	@Column('jsonb', {
-		default: [],
-	})
-	public announcements: Record<string, any>[];
-
 	@Column('boolean', {
 		default: false,
 	})
@@ -54,11 +49,6 @@ export class Meta {
 	})
 	public disableGlobalTimeline: boolean;
 
-	@Column('boolean', {
-		default: true,
-	})
-	public enableEmojiReaction: boolean;
-
 	@Column('boolean', {
 		default: false,
 	})

src/models/entities/note.ts

@@ -58,18 +58,6 @@ export class Note {
 	})
 	public cw: string | null;
 
-	@Column({
-		...id(),
-		nullable: true
-	})
-	public appId: App['id'] | null;
-
-	@ManyToOne(type => App, {
-		onDelete: 'SET NULL'
-	})
-	@JoinColumn()
-	public app: App | null;
-
 	@Index()
 	@Column({
 		...id(),
@@ -177,11 +165,6 @@ export class Note {
 	})
 	public hasPoll: boolean;
 
-	@Column('jsonb', {
-		nullable: true, default: null
-	})
-	public geo: any | null;
-
 	//#region Denormalized fields
 	@Index()
 	@Column('varchar', {

src/models/entities/notification.ts

@@ -2,6 +2,7 @@ import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typ
 import { User } from './user';
 import { id } from '../id';
 import { Note } from './note';
+import { FollowRequest } from './follow-request';
 
 @Entity()
 export class Notification {
@@ -54,12 +55,14 @@ export class Notification {
 	 * quote - (自分または自分がWatchしている)投稿が引用Renoteされた
 	 * reaction - (自分または自分がWatchしている)投稿にリアクションされた
 	 * pollVote - (自分または自分がWatchしている)投稿の投票に投票された
+	 * receiveFollowRequest - フォローリクエストされた
+	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された
 	 */
-	@Column('varchar', {
-		length: 32,
+	@Column('enum', {
+		enum: ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted'],
 		comment: 'The type of the Notification.'
 	})
-	public type: string;
+	public type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollVote' | 'receiveFollowRequest' | 'followRequestAccepted';
 
 	/**
 	 * 通知が読まれたかどうか
@@ -82,6 +85,18 @@ export class Notification {
 	@JoinColumn()
 	public note: Note | null;
 
+	@Column({
+		...id(),
+		nullable: true
+	})
+	public followRequestId: FollowRequest['id'] | null;
+
+	@ManyToOne(type => FollowRequest, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public followRequest: FollowRequest | null;
+
 	@Column('varchar', {
 		length: 128, nullable: true
 	})