sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: introduce bindThis decorator to bind this automaticaly

Browse Source
This commit is contained in:
syuilo
2022-12-04 15:03:09 +09:00
parent e73581f715
commit bbb49457f9
199 changed files with 969 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/backend/src/core/entities/AbuseUserReportEntityService.ts
View File

@@ -4,6 +4,7 @@ import type { AbuseUserReportsRepository } from '@/models/index.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class AbuseUserReportEntityService {
@@ -15,6 +16,7 @@ export class AbuseUserReportEntityService {
) {
}
@bindThis
public async pack(
src: AbuseUserReport['id'] | AbuseUserReport,
) {
@@ -41,6 +43,7 @@ export class AbuseUserReportEntityService {
});
}
@bindThis
public packMany(
reports: any[],
) {

2
packages/backend/src/core/entities/AntennaEntityService.ts
View File

@@ -4,6 +4,7 @@ import type { AntennaNotesRepository, AntennasRepository, UserGroupJoiningsRepos
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { Packed } from '@/misc/schema.js';
import type { Antenna } from '@/models/entities/Antenna.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class AntennaEntityService {
@@ -19,6 +20,7 @@ export class AntennaEntityService {
) {
}
@bindThis
public async pack(
src: Antenna['id'] | Antenna,
): Promise<Packed<'Antenna'>> {

2
packages/backend/src/core/entities/AppEntityService.ts
View File

@@ -6,6 +6,7 @@ import type { Packed } from '@/misc/schema.js';
import type { App } from '@/models/entities/App.js';
import type { User } from '@/models/entities/User.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class AppEntityService {
@@ -18,6 +19,7 @@ export class AppEntityService {
) {
}
@bindThis
public async pack(
src: App['id'] | App,
me?: { id: User['id'] } | null | undefined,

2
packages/backend/src/core/entities/AuthSessionEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { AuthSession } from '@/models/entities/AuthSession.js';
import type { User } from '@/models/entities/User.js';
import { UserEntityService } from './UserEntityService.js';
import { AppEntityService } from './AppEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class AuthSessionEntityService {
@@ -18,6 +19,7 @@ export class AuthSessionEntityService {
) {
}
@bindThis
public async pack(
src: AuthSession['id'] | AuthSession,
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/BlockingEntityService.ts
View File

@@ -6,6 +6,7 @@ import type { Packed } from '@/misc/schema.js';
import type { Blocking } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class BlockingEntityService {
@@ -17,6 +18,7 @@ export class BlockingEntityService {
) {
}
@bindThis
public async pack(
src: Blocking['id'] | Blocking,
me?: { id: User['id'] } | null | undefined,
@@ -33,6 +35,7 @@ export class BlockingEntityService {
});
}
@bindThis
public packMany(
blockings: any[],
me: { id: User['id'] },

2
packages/backend/src/core/entities/ChannelEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { Channel } from '@/models/entities/Channel.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class ChannelEntityService {
@@ -29,6 +30,7 @@ export class ChannelEntityService {
) {
}
@bindThis
public async pack(
src: Channel['id'] | Channel,
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/ClipEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { Clip } from '@/models/entities/Clip.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class ClipEntityService {
@@ -18,6 +19,7 @@ export class ClipEntityService {
) {
}
@bindThis
public async pack(
src: Clip['id'] | Clip,
): Promise<Packed<'Clip'>> {
@@ -34,6 +36,7 @@ export class ClipEntityService {
});
}
@bindThis
public packMany(
clips: Clip[],
) {

11
packages/backend/src/core/entities/DriveFileEntityService.ts
View File

@@ -19,6 +19,7 @@ type PackOptions = {
self?: boolean,
withUser?: boolean,
};
import { bindThis } from '@/decorators.js';
@Injectable()
export class DriveFileEntityService {
@@ -44,6 +45,7 @@ export class DriveFileEntityService {
) {
}
@bindThis
public validateFileName(name: string): boolean {
return (
(name.trim().length > 0) &&
@@ -54,6 +56,7 @@ export class DriveFileEntityService {
);
}
@bindThis
public getPublicProperties(file: DriveFile): DriveFile['properties'] {
if (file.properties.orientation != null) {
const properties = deepClone(file.properties);
@@ -67,6 +70,7 @@ export class DriveFileEntityService {
return file.properties;
}
@bindThis
public getPublicUrl(file: DriveFile, thumbnail = false): string | null {
// リモートかつメディアプロキシ
if (file.uri != null && file.userHost != null && this.config.mediaProxy != null) {
@@ -90,6 +94,7 @@ export class DriveFileEntityService {
return thumbnail ? (file.thumbnailUrl ?? (isImage ? (file.webpublicUrl ?? file.url) : null)) : (file.webpublicUrl ?? file.url);
}
@bindThis
public async calcDriveUsageOf(user: User['id'] | { id: User['id'] }): Promise<number> {
const id = typeof user === 'object' ? user.id : user;
@@ -103,6 +108,7 @@ export class DriveFileEntityService {
return parseInt(sum, 10) ?? 0;
}
@bindThis
public async calcDriveUsageOfHost(host: string): Promise<number> {
const { sum } = await this.driveFilesRepository
.createQueryBuilder('file')
@@ -114,6 +120,7 @@ export class DriveFileEntityService {
return parseInt(sum, 10) ?? 0;
}
@bindThis
public async calcDriveUsageOfLocal(): Promise<number> {
const { sum } = await this.driveFilesRepository
.createQueryBuilder('file')
@@ -125,6 +132,7 @@ export class DriveFileEntityService {
return parseInt(sum, 10) ?? 0;
}
@bindThis
public async calcDriveUsageOfRemote(): Promise<number> {
const { sum } = await this.driveFilesRepository
.createQueryBuilder('file')
@@ -136,6 +144,7 @@ export class DriveFileEntityService {
return parseInt(sum, 10) ?? 0;
}
@bindThis
public async pack(
src: DriveFile['id'] | DriveFile,
options?: PackOptions,
@@ -169,6 +178,7 @@ export class DriveFileEntityService {
});
}
@bindThis
public async packNullable(
src: DriveFile['id'] | DriveFile,
options?: PackOptions,
@@ -203,6 +213,7 @@ export class DriveFileEntityService {
});
}
@bindThis
public async packMany(
files: (DriveFile['id'] | DriveFile)[],
options?: PackOptions,

2
packages/backend/src/core/entities/DriveFolderEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { DriveFolder } from '@/models/entities/DriveFolder.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class DriveFolderEntityService {
@@ -19,6 +20,7 @@ export class DriveFolderEntityService {
) {
}
@bindThis
public async pack(
src: DriveFolder['id'] | DriveFolder,
options?: {

3
packages/backend/src/core/entities/EmojiEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { Emoji } from '@/models/entities/Emoji.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class EmojiEntityService {
@@ -18,6 +19,7 @@ export class EmojiEntityService {
) {
}
@bindThis
public async pack(
src: Emoji['id'] | Emoji,
): Promise<Packed<'Emoji'>> {
@@ -34,6 +36,7 @@ export class EmojiEntityService {
};
}
@bindThis
public packMany(
emojis: any[],
) {

2
packages/backend/src/core/entities/FollowRequestEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { FollowRequest } from '@/models/entities/FollowRequest.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class FollowRequestEntityService {
@@ -18,6 +19,7 @@ export class FollowRequestEntityService {
) {
}
@bindThis
public async pack(
src: FollowRequest['id'] | FollowRequest,
me?: { id: User['id'] } | null | undefined,

7
packages/backend/src/core/entities/FollowingEntityService.ts
View File

@@ -31,6 +31,7 @@ type RemoteFolloweeFollowing = Following & {
followeeInbox: string;
followeeSharedInbox: string;
};
import { bindThis } from '@/decorators.js';
@Injectable()
export class FollowingEntityService {
@@ -42,22 +43,27 @@ export class FollowingEntityService {
) {
}
@bindThis
public isLocalFollower(following: Following): following is LocalFollowerFollowing {
return following.followerHost == null;
}
@bindThis
public isRemoteFollower(following: Following): following is RemoteFollowerFollowing {
return following.followerHost != null;
}
@bindThis
public isLocalFollowee(following: Following): following is LocalFolloweeFollowing {
return following.followeeHost == null;
}
@bindThis
public isRemoteFollowee(following: Following): following is RemoteFolloweeFollowing {
return following.followeeHost != null;
}
@bindThis
public async pack(
src: Following['id'] | Following,
me?: { id: User['id'] } | null | undefined,
@@ -84,6 +90,7 @@ export class FollowingEntityService {
});
}
@bindThis
public packMany(
followings: any[],
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/GalleryLikeEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { GalleryLike } from '@/models/entities/GalleryLike.js';
import { UserEntityService } from './UserEntityService.js';
import { GalleryPostEntityService } from './GalleryPostEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class GalleryLikeEntityService {
@@ -19,6 +20,7 @@ export class GalleryLikeEntityService {
) {
}
@bindThis
public async pack(
src: GalleryLike['id'] | GalleryLike,
me?: any,
@@ -31,6 +33,7 @@ export class GalleryLikeEntityService {
};
}
@bindThis
public packMany(
likes: any[],
me: any,

3
packages/backend/src/core/entities/GalleryPostEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { GalleryPost } from '@/models/entities/GalleryPost.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class GalleryPostEntityService {
@@ -23,6 +24,7 @@ export class GalleryPostEntityService {
) {
}
@bindThis
public async pack(
src: GalleryPost['id'] | GalleryPost,
me?: { id: User['id'] } | null | undefined,
@@ -47,6 +49,7 @@ export class GalleryPostEntityService {
});
}
@bindThis
public packMany(
posts: GalleryPost[],
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/HashtagEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { Hashtag } from '@/models/entities/Hashtag.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class HashtagEntityService {
@@ -18,6 +19,7 @@ export class HashtagEntityService {
) {
}
@bindThis
public async pack(
src: Hashtag,
): Promise<Packed<'Hashtag'>> {
@@ -32,6 +34,7 @@ export class HashtagEntityService {
};
}
@bindThis
public packMany(
hashtags: Hashtag[],
) {

3
packages/backend/src/core/entities/InstanceEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { Instance } from '@/models/entities/Instance.js';
import { MetaService } from '@/core/MetaService.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class InstanceEntityService {
@@ -19,6 +20,7 @@ export class InstanceEntityService {
) {
}
@bindThis
public async pack(
instance: Instance,
): Promise<Packed<'FederationInstance'>> {
@@ -50,6 +52,7 @@ export class InstanceEntityService {
};
}
@bindThis
public packMany(
instances: Instance[],
) {

2
packages/backend/src/core/entities/MessagingMessageEntityService.ts
View File

@@ -9,6 +9,7 @@ import type { MessagingMessage } from '@/models/entities/MessagingMessage.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { UserGroupEntityService } from './UserGroupEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class MessagingMessageEntityService {
@@ -22,6 +23,7 @@ export class MessagingMessageEntityService {
) {
}
@bindThis
public async pack(
src: MessagingMessage['id'] | MessagingMessage,
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/ModerationLogEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { ModerationLog } from '@/models/entities/ModerationLog.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class ModerationLogEntityService {
@@ -18,6 +19,7 @@ export class ModerationLogEntityService {
) {
}
@bindThis
public async pack(
src: ModerationLog['id'] | ModerationLog,
) {
@@ -35,6 +37,7 @@ export class ModerationLogEntityService {
});
}
@bindThis
public packMany(
reports: any[],
) {

3
packages/backend/src/core/entities/MutingEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { Muting } from '@/models/entities/Muting.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class MutingEntityService {
@@ -18,6 +19,7 @@ export class MutingEntityService {
) {
}
@bindThis
public async pack(
src: Muting['id'] | Muting,
me?: { id: User['id'] } | null | undefined,
@@ -35,6 +37,7 @@ export class MutingEntityService {
});
}
@bindThis
public packMany(
mutings: any[],
me: { id: User['id'] },

8
packages/backend/src/core/entities/NoteEntityService.ts
View File

@@ -16,6 +16,7 @@ import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { ReactionService } from '../ReactionService.js';
import type { UserEntityService } from './UserEntityService.js';
import type { DriveFileEntityService } from './DriveFileEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class NoteEntityService implements OnModuleInit {
@@ -68,6 +69,7 @@ export class NoteEntityService implements OnModuleInit {
this.reactionService = this.moduleRef.get('ReactionService');
}
@bindThis
private async hideNote(packedNote: Packed<'Note'>, meId: User['id'] | null) {
// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
let hide = false;
@@ -128,6 +130,7 @@ export class NoteEntityService implements OnModuleInit {
}
}
@bindThis
private async populatePoll(note: Note, meId: User['id'] | null) {
const poll = await this.pollsRepository.findOneByOrFail({ noteId: note.id });
const choices = poll.choices.map(c => ({
@@ -166,6 +169,7 @@ export class NoteEntityService implements OnModuleInit {
};
}
@bindThis
private async populateMyReaction(note: Note, meId: User['id'], _hint_?: {
myReactions: Map<Note['id'], NoteReaction | null>;
}) {
@@ -191,6 +195,7 @@ export class NoteEntityService implements OnModuleInit {
return undefined;
}
@bindThis
public async isVisibleForMe(note: Note, meId: User['id'] | null): Promise<boolean> {
// This code must always be synchronized with the checks in generateVisibilityQuery.
// visibility が specified かつ自分が指定されていなかったら非表示
@@ -244,6 +249,7 @@ export class NoteEntityService implements OnModuleInit {
return true;
}
@bindThis
public async pack(
src: Note['id'] | Note,
me?: { id: User['id'] } | null | undefined,
@@ -353,6 +359,7 @@ export class NoteEntityService implements OnModuleInit {
return packed;
}
@bindThis
public async packMany(
notes: Note[],
me?: { id: User['id'] } | null | undefined,
@@ -388,6 +395,7 @@ export class NoteEntityService implements OnModuleInit {
})));
}
@bindThis
public async countSameRenotes(userId: string, renoteId: string, excludeNoteId: string | undefined): Promise<number> {
// 指定したユーザーの指定したノートのリノートがいくつあるか数える
const query = this.notesRepository.createQueryBuilder('note')

3
packages/backend/src/core/entities/NoteFavoriteEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { NoteFavorite } from '@/models/entities/NoteFavorite.js';
import { UserEntityService } from './UserEntityService.js';
import { NoteEntityService } from './NoteEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class NoteFavoriteEntityService {
@@ -19,6 +20,7 @@ export class NoteFavoriteEntityService {
) {
}
@bindThis
public async pack(
src: NoteFavorite['id'] | NoteFavorite,
me?: { id: User['id'] } | null | undefined,
@@ -33,6 +35,7 @@ export class NoteFavoriteEntityService {
};
}
@bindThis
public packMany(
favorites: any[],
me: { id: User['id'] },

2
packages/backend/src/core/entities/NoteReactionEntityService.ts
View File

@@ -11,6 +11,7 @@ import type { ReactionService } from '../ReactionService.js';
import type { UserEntityService } from './UserEntityService.js';
import type { NoteEntityService } from './NoteEntityService.js';
import { ModuleRef } from '@nestjs/core';
import { bindThis } from '@/decorators.js';
@Injectable()
export class NoteReactionEntityService implements OnModuleInit {
@@ -36,6 +37,7 @@ export class NoteReactionEntityService implements OnModuleInit {
this.reactionService = this.moduleRef.get('ReactionService');
}
@bindThis
public async pack(
src: NoteReaction['id'] | NoteReaction,
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/NotificationEntityService.ts
View File

@@ -13,6 +13,7 @@ import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { UserEntityService } from './UserEntityService.js';
import type { NoteEntityService } from './NoteEntityService.js';
import type { UserGroupInvitationEntityService } from './UserGroupInvitationEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class NotificationEntityService implements OnModuleInit {
@@ -47,6 +48,7 @@ export class NotificationEntityService implements OnModuleInit {
this.customEmojiService = this.moduleRef.get('CustomEmojiService');
}
@bindThis
public async pack(
src: Notification['id'] | Notification,
options: {
@@ -120,6 +122,7 @@ export class NotificationEntityService implements OnModuleInit {
});
}
@bindThis
public async packMany(
notifications: Notification[],
meId: User['id'],

3
packages/backend/src/core/entities/PageEntityService.ts
View File

@@ -9,6 +9,7 @@ import type { Page } from '@/models/entities/Page.js';
import type { DriveFile } from '@/models/entities/DriveFile.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class PageEntityService {
@@ -27,6 +28,7 @@ export class PageEntityService {
) {
}
@bindThis
public async pack(
src: Page['id'] | Page,
me?: { id: User['id'] } | null | undefined,
@@ -99,6 +101,7 @@ export class PageEntityService {
});
}
@bindThis
public packMany(
pages: Page[],
me?: { id: User['id'] } | null | undefined,

3
packages/backend/src/core/entities/PageLikeEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { PageLike } from '@/models/entities/PageLike.js';
import { UserEntityService } from './UserEntityService.js';
import { PageEntityService } from './PageEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class PageLikeEntityService {
@@ -19,6 +20,7 @@ export class PageLikeEntityService {
) {
}
@bindThis
public async pack(
src: PageLike['id'] | PageLike,
me?: { id: User['id'] } | null | undefined,
@@ -31,6 +33,7 @@ export class PageLikeEntityService {
};
}
@bindThis
public packMany(
likes: any[],
me: { id: User['id'] },

2
packages/backend/src/core/entities/SigninEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { Signin } from '@/models/entities/Signin.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class SigninEntityService {
@@ -18,6 +19,7 @@ export class SigninEntityService {
) {
}
@bindThis
public async pack(
src: Signin,
) {

12
packages/backend/src/core/entities/UserEntityService.ts
View File

@@ -41,6 +41,7 @@ function isRemoteUser<T extends { host: User['host'] }>(user: T): user is T & {
function isRemoteUser(user: User | { host: User['host'] }): boolean {
return !isLocalUser(user);
}
import { bindThis } from '@/decorators.js';
@Injectable()
export class UserEntityService implements OnModuleInit {
@@ -143,6 +144,7 @@ export class UserEntityService implements OnModuleInit {
public isLocalUser = isLocalUser;
public isRemoteUser = isRemoteUser;
@bindThis
public async getRelation(me: User['id'], target: User['id']) {
return awaitAll({
id: target,
@@ -198,6 +200,7 @@ export class UserEntityService implements OnModuleInit {
});
}
@bindThis
public async getHasUnreadMessagingMessage(userId: User['id']): Promise<boolean> {
const mute = await this.mutingsRepository.findBy({
muterId: userId,
@@ -227,6 +230,7 @@ export class UserEntityService implements OnModuleInit {
return withUser || withGroups.some(x => x);
}
@bindThis
public async getHasUnreadAnnouncement(userId: User['id']): Promise<boolean> {
const reads = await this.announcementReadsRepository.findBy({
userId: userId,
@@ -239,6 +243,7 @@ export class UserEntityService implements OnModuleInit {
return count > 0;
}
@bindThis
public async getHasUnreadAntenna(userId: User['id']): Promise<boolean> {
const myAntennas = (await this.antennaService.getAntennas()).filter(a => a.userId === userId);
@@ -250,6 +255,7 @@ export class UserEntityService implements OnModuleInit {
return unread != null;
}
@bindThis
public async getHasUnreadChannel(userId: User['id']): Promise<boolean> {
const channels = await this.channelFollowingsRepository.findBy({ followerId: userId });
@@ -261,6 +267,7 @@ export class UserEntityService implements OnModuleInit {
return unread != null;
}
@bindThis
public async getHasUnreadNotification(userId: User['id']): Promise<boolean> {
const mute = await this.mutingsRepository.findBy({
muterId: userId,
@@ -279,6 +286,7 @@ export class UserEntityService implements OnModuleInit {
return count > 0;
}
@bindThis
public async getHasPendingReceivedFollowRequest(userId: User['id']): Promise<boolean> {
const count = await this.followRequestsRepository.countBy({
followeeId: userId,
@@ -287,6 +295,7 @@ export class UserEntityService implements OnModuleInit {
return count > 0;
}
@bindThis
public getOnlineStatus(user: User): 'unknown' | 'online' | 'active' | 'offline' {
if (user.hideOnlineStatus) return 'unknown';
if (user.lastActiveDate == null) return 'unknown';
@@ -298,6 +307,7 @@ export class UserEntityService implements OnModuleInit {
);
}
@bindThis
public async getAvatarUrl(user: User): Promise<string> {
if (user.avatar) {
return this.driveFileEntityService.getPublicUrl(user.avatar, true) ?? this.getIdenticonUrl(user.id);
@@ -309,6 +319,7 @@ export class UserEntityService implements OnModuleInit {
}
}
@bindThis
public getAvatarUrlSync(user: User): string {
if (user.avatar) {
return this.driveFileEntityService.getPublicUrl(user.avatar, true) ?? this.getIdenticonUrl(user.id);
@@ -317,6 +328,7 @@ export class UserEntityService implements OnModuleInit {
}
}
@bindThis
public getIdenticonUrl(userId: User['id']): string {
return `${this.config.url}/identicon/${userId}`;
}

2
packages/backend/src/core/entities/UserGroupEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { UserGroup } from '@/models/entities/UserGroup.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class UserGroupEntityService {
@@ -21,6 +22,7 @@ export class UserGroupEntityService {
) {
}
@bindThis
public async pack(
src: UserGroup['id'] | UserGroup,
): Promise<Packed<'UserGroup'>> {

3
packages/backend/src/core/entities/UserGroupInvitationEntityService.ts
View File

@@ -8,6 +8,7 @@ import type { User } from '@/models/entities/User.js';
import type { UserGroupInvitation } from '@/models/entities/UserGroupInvitation.js';
import { UserEntityService } from './UserEntityService.js';
import { UserGroupEntityService } from './UserGroupEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class UserGroupInvitationEntityService {
@@ -19,6 +20,7 @@ export class UserGroupInvitationEntityService {
) {
}
@bindThis
public async pack(
src: UserGroupInvitation['id'] | UserGroupInvitation,
) {
@@ -30,6 +32,7 @@ export class UserGroupInvitationEntityService {
};
}
@bindThis
public packMany(
invitations: any[],
) {

2
packages/backend/src/core/entities/UserListEntityService.ts
View File

@@ -7,6 +7,7 @@ import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { UserList } from '@/models/entities/UserList.js';
import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class UserListEntityService {
@@ -21,6 +22,7 @@ export class UserListEntityService {
) {
}
@bindThis
public async pack(
src: UserList['id'] | UserList,
): Promise<Packed<'UserList'>> {