wip #6441

28 files changed, 44 insertions, 40 deletions

diff --git a/src/models/entities/note-reaction.ts b/src/models/entities/note-reaction.ts
index 69bb663fd3..674dc3639e 100644
--- a/src/models/entities/note-reaction.ts
+++ b/src/models/entities/note-reaction.ts
@@ -23,7 +23,7 @@ export class NoteReaction {
 		onDelete: 'CASCADE'
 	})
 	@JoinColumn()
-	public user: User | null;
+	public user?: User | null;
 
 	@Index()
 	@Column(id())
@@ -33,7 +33,7 @@ export class NoteReaction {
 		onDelete: 'CASCADE'
 	})
 	@JoinColumn()
-	public note: Note | null;
+	public note?: Note | null;
 
 	// TODO: 対象noteのuserIdを非正規化したい(「受け取ったリアクション一覧」のようなものを(JOIN無しで)実装したいため)
 
diff --git a/src/server/api/endpoints/admin/invite.ts b/src/server/api/endpoints/admin/invite.ts
index 4529d16adf..987105791f 100644
--- a/src/server/api/endpoints/admin/invite.ts
+++ b/src/server/api/endpoints/admin/invite.ts
@@ -38,7 +38,7 @@ export default define(meta, async () => {
 		chars: '2-9A-HJ-NP-Z', // [0-9A-Z] w/o [01IO] (32 patterns)
 	});
 
-	await RegistrationTickets.save({
+	await RegistrationTickets.insert({
 		id: genId(),
 		createdAt: new Date(),
 		code,
diff --git a/src/server/api/endpoints/admin/promo/create.ts b/src/server/api/endpoints/admin/promo/create.ts
index 8b96d563c2..aa22e68ebd 100644
--- a/src/server/api/endpoints/admin/promo/create.ts
+++ b/src/server/api/endpoints/admin/promo/create.ts
@@ -53,7 +53,7 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.alreadyPromoted);
 	}
 
-	await PromoNotes.save({
+	await PromoNotes.insert({
 		noteId: note.id,
 		createdAt: new Date(),
 		expiresAt: new Date(ps.expiresAt),
diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts
index 6d4d31fa1e..444053a946 100644
--- a/src/server/api/endpoints/auth/accept.ts
+++ b/src/server/api/endpoints/auth/accept.ts
@@ -58,7 +58,7 @@ export default define(meta, async (ps, user) => {
 		const now = new Date();
 
 		// Insert access token doc
-		await AccessTokens.save({
+		await AccessTokens.insert({
 			id: genId(),
 			createdAt: now,
 			lastUsedAt: now,
diff --git a/src/server/api/endpoints/channels/follow.ts b/src/server/api/endpoints/channels/follow.ts
index 11c6e37ff7..c5976a8a34 100644
--- a/src/server/api/endpoints/channels/follow.ts
+++ b/src/server/api/endpoints/channels/follow.ts
@@ -37,7 +37,7 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchChannel);
 	}
 
-	await ChannelFollowings.save({
+	await ChannelFollowings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		followerId: user.id,
diff --git a/src/server/api/endpoints/clips/add-note.ts b/src/server/api/endpoints/clips/add-note.ts
index 4f5cc649e3..ee6a117b2d 100644
--- a/src/server/api/endpoints/clips/add-note.ts
+++ b/src/server/api/endpoints/clips/add-note.ts
@@ -68,7 +68,7 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.alreadyClipped);
 	}
 
-	await ClipNotes.save({
+	await ClipNotes.insert({
 		id: genId(),
 		noteId: note.id,
 		clipId: clip.id
diff --git a/src/server/api/endpoints/i/read-announcement.ts b/src/server/api/endpoints/i/read-announcement.ts
index 4a4a021af9..d6acb3d2e6 100644
--- a/src/server/api/endpoints/i/read-announcement.ts
+++ b/src/server/api/endpoints/i/read-announcement.ts
@@ -52,7 +52,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Create read
-	await AnnouncementReads.save({
+	await AnnouncementReads.insert({
 		id: genId(),
 		createdAt: new Date(),
 		announcementId: ps.announcementId,
diff --git a/src/server/api/endpoints/miauth/gen-token.ts b/src/server/api/endpoints/miauth/gen-token.ts
index 0634debb1e..401ed16389 100644
--- a/src/server/api/endpoints/miauth/gen-token.ts
+++ b/src/server/api/endpoints/miauth/gen-token.ts
@@ -52,7 +52,7 @@ export default define(meta, async (ps, user) => {
 	const now = new Date();
 
 	// Insert access token doc
-	await AccessTokens.save({
+	await AccessTokens.insert({
 		id: genId(),
 		createdAt: now,
 		lastUsedAt: now,
diff --git a/src/server/api/endpoints/notes/favorites/create.ts b/src/server/api/endpoints/notes/favorites/create.ts
index 952bbfd0eb..d66ce37a46 100644
--- a/src/server/api/endpoints/notes/favorites/create.ts
+++ b/src/server/api/endpoints/notes/favorites/create.ts
@@ -61,7 +61,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Create favorite
-	await NoteFavorites.save({
+	await NoteFavorites.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,
diff --git a/src/server/api/endpoints/pages/like.ts b/src/server/api/endpoints/pages/like.ts
index 5c7e13f1c8..3fc2b6ca23 100644
--- a/src/server/api/endpoints/pages/like.ts
+++ b/src/server/api/endpoints/pages/like.ts
@@ -68,7 +68,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Create like
-	await PageLikes.save({
+	await PageLikes.insert({
 		id: genId(),
 		createdAt: new Date(),
 		pageId: page.id,
diff --git a/src/server/api/endpoints/promo/read.ts b/src/server/api/endpoints/promo/read.ts
index 57eb0681e5..63c90e5d7f 100644
--- a/src/server/api/endpoints/promo/read.ts
+++ b/src/server/api/endpoints/promo/read.ts
@@ -46,7 +46,7 @@ export default define(meta, async (ps, user) => {
 		return;
 	}
 
-	await PromoReads.save({
+	await PromoReads.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,
diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts
index ceb70a9274..9fc70b5609 100644
--- a/src/server/api/endpoints/sw/register.ts
+++ b/src/server/api/endpoints/sw/register.ts
@@ -58,7 +58,7 @@ export default define(meta, async (ps, user) => {
 		};
 	}
 
-	await SwSubscriptions.save({
+	await SwSubscriptions.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
diff --git a/src/server/api/endpoints/users/groups/create.ts b/src/server/api/endpoints/users/groups/create.ts
index ca011d5cd6..78d2714874 100644
--- a/src/server/api/endpoints/users/groups/create.ts
+++ b/src/server/api/endpoints/users/groups/create.ts
@@ -39,7 +39,7 @@ export default define(meta, async (ps, user) => {
 	} as UserGroup);
 
 	// Push the owner
-	await UserGroupJoinings.save({
+	await UserGroupJoinings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
diff --git a/src/server/api/endpoints/users/groups/invitations/accept.ts b/src/server/api/endpoints/users/groups/invitations/accept.ts
index e86709f83b..2fa22bcf7e 100644
--- a/src/server/api/endpoints/users/groups/invitations/accept.ts
+++ b/src/server/api/endpoints/users/groups/invitations/accept.ts
@@ -52,7 +52,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Push the user
-	await UserGroupJoinings.save({
+	await UserGroupJoinings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index 7a5efc6cc9..d8f2e6d516 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -53,7 +53,7 @@ export default async (ctx: Koa.Context) => {
 
 	async function fail(status?: number, failure?: { error: string }) {
 		// Append signin history
-		await Signins.save({
+		await Signins.insert({
 			id: genId(),
 			createdAt: new Date(),
 			userId: user.id,
@@ -198,7 +198,7 @@ export default async (ctx: Koa.Context) => {
 
 		const challengeId = genId();
 
-		await AttestationChallenges.save({
+		await AttestationChallenges.insert({
 			userId: user.id,
 			id: challengeId,
 			challenge: hash(Buffer.from(challenge, 'utf-8')).toString('hex'),
diff --git a/src/services/add-note-to-antenna.ts b/src/services/add-note-to-antenna.ts
index 2c893488c3..3ba3d1eef5 100644
--- a/src/services/add-note-to-antenna.ts
+++ b/src/services/add-note-to-antenna.ts
@@ -10,7 +10,7 @@ export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: U
 	// 通知しない設定になっているか、自分自身の投稿なら既読にする
 	const read = !antenna.notify || (antenna.userId === noteUser.id);
 
-	AntennaNotes.save({
+	AntennaNotes.insert({
 		id: genId(),
 		antennaId: antenna.id,
 		noteId: note.id,
diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts
index 4f0238db91..dec48d26de 100644
--- a/src/services/blocking/create.ts
+++ b/src/services/blocking/create.ts
@@ -18,7 +18,7 @@ export default async function(blocker: User, blockee: User) {
 		unFollow(blockee, blocker)
 	]);
 
-	await Blockings.save({
+	await Blockings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		blockerId: blocker.id,
diff --git a/src/services/following/create.ts b/src/services/following/create.ts
index eb6699b0bf..1ce75caca0 100644
--- a/src/services/following/create.ts
+++ b/src/services/following/create.ts
@@ -22,7 +22,7 @@ export async function insertFollowingDoc(followee: User, follower: User) {
 
 	let alreadyFollowed = false;
 
-	await Followings.save({
+	await Followings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		followerId: follower.id,
diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts
index 1ff5476b40..f727a10fb6 100644
--- a/src/services/i/pin.ts
+++ b/src/services/i/pin.ts
@@ -37,7 +37,7 @@ export async function addPinned(user: User, noteId: Note['id']) {
 		throw new IdentifiableError('23f0cf4e-59a3-4276-a91d-61a5891c1514', 'That note has already been pinned.');
 	}
 
-	await UserNotePinings.save({
+	await UserNotePinings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
diff --git a/src/services/insert-moderation-log.ts b/src/services/insert-moderation-log.ts
index 33dab97259..87587d3bed 100644
--- a/src/services/insert-moderation-log.ts
+++ b/src/services/insert-moderation-log.ts
@@ -3,7 +3,7 @@ import { ModerationLogs } from '../models';
 import { genId } from '../misc/gen-id';
 
 export async function insertModerationLog(moderator: ILocalUser, type: string, info?: Record<string, any>) {
-	await ModerationLogs.save({
+	await ModerationLogs.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: moderator.id,
diff --git a/src/services/messages/create.ts b/src/services/messages/create.ts
index 8646ce37fc..413266d029 100644
--- a/src/services/messages/create.ts
+++ b/src/services/messages/create.ts
@@ -14,7 +14,7 @@ import { renderActivity } from '../../remote/activitypub/renderer';
 import { deliver } from '../../queue';
 
 export async function createMessage(user: User, recipientUser: User | undefined, recipientGroup: UserGroup | undefined, text: string | undefined, file: DriveFile | null, uri?: string) {
-	const message = await MessagingMessages.save({
+	const message = {
 		id: genId(),
 		createdAt: new Date(),
 		fileId: file ? file.id : null,
@@ -25,7 +25,9 @@ export async function createMessage(user: User, recipientUser: User | undefined,
 		isRead: false,
 		reads: [] as any[],
 		uri
-	} as MessagingMessage);
+	} as MessagingMessage;
+
+	await MessagingMessages.insert(message);
 
 	const messageObj = await MessagingMessages.pack(message);
 
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 563eaac758..7c7e8d9a08 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -247,7 +247,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 		for (const u of us) {
 			checkWordMute(note, { id: u.userId }, u.mutedWords).then(shouldMute => {
 				if (shouldMute) {
-					MutedNotes.save({
+					MutedNotes.insert({
 						id: genId(),
 						userId: u.userId,
 						noteId: note.id,
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index bfcaaa09be..b4ce03ab60 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -29,7 +29,7 @@ export default async function(user: User, note: Note, choice: number) {
 	}
 
 	// Create vote
-	await PollVotes.save({
+	await PollVotes.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 6c0a852f34..897c816de8 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -18,17 +18,17 @@ export default async (user: User, note: Note, reaction?: string) => {
 	// TODO: cache
 	reaction = await toDbReaction(reaction, user.host);
 
-	let record: NoteReaction;
+	let record: NoteReaction = {
+		id: genId(),
+		createdAt: new Date(),
+		noteId: note.id,
+		userId: user.id,
+		reaction
+	};
 
 	// Create reaction
 	try {
-		record = await NoteReactions.save({
-			id: genId(),
-			createdAt: new Date(),
-			noteId: note.id,
-			userId: user.id,
-			reaction
-		});
+		await NoteReactions.insert(record);
 	} catch (e) {
 		if (isDuplicateKeyValueError(e)) {
 			record = await NoteReactions.findOneOrFail({
diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts
index 6fd9ee2cfe..8e6fb4abe8 100644
--- a/src/services/note/unread.ts
+++ b/src/services/note/unread.ts
@@ -17,7 +17,7 @@ export default async function(userId: User['id'], note: Note, params: {
 	if (mute.map(m => m.muteeId).includes(note.userId)) return;
 	//#endregion
 
-	const unread = await NoteUnreads.save({
+	const unread = {
 		id: genId(),
 		noteId: note.id,
 		userId: userId,
@@ -25,7 +25,9 @@ export default async function(userId: User['id'], note: Note, params: {
 		isMentioned: params.isMentioned,
 		noteChannelId: note.channelId,
 		noteUserId: note.userId,
-	});
+	};
+
+	await NoteUnreads.insert(unread);
 
 	// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
 	setTimeout(async () => {
diff --git a/src/services/note/watch.ts b/src/services/note/watch.ts
index d3c9553696..966b7f0054 100644
--- a/src/services/note/watch.ts
+++ b/src/services/note/watch.ts
@@ -10,7 +10,7 @@ export default async (me: User['id'], note: Note) => {
 		return;
 	}
 
-	await NoteWatchings.save({
+	await NoteWatchings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,
diff --git a/src/services/update-hashtag.ts b/src/services/update-hashtag.ts
index 1dcb582791..3e22846731 100644
--- a/src/services/update-hashtag.ts
+++ b/src/services/update-hashtag.ts
@@ -86,7 +86,7 @@ export async function updateHashtag(user: User, tag: string, isUserAttached = fa
 		}
 	} else {
 		if (isUserAttached) {
-			Hashtags.save({
+			Hashtags.insert({
 				id: genId(),
 				name: tag,
 				mentionedUserIds: [],
@@ -103,7 +103,7 @@ export async function updateHashtag(user: User, tag: string, isUserAttached = fa
 				attachedRemoteUsersCount: Users.isRemoteUser(user) ? 1 : 0,
 			} as Hashtag);
 		} else {
-			Hashtags.save({
+			Hashtags.insert({
 				id: genId(),
 				name: tag,
 				mentionedUserIds: [user.id],
diff --git a/src/services/user-list/push.ts b/src/services/user-list/push.ts
index e67be4b027..ba54c04475 100644
--- a/src/services/user-list/push.ts
+++ b/src/services/user-list/push.ts
@@ -8,7 +8,7 @@ import { fetchProxyAccount } from '../../misc/fetch-proxy-account';
 import createFollowing from '../following/create';
 
 export async function pushUserToUserList(target: User, list: UserList) {
-	await UserListJoinings.save({
+	await UserListJoinings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: target.id,