refactor: 可読性のため一部でArray.prototype.atを使うように (#11274)
				
					
				
			* refactor: `Array.prototype.at`を使うように * fixup! refactor: `Array.prototype.at`を使うように
This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| import { Inject, Injectable } from '@nestjs/common'; | ||||
| import { IsNull, MoreThan, Not } from 'typeorm'; | ||||
| import { DI } from '@/di-symbols.js'; | ||||
| import type { DriveFilesRepository } from '@/models/index.js'; | ||||
| import type { DriveFile, DriveFilesRepository } from '@/models/index.js'; | ||||
| import type { Config } from '@/config.js'; | ||||
| import type Logger from '@/logger.js'; | ||||
| import { DriveService } from '@/core/DriveService.js'; | ||||
| @@ -31,7 +31,7 @@ export class CleanRemoteFilesProcessorService { | ||||
| 		this.logger.info('Deleting cached remote files...'); | ||||
|  | ||||
| 		let deletedCount = 0; | ||||
| 		let cursor: any = null; | ||||
| 		let cursor: DriveFile['id'] | null = null; | ||||
|  | ||||
| 		while (true) { | ||||
| 			const files = await this.driveFilesRepository.find({ | ||||
| @@ -51,7 +51,7 @@ export class CleanRemoteFilesProcessorService { | ||||
| 				break; | ||||
| 			} | ||||
|  | ||||
| 			cursor = files[files.length - 1].id; | ||||
| 			cursor = files.at(-1)?.id ?? null; | ||||
|  | ||||
| 			await Promise.all(files.map(file => this.driveService.deleteFileSync(file, true))); | ||||
|  | ||||
|   | ||||
| @@ -70,7 +70,7 @@ export class DeleteAccountProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = notes[notes.length - 1].id; | ||||
| 				cursor = notes.at(-1)?.id ?? null; | ||||
|  | ||||
| 				await this.notesRepository.delete(notes.map(note => note.id)); | ||||
|  | ||||
| @@ -101,7 +101,7 @@ export class DeleteAccountProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = files[files.length - 1].id; | ||||
| 				cursor = files.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const file of files) { | ||||
| 					await this.driveService.deleteFileSync(file); | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| import { Inject, Injectable } from '@nestjs/common'; | ||||
| import { MoreThan } from 'typeorm'; | ||||
| import { DI } from '@/di-symbols.js'; | ||||
| import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; | ||||
| import type { UsersRepository, DriveFilesRepository, DriveFile } from '@/models/index.js'; | ||||
| import type { Config } from '@/config.js'; | ||||
| import type Logger from '@/logger.js'; | ||||
| import { DriveService } from '@/core/DriveService.js'; | ||||
| @@ -40,7 +40,7 @@ export class DeleteDriveFilesProcessorService { | ||||
| 		} | ||||
|  | ||||
| 		let deletedCount = 0; | ||||
| 		let cursor: any = null; | ||||
| 		let cursor: DriveFile['id'] | null = null; | ||||
|  | ||||
| 		while (true) { | ||||
| 			const files = await this.driveFilesRepository.find({ | ||||
| @@ -59,7 +59,7 @@ export class DeleteDriveFilesProcessorService { | ||||
| 				break; | ||||
| 			} | ||||
|  | ||||
| 			cursor = files[files.length - 1].id; | ||||
| 			cursor = files.at(-1)?.id ?? null; | ||||
|  | ||||
| 			for (const file of files) { | ||||
| 				await this.driveService.deleteFileSync(file); | ||||
|   | ||||
| @@ -3,7 +3,7 @@ import { Inject, Injectable } from '@nestjs/common'; | ||||
| import { MoreThan } from 'typeorm'; | ||||
| import { format as dateFormat } from 'date-fns'; | ||||
| import { DI } from '@/di-symbols.js'; | ||||
| import type { UsersRepository, BlockingsRepository } from '@/models/index.js'; | ||||
| import type { UsersRepository, BlockingsRepository, Blocking } from '@/models/index.js'; | ||||
| import type { Config } from '@/config.js'; | ||||
| import type Logger from '@/logger.js'; | ||||
| import { DriveService } from '@/core/DriveService.js'; | ||||
| @@ -53,7 +53,7 @@ export class ExportBlockingProcessorService { | ||||
| 			const stream = fs.createWriteStream(path, { flags: 'a' }); | ||||
|  | ||||
| 			let exportedCount = 0; | ||||
| 			let cursor: any = null; | ||||
| 			let cursor: Blocking['id'] | null = null; | ||||
|  | ||||
| 			while (true) { | ||||
| 				const blockings = await this.blockingsRepository.find({ | ||||
| @@ -72,7 +72,7 @@ export class ExportBlockingProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = blockings[blockings.length - 1].id; | ||||
| 				cursor = blockings.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const block of blockings) { | ||||
| 					const u = await this.usersRepository.findOneBy({ id: block.blockeeId }); | ||||
|   | ||||
| @@ -94,7 +94,7 @@ export class ExportFavoritesProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = favorites[favorites.length - 1].id; | ||||
| 				cursor = favorites.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const favorite of favorites) { | ||||
| 					let poll: Poll | undefined; | ||||
|   | ||||
| @@ -79,7 +79,7 @@ export class ExportFollowingProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = followings[followings.length - 1].id; | ||||
| 				cursor = followings.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const following of followings) { | ||||
| 					const u = await this.usersRepository.findOneBy({ id: following.followeeId }); | ||||
|   | ||||
| @@ -3,7 +3,7 @@ import { Inject, Injectable } from '@nestjs/common'; | ||||
| import { IsNull, MoreThan } from 'typeorm'; | ||||
| import { format as dateFormat } from 'date-fns'; | ||||
| import { DI } from '@/di-symbols.js'; | ||||
| import type { MutingsRepository, UsersRepository, BlockingsRepository } from '@/models/index.js'; | ||||
| import type { MutingsRepository, UsersRepository, BlockingsRepository, Muting } from '@/models/index.js'; | ||||
| import type { Config } from '@/config.js'; | ||||
| import type Logger from '@/logger.js'; | ||||
| import { DriveService } from '@/core/DriveService.js'; | ||||
| @@ -56,7 +56,7 @@ export class ExportMutingProcessorService { | ||||
| 			const stream = fs.createWriteStream(path, { flags: 'a' }); | ||||
|  | ||||
| 			let exportedCount = 0; | ||||
| 			let cursor: any = null; | ||||
| 			let cursor: Muting['id'] | null = null; | ||||
|  | ||||
| 			while (true) { | ||||
| 				const mutes = await this.mutingsRepository.find({ | ||||
| @@ -76,7 +76,7 @@ export class ExportMutingProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = mutes[mutes.length - 1].id; | ||||
| 				cursor = mutes.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const mute of mutes) { | ||||
| 					const u = await this.usersRepository.findOneBy({ id: mute.muteeId }); | ||||
|   | ||||
| @@ -90,7 +90,7 @@ export class ExportNotesProcessorService { | ||||
| 					break; | ||||
| 				} | ||||
|  | ||||
| 				cursor = notes[notes.length - 1].id; | ||||
| 				cursor = notes.at(-1)?.id ?? null; | ||||
|  | ||||
| 				for (const note of notes) { | ||||
| 					let poll: Poll | undefined; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 okayurisotto
					okayurisotto