From 369dce4701c4c9ec4701f6c0e6d3b766acea270f Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Apr 2019 01:43:01 +0900 Subject: [PATCH] Update migrate.ts --- src/migrate.ts | 58 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/src/migrate.ts b/src/migrate.ts index 53b681fbe..c7eded26b 100644 --- a/src/migrate.ts +++ b/src/migrate.ts @@ -27,6 +27,8 @@ import { Emoji } from './models/entities/emoji'; import { toPuny as _toPuny } from './misc/convert-host'; import { UserProfile } from './models/entities/user-profile'; import { MessagingMessage } from './models/entities/messaging-message'; +import { Muting } from './models/entities/muting'; +import { Blocking } from './models/entities/blocking'; function toPuny(x: string | null): string | null { if (x == null) return null; @@ -64,6 +66,8 @@ const _DriveFile = db.get('driveFiles.files'); const _DriveFolder = db.get('driveFolders'); const _Note = db.get('notes'); const _Following = db.get('following'); +const _Blocking = db.get('blocking'); +const _Muting = db.get('mute'); const _PollVote = db.get('pollVotes'); const _Favorite = db.get('favorites'); const _NoteReaction = db.get('noteReactions'); @@ -85,6 +89,8 @@ async function main() { const DriveFolders = getRepository(DriveFolder); const Notes = getRepository(Note); const Followings = getRepository(Following); + const Blockings = getRepository(Blocking); + const Mutings = getRepository(Muting); const Polls = getRepository(Poll); const PollVotes = getRepository(PollVote); const NoteFavorites = getRepository(NoteFavorite); @@ -157,6 +163,24 @@ async function main() { }); } + async function migrateBlocking(blocking: any) { + await Blockings.save({ + id: blocking._id.toHexString(), + createdAt: new Date(), + blockerId: blocking.blockerId.toHexString(), + blockeeId: blocking.blockeeId.toHexString(), + }); + } + + async function migrateMuting(muting: any) { + await Blockings.save({ + id: muting._id.toHexString(), + createdAt: new Date(), + muterId: muting.muterId.toHexString(), + muteeId: muting.muteeId.toHexString(), + }); + } + async function migrateDriveFolder(folder: any) { await DriveFolders.save({ id: folder._id.toHexString(), @@ -379,6 +403,36 @@ async function main() { } } + let allBlockingsCount = await _Blocking.count(); + if (test && allBlockingsCount > limit) allBlockingsCount = limit; + for (let i = 0; i < allBlockingsCount; i++) { + const blocking = await _Blocking.findOne({}, { + skip: i + }); + try { + await migrateBlocking(blocking); + console.log(`BLOCKING (${i + 1}/${allBlockingsCount}) ${blocking._id} ${chalk.green('DONE')}`); + } catch (e) { + console.log(`BLOCKING (${i + 1}/${allBlockingsCount}) ${blocking._id} ${chalk.red('ERR')}`); + console.error(e); + } + } + + let allMutingsCount = await _Muting.count(); + if (test && allMutingsCount > limit) allMutingsCount = limit; + for (let i = 0; i < allMutingsCount; i++) { + const muting = await _Muting.findOne({}, { + skip: i + }); + try { + await migrateMuting(muting); + console.log(`MUTING (${i + 1}/${allMutingsCount}) ${muting._id} ${chalk.green('DONE')}`); + } catch (e) { + console.log(`MUTING (${i + 1}/${allMutingsCount}) ${muting._id} ${chalk.red('ERR')}`); + console.error(e); + } + } + let allDriveFoldersCount = await _DriveFolder.count(); if (test && allDriveFoldersCount > limit) allDriveFoldersCount = limit; for (let i = 0; i < allDriveFoldersCount; i++) { @@ -518,9 +572,9 @@ async function main() { }); try { await migrateMessagingMessage(message); - console.log(`EMOJI (${i + 1}/${allMessagingMessagesCount}) ${message._id} ${chalk.green('DONE')}`); + console.log(`MESSAGE (${i + 1}/${allMessagingMessagesCount}) ${message._id} ${chalk.green('DONE')}`); } catch (e) { - console.log(`EMOJI (${i + 1}/${allMessagingMessagesCount}) ${message._id} ${chalk.red('ERR')}`); + console.log(`MESSAGE (${i + 1}/${allMessagingMessagesCount}) ${message._id} ${chalk.red('ERR')}`); console.error(e); } }