oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

refactor: prefix Mi for all entities (#11719)

Browse source 
* wip

* wip

* wip

* wip

* Update RepositoryModule.ts

* wip

* wip

* wip

* Revert "wip"

This reverts commit c1c13b37d2aaf3c65bc148212da302b0eb7868bf.
This commit is contained in:
syuilo 2023-08-16 17:51:28 +09:00 • committed by GitHub
parent 9264ca336b
commit 792622aead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
229 changed files with 1990 additions and 1990 deletions
Download patch file Download diff file Expand all files Collapse all files

28
packages/backend/src/core/entities/DriveFileEntityService.ts
View file

@ -10,10 +10,13 @@ import type { DriveFilesRepository } from '@/models/index.js';
import type { Config } from '@/config.js';
import type { Packed } from '@/misc/json-schema.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { User } from '@/models/entities/User.js';
import type { DriveFile } from '@/models/entities/DriveFile.js';
import type { MiUser } from '@/models/entities/User.js';
import type { MiDriveFile } from '@/models/entities/DriveFile.js';
import { appendQuery, query } from '@/misc/prelude/url.js';
import { deepClone } from '@/misc/clone.js';
import { bindThis } from '@/decorators.js';
import { isMimeImage } from '@/misc/is-mime-image.js';
import { isNotNull } from '@/misc/is-not-null.js';
import { UtilityService } from '../UtilityService.js';
import { VideoProcessingService } from '../VideoProcessingService.js';
import { UserEntityService } from './UserEntityService.js';
@ -24,9 +27,6 @@ type PackOptions = {
self?: boolean,
withUser?: boolean,
};
import { bindThis } from '@/decorators.js';
import { isMimeImage } from '@/misc/is-mime-image.js';
import { isNotNull } from '@/misc/is-not-null.js';
@Injectable()
export class DriveFileEntityService {
@ -59,7 +59,7 @@ export class DriveFileEntityService {
}
@bindThis
public getPublicProperties(file: DriveFile): DriveFile['properties'] {
public getPublicProperties(file: MiDriveFile): MiDriveFile['properties'] {
if (file.properties.orientation != null) {
const properties = deepClone(file.properties);
if (file.properties.orientation >= 5) {
@ -84,7 +84,7 @@ export class DriveFileEntityService {
}
@bindThis
public getThumbnailUrl(file: DriveFile): string | null {
public getThumbnailUrl(file: MiDriveFile): string | null {
if (file.type.startsWith('video')) {
if (file.thumbnailUrl) return file.thumbnailUrl;
@ -107,7 +107,7 @@ export class DriveFileEntityService {
}
@bindThis
public getPublicUrl(file: DriveFile, mode?: 'avatar'): string { // static = thumbnail
public getPublicUrl(file: MiDriveFile, mode?: 'avatar'): string { // static = thumbnail
// リモートかつメディアプロキシ
if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
return this.getProxiedUrl(file.uri, mode);
@ -133,7 +133,7 @@ export class DriveFileEntityService {
}
@bindThis
public async calcDriveUsageOf(user: User['id'] | { id: User['id'] }): Promise<number> {
public async calcDriveUsageOf(user: MiUser['id'] | { id: MiUser['id'] }): Promise<number> {
const id = typeof user === 'object' ? user.id : user;
const { sum } = await this.driveFilesRepository
@ -184,7 +184,7 @@ export class DriveFileEntityService {
@bindThis
public async pack(
src: DriveFile['id'] | DriveFile,
src: MiDriveFile['id'] | MiDriveFile,
options?: PackOptions,
): Promise<Packed<'DriveFile'>> {
const opts = Object.assign({
@ -218,7 +218,7 @@ export class DriveFileEntityService {
@bindThis
public async packNullable(
src: DriveFile['id'] | DriveFile,
src: MiDriveFile['id'] | MiDriveFile,
options?: PackOptions,
): Promise<Packed<'DriveFile'> | null> {
const opts = Object.assign({
@ -253,7 +253,7 @@ export class DriveFileEntityService {
@bindThis
public async packMany(
files: DriveFile[],
files: MiDriveFile[],
options?: PackOptions,
): Promise<Packed<'DriveFile'>[]> {
const items = await Promise.all(files.map(f => this.packNullable(f, options)));
@ -262,7 +262,7 @@ export class DriveFileEntityService {
@bindThis
public async packManyByIdsMap(
fileIds: DriveFile['id'][],
fileIds: MiDriveFile['id'][],
options?: PackOptions,
): Promise<Map<Packed<'DriveFile'>['id'], Packed<'DriveFile'> | null>> {
if (fileIds.length === 0) return new Map();
@ -277,7 +277,7 @@ export class DriveFileEntityService {
@bindThis
public async packManyByIds(
fileIds: DriveFile['id'][],
fileIds: MiDriveFile['id'][],
options?: PackOptions,
): Promise<Packed<'DriveFile'>[]> {
if (fileIds.length === 0) return [];