Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
syuilo 2023-08-16 08:52:17 +09:00
parent 24af7cccdc
commit 36c7c6355f
16 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { IsNull, MoreThan, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { DriveFile, DriveFilesRepository } from '@/models/index.js';
import type { MiDriveFile, DriveFilesRepository } from '@/models/index.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { bindThis } from '@/decorators.js';
@ -32,7 +32,7 @@ export class CleanRemoteFilesProcessorService {
this.logger.info('Deleting cached remote files...');
let deletedCount = 0;
let cursor: DriveFile['id'] | null = null;
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({

4
packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { UsersRepository, DriveFilesRepository, DriveFile } from '@/models/index.js';
import type { UsersRepository, DriveFilesRepository, MiDriveFile } from '@/models/index.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { bindThis } from '@/decorators.js';
@ -41,7 +41,7 @@ export class DeleteDriveFilesProcessorService {
}
let deletedCount = 0;
let cursor: DriveFile['id'] | null = null;
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({

4
packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
View file

@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { format as DateFormat } from 'date-fns';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { AntennasRepository, UsersRepository, UserListJoiningsRepository, User } from '@/models/index.js';
import type { AntennasRepository, UsersRepository, UserListJoiningsRepository, MiUser } from '@/models/index.js';
import Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { bindThis } from '@/decorators.js';
@ -63,7 +63,7 @@ export class ExportAntennasProcessorService {
const antennas = await this.antennsRepository.findBy({ userId: job.data.user.id });
write('[');
for (const [index, antenna] of antennas.entries()) {
let users: User[] | undefined;
let users: MiUser[] | undefined;
if (antenna.userListId !== null) {
const joinings = await this.userListJoiningsRepository.findBy({ userListId: antenna.userListId });
users = await this.usersRepository.findBy({

4
packages/backend/src/queue/processors/ExportBlockingProcessorService.ts
View file

@ -8,7 +8,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, Blocking } from '@/models/index.js';
import type { UsersRepository, BlockingsRepository, MiBlocking } from '@/models/index.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
@ -54,7 +54,7 @@ export class ExportBlockingProcessorService {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let cursor: Blocking['id'] | null = null;
let cursor: MiBlocking['id'] | null = null;
while (true) {
const blockings = await this.blockingsRepository.find({

8
packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
View file

@ -8,7 +8,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 { NoteFavorite, NoteFavoritesRepository, PollsRepository, User, UsersRepository } from '@/models/index.js';
import type { MiNoteFavorite, NoteFavoritesRepository, PollsRepository, MiUser, UsersRepository } from '@/models/index.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
@ -72,7 +72,7 @@ export class ExportFavoritesProcessorService {
await write('[');
let exportedFavoritesCount = 0;
let cursor: NoteFavorite['id'] | null = null;
let cursor: MiNoteFavorite['id'] | null = null;
while (true) {
const favorites = await this.noteFavoritesRepository.find({
@ -85,7 +85,7 @@ export class ExportFavoritesProcessorService {
id: 1,
},
relations: ['note', 'note.user'],
}) as (NoteFavorite & { note: MiNote & { user: User } })[];
}) as (MiNoteFavorite & { note: MiNote & { user: MiUser } })[];
if (favorites.length === 0) {
job.updateProgress(100);
@ -127,7 +127,7 @@ export class ExportFavoritesProcessorService {
}
}
function serialize(favorite: NoteFavorite & { note: MiNote & { user: User } }, poll: MiPoll | null = null): Record<string, unknown> {
function serialize(favorite: MiNoteFavorite & { note: MiNote & { user: MiUser } }, poll: MiPoll | null = null): Record<string, unknown> {
return {
id: favorite.id,
createdAt: favorite.createdAt,

4
packages/backend/src/queue/processors/ExportMutingProcessorService.ts
View file

@ -8,7 +8,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, Muting } from '@/models/index.js';
import type { MutingsRepository, UsersRepository, MiMuting } from '@/models/index.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import { createTemp } from '@/misc/create-temp.js';
@ -54,7 +54,7 @@ export class ExportMutingProcessorService {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let cursor: Muting['id'] | null = null;
let cursor: MiMuting['id'] | null = null;
while (true) {
const mutes = await this.mutingsRepository.find({