2023-07-27 05:31:52 +00:00
|
|
|
/*
|
|
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
|
|
*/
|
|
|
|
|
2023-02-16 14:09:41 +00:00
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
2023-04-14 04:50:05 +00:00
|
|
|
import * as Redis from 'ioredis';
|
2023-06-25 12:13:15 +00:00
|
|
|
import _Ajv from 'ajv';
|
2022-09-17 18:27:08 +00:00
|
|
|
import { ModuleRef } from '@nestjs/core';
|
|
|
|
import { DI } from '@/di-symbols.js';
|
2022-09-20 20:33:11 +00:00
|
|
|
import type { Config } from '@/config.js';
|
2023-03-10 05:22:37 +00:00
|
|
|
import type { Packed } from '@/misc/json-schema.js';
|
2022-09-17 18:27:08 +00:00
|
|
|
import type { Promiseable } from '@/misc/prelude/await-all.js';
|
|
|
|
import { awaitAll } from '@/misc/prelude/await-all.js';
|
2022-02-27 02:07:39 +00:00
|
|
|
import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
|
2023-09-20 02:33:36 +00:00
|
|
|
import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
|
|
|
|
import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/User.js';
|
2023-11-01 04:34:05 +00:00
|
|
|
import { MiNotification } from '@/models/Notification.js';
|
2023-09-15 05:28:29 +00:00
|
|
|
import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, UserNotePiningsRepository, UserProfilesRepository, AnnouncementReadsRepository, AnnouncementsRepository, MiUserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/_.js';
|
2023-01-12 12:02:26 +00:00
|
|
|
import { bindThis } from '@/decorators.js';
|
|
|
|
import { RoleService } from '@/core/RoleService.js';
|
2023-04-08 05:16:26 +00:00
|
|
|
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
|
2023-04-07 09:48:45 +00:00
|
|
|
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
|
2023-10-16 01:45:22 +00:00
|
|
|
import { IdService } from '@/core/IdService.js';
|
2023-10-21 09:38:07 +00:00
|
|
|
import type { AnnouncementService } from '@/core/AnnouncementService.js';
|
|
|
|
import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
|
|
|
|
import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
|
2022-09-17 18:27:08 +00:00
|
|
|
import type { OnModuleInit } from '@nestjs/common';
|
|
|
|
import type { NoteEntityService } from './NoteEntityService.js';
|
|
|
|
import type { DriveFileEntityService } from './DriveFileEntityService.js';
|
|
|
|
import type { PageEntityService } from './PageEntityService.js';
|
2019-04-23 13:35:26 +00:00
|
|
|
|
2022-01-18 13:27:10 +00:00
|
|
|
type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>;
|
|
|
|
type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> =
|
2023-04-08 05:16:26 +00:00
|
|
|
Detailed extends true ?
|
2022-01-18 13:27:10 +00:00
|
|
|
ExpectsMe extends true ? Packed<'MeDetailed'> :
|
|
|
|
ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
|
|
|
|
Packed<'UserDetailed'> :
|
|
|
|
Packed<'UserLite'>;
|
|
|
|
|
2023-06-25 12:13:15 +00:00
|
|
|
const Ajv = _Ajv.default;
|
2022-02-19 05:05:32 +00:00
|
|
|
const ajv = new Ajv();
|
|
|
|
|
2023-08-16 08:51:28 +00:00
|
|
|
function isLocalUser(user: MiUser): user is MiLocalUser;
|
|
|
|
function isLocalUser<T extends { host: MiUser['host'] }>(user: T): user is (T & { host: null; });
|
|
|
|
function isLocalUser(user: MiUser | { host: MiUser['host'] }): boolean {
|
2022-03-26 06:34:00 +00:00
|
|
|
return user.host == null;
|
|
|
|
}
|
|
|
|
|
2023-08-16 08:51:28 +00:00
|
|
|
function isRemoteUser(user: MiUser): user is MiRemoteUser;
|
|
|
|
function isRemoteUser<T extends { host: MiUser['host'] }>(user: T): user is (T & { host: string; });
|
|
|
|
function isRemoteUser(user: MiUser | { host: MiUser['host'] }): boolean {
|
2022-03-26 06:34:00 +00:00
|
|
|
return !isLocalUser(user);
|
|
|
|
}
|
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
@Injectable()
|
|
|
|
export class UserEntityService implements OnModuleInit {
|
2023-04-08 05:16:26 +00:00
|
|
|
private apPersonService: ApPersonService;
|
2022-09-17 18:27:08 +00:00
|
|
|
private noteEntityService: NoteEntityService;
|
|
|
|
private driveFileEntityService: DriveFileEntityService;
|
|
|
|
private pageEntityService: PageEntityService;
|
|
|
|
private customEmojiService: CustomEmojiService;
|
2023-08-13 11:12:29 +00:00
|
|
|
private announcementService: AnnouncementService;
|
2023-01-12 12:02:26 +00:00
|
|
|
private roleService: RoleService;
|
2023-04-07 09:48:45 +00:00
|
|
|
private federatedInstanceService: FederatedInstanceService;
|
2023-10-16 01:45:22 +00:00
|
|
|
private idService: IdService;
|
2023-10-21 09:38:07 +00:00
|
|
|
private avatarDecorationService: AvatarDecorationService;
|
2022-09-17 18:27:08 +00:00
|
|
|
|
|
|
|
constructor(
|
|
|
|
private moduleRef: ModuleRef,
|
|
|
|
|
|
|
|
@Inject(DI.config)
|
|
|
|
private config: Config,
|
|
|
|
|
2023-04-04 05:06:57 +00:00
|
|
|
@Inject(DI.redis)
|
|
|
|
private redisClient: Redis.Redis,
|
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
@Inject(DI.usersRepository)
|
|
|
|
private usersRepository: UsersRepository,
|
|
|
|
|
|
|
|
@Inject(DI.userSecurityKeysRepository)
|
|
|
|
private userSecurityKeysRepository: UserSecurityKeysRepository,
|
|
|
|
|
|
|
|
@Inject(DI.followingsRepository)
|
|
|
|
private followingsRepository: FollowingsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.followRequestsRepository)
|
|
|
|
private followRequestsRepository: FollowRequestsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.blockingsRepository)
|
|
|
|
private blockingsRepository: BlockingsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.mutingsRepository)
|
|
|
|
private mutingsRepository: MutingsRepository,
|
|
|
|
|
2023-03-07 23:56:09 +00:00
|
|
|
@Inject(DI.renoteMutingsRepository)
|
|
|
|
private renoteMutingsRepository: RenoteMutingsRepository,
|
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
@Inject(DI.driveFilesRepository)
|
|
|
|
private driveFilesRepository: DriveFilesRepository,
|
|
|
|
|
|
|
|
@Inject(DI.noteUnreadsRepository)
|
|
|
|
private noteUnreadsRepository: NoteUnreadsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.userNotePiningsRepository)
|
|
|
|
private userNotePiningsRepository: UserNotePiningsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.userProfilesRepository)
|
|
|
|
private userProfilesRepository: UserProfilesRepository,
|
|
|
|
|
|
|
|
@Inject(DI.announcementReadsRepository)
|
|
|
|
private announcementReadsRepository: AnnouncementReadsRepository,
|
|
|
|
|
|
|
|
@Inject(DI.announcementsRepository)
|
|
|
|
private announcementsRepository: AnnouncementsRepository,
|
|
|
|
|
2023-04-13 04:31:54 +00:00
|
|
|
@Inject(DI.userMemosRepository)
|
|
|
|
private userMemosRepository: UserMemoRepository,
|
2022-09-17 18:27:08 +00:00
|
|
|
) {
|
|
|
|
}
|
|
|
|
|
|
|
|
onModuleInit() {
|
2023-04-08 05:16:26 +00:00
|
|
|
this.apPersonService = this.moduleRef.get('ApPersonService');
|
2022-09-17 18:27:08 +00:00
|
|
|
this.noteEntityService = this.moduleRef.get('NoteEntityService');
|
|
|
|
this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
|
|
|
|
this.pageEntityService = this.moduleRef.get('PageEntityService');
|
|
|
|
this.customEmojiService = this.moduleRef.get('CustomEmojiService');
|
2023-08-13 11:12:29 +00:00
|
|
|
this.announcementService = this.moduleRef.get('AnnouncementService');
|
2023-01-12 12:02:26 +00:00
|
|
|
this.roleService = this.moduleRef.get('RoleService');
|
2023-04-07 09:48:45 +00:00
|
|
|
this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
|
2023-10-16 01:45:22 +00:00
|
|
|
this.idService = this.moduleRef.get('IdService');
|
2023-10-21 09:38:07 +00:00
|
|
|
this.avatarDecorationService = this.moduleRef.get('AvatarDecorationService');
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2022-02-19 05:05:32 +00:00
|
|
|
|
|
|
|
//#region Validators
|
2022-09-17 18:27:08 +00:00
|
|
|
public validateLocalUsername = ajv.compile(localUsernameSchema);
|
|
|
|
public validatePassword = ajv.compile(passwordSchema);
|
|
|
|
public validateName = ajv.compile(nameSchema);
|
|
|
|
public validateDescription = ajv.compile(descriptionSchema);
|
|
|
|
public validateLocation = ajv.compile(locationSchema);
|
|
|
|
public validateBirthday = ajv.compile(birthdaySchema);
|
2022-02-19 05:05:32 +00:00
|
|
|
//#endregion
|
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
public isLocalUser = isLocalUser;
|
|
|
|
public isRemoteUser = isRemoteUser;
|
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public async getRelation(me: MiUser['id'], target: MiUser['id']) {
|
2023-10-06 07:28:21 +00:00
|
|
|
const [
|
2023-09-21 09:48:15 +00:00
|
|
|
following,
|
2023-10-06 07:28:21 +00:00
|
|
|
isFollowed,
|
|
|
|
hasPendingFollowRequestFromYou,
|
|
|
|
hasPendingFollowRequestToYou,
|
|
|
|
isBlocking,
|
|
|
|
isBlocked,
|
|
|
|
isMuted,
|
|
|
|
isRenoteMuted,
|
|
|
|
] = await Promise.all([
|
|
|
|
this.followingsRepository.findOneBy({
|
|
|
|
followerId: me,
|
|
|
|
followeeId: target,
|
|
|
|
}),
|
|
|
|
this.followingsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
followerId: target,
|
|
|
|
followeeId: me,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.followRequestsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
followerId: me,
|
|
|
|
followeeId: target,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.followRequestsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
followerId: target,
|
|
|
|
followeeId: me,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.blockingsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
blockerId: me,
|
|
|
|
blockeeId: target,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.blockingsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
blockerId: target,
|
|
|
|
blockeeId: me,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.mutingsRepository.exist({
|
2022-05-29 06:15:52 +00:00
|
|
|
where: {
|
|
|
|
muterId: me,
|
|
|
|
muteeId: target,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
this.renoteMutingsRepository.exist({
|
2023-03-07 23:56:09 +00:00
|
|
|
where: {
|
|
|
|
muterId: me,
|
|
|
|
muteeId: target,
|
|
|
|
},
|
2023-10-06 07:28:21 +00:00
|
|
|
}),
|
|
|
|
]);
|
|
|
|
|
|
|
|
return {
|
|
|
|
id: target,
|
|
|
|
following,
|
|
|
|
isFollowing: following != null,
|
|
|
|
isFollowed,
|
|
|
|
hasPendingFollowRequestFromYou,
|
|
|
|
hasPendingFollowRequestToYou,
|
|
|
|
isBlocking,
|
|
|
|
isBlocked,
|
|
|
|
isMuted,
|
|
|
|
isRenoteMuted,
|
|
|
|
};
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2019-04-07 12:50:36 +00:00
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public async getHasUnreadAntenna(userId: MiUser['id']): Promise<boolean> {
|
2023-04-03 03:11:16 +00:00
|
|
|
/*
|
2022-09-17 18:27:08 +00:00
|
|
|
const myAntennas = (await this.antennaService.getAntennas()).filter(a => a.userId === userId);
|
2020-03-04 02:45:33 +00:00
|
|
|
|
2023-07-11 05:58:58 +00:00
|
|
|
const isUnread = (myAntennas.length > 0 ? await this.antennaNotesRepository.exist({
|
|
|
|
where: {
|
|
|
|
antennaId: In(myAntennas.map(x => x.id)),
|
|
|
|
read: false,
|
|
|
|
},
|
|
|
|
}) : false);
|
|
|
|
|
|
|
|
return isUnread;
|
2023-04-03 03:11:16 +00:00
|
|
|
*/
|
|
|
|
return false; // TODO
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2020-01-29 19:37:25 +00:00
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-11-01 04:34:05 +00:00
|
|
|
public async getNotificationsInfo(userId: MiUser['id']): Promise<{
|
|
|
|
hasUnread: boolean;
|
|
|
|
unreadCount: number;
|
|
|
|
}> {
|
|
|
|
const response = {
|
|
|
|
hasUnread: false,
|
|
|
|
unreadCount: 0,
|
|
|
|
};
|
|
|
|
|
2023-04-04 05:06:57 +00:00
|
|
|
const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${userId}`);
|
2023-04-08 05:16:26 +00:00
|
|
|
|
2023-11-01 04:34:05 +00:00
|
|
|
if (!latestReadNotificationId) {
|
|
|
|
response.unreadCount = await this.redisClient.xlen(`notificationTimeline:${userId}`);
|
|
|
|
} else {
|
|
|
|
const latestNotificationIdsRes = await this.redisClient.xrevrange(
|
|
|
|
`notificationTimeline:${userId}`,
|
|
|
|
'+',
|
|
|
|
latestReadNotificationId,
|
|
|
|
);
|
|
|
|
|
|
|
|
response.unreadCount = (latestNotificationIdsRes.length - 1 >= 0) ? latestNotificationIdsRes.length - 1 : 0;
|
|
|
|
}
|
2023-04-04 05:06:57 +00:00
|
|
|
|
2023-11-01 04:34:05 +00:00
|
|
|
if (response.unreadCount > 0) {
|
|
|
|
response.hasUnread = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return response;
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2020-01-29 19:37:25 +00:00
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public async getHasPendingReceivedFollowRequest(userId: MiUser['id']): Promise<boolean> {
|
2022-09-17 18:27:08 +00:00
|
|
|
const count = await this.followRequestsRepository.countBy({
|
2021-12-09 14:58:30 +00:00
|
|
|
followeeId: userId,
|
2020-02-15 00:10:49 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
return count > 0;
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2020-02-15 00:10:49 +00:00
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public getOnlineStatus(user: MiUser): 'unknown' | 'online' | 'active' | 'offline' {
|
2021-04-19 15:15:53 +00:00
|
|
|
if (user.hideOnlineStatus) return 'unknown';
|
2021-04-17 06:30:26 +00:00
|
|
|
if (user.lastActiveDate == null) return 'unknown';
|
|
|
|
const elapsed = Date.now() - user.lastActiveDate.getTime();
|
|
|
|
return (
|
|
|
|
elapsed < USER_ONLINE_THRESHOLD ? 'online' :
|
|
|
|
elapsed < USER_ACTIVE_THRESHOLD ? 'active' :
|
|
|
|
'offline'
|
|
|
|
);
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2021-04-17 06:30:26 +00:00
|
|
|
|
2022-12-04 06:03:09 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public getIdenticonUrl(user: MiUser): string {
|
2023-03-05 02:11:36 +00:00
|
|
|
return `${this.config.url}/identicon/${user.username.toLowerCase()}@${user.host ?? this.config.host}`;
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2022-02-27 04:59:10 +00:00
|
|
|
|
enhance: account migration (#10592)
* copy block and mute then create follow and unfollow jobs
* copy block and mute and update lists when detecting an account has moved
* no need to care promise orders
* refactor updating actor and target
* automatically accept if a locked account had accepted an old account
* fix exception format
* prevent the old account from calling some endpoints
* do not unfollow when moving
* adjust following and follower counts
* check movedToUri when receiving a follow request
* skip if no need to adjust
* Revert "disable account migration"
This reverts commit 2321214c98591bcfe1385c1ab5bf0ff7b471ae1d.
* fix translation specifier
* fix checking alsoKnownAs and uri
* fix updating account
* fix refollowing locked account
* decrease followersCount if followed by the old account
* adjust following and followers counts when unfollowing
* fix copying mutings
* prohibit moved account from moving again
* fix move service
* allow app creation after moving
* fix lint
* remove unnecessary field
* fix cache update
* add e2e test
* add e2e test of accepting the new account automatically
* force follow if any error happens
* remove unnecessary joins
* use Array.map instead of for const of
* ユーザーリストの移行は追加のみを行う
* nanka iroiro
* fix misskey-js?
* :v:
* 移行を行ったアカウントからのフォローリクエストの自動許可を調整
* newUriを外に出す
* newUriを外に出す2
* clean up
* fix newUri
* prevent moving if the destination account has already moved
* set alsoKnownAs via /i/update
* fix database initialization
* add return type
* prohibit updating alsoKnownAs after moving
* skip to add to alsoKnownAs if toUrl is known
* skip adding to the list if it already has
* use Acct.parse instead
* rename error code
* :art:
* 制限を5から10に緩和
* movedTo(Uri), alsoKnownAsはユーザーidを返すように
* test api res
* fix
* 元アカウントはミュートし続ける
* :art:
* unfollow
* fix
* getUserUriをUserEntityServiceに
* ?
* job!
* :art:
* instance => server
* accountMovedShort, forbiddenBecauseYouAreMigrated
* accountMovedShort
* fix test
* import, pin禁止
* 実績を凍結する
* clean up
* :v:
* change message
* ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに
* Revert "ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに"
This reverts commit 3bd7be35d8aa455cb01ae58f8172a71a50485db1.
* validateAlsoKnownAs
* 移行後2時間以内はインポート可能なファイルサイズを拡大
* clean up
* どうせactorをupdatePersonで更新するならupdatePersonしか移行処理を発行しないことにする
* handle error?
* リモートからの移行処理の条件を是正
* log, port
* fix
* fix
* enhance(dev): non-production環境でhttpサーバー間でもユーザー、ノートの連合が可能なように
* refactor (use checkHttps)
* MISSKEY_WEBFINGER_USE_HTTP
* Environment Variable readme
* NEVER USE IN PRODUCTION
* fix punyHost
* fix indent
* fix
* experimental
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-29 15:09:29 +00:00
|
|
|
@bindThis
|
2023-08-16 08:51:28 +00:00
|
|
|
public getUserUri(user: MiLocalUser | MiPartialLocalUser | MiRemoteUser | MiPartialRemoteUser): string {
|
enhance: account migration (#10592)
* copy block and mute then create follow and unfollow jobs
* copy block and mute and update lists when detecting an account has moved
* no need to care promise orders
* refactor updating actor and target
* automatically accept if a locked account had accepted an old account
* fix exception format
* prevent the old account from calling some endpoints
* do not unfollow when moving
* adjust following and follower counts
* check movedToUri when receiving a follow request
* skip if no need to adjust
* Revert "disable account migration"
This reverts commit 2321214c98591bcfe1385c1ab5bf0ff7b471ae1d.
* fix translation specifier
* fix checking alsoKnownAs and uri
* fix updating account
* fix refollowing locked account
* decrease followersCount if followed by the old account
* adjust following and followers counts when unfollowing
* fix copying mutings
* prohibit moved account from moving again
* fix move service
* allow app creation after moving
* fix lint
* remove unnecessary field
* fix cache update
* add e2e test
* add e2e test of accepting the new account automatically
* force follow if any error happens
* remove unnecessary joins
* use Array.map instead of for const of
* ユーザーリストの移行は追加のみを行う
* nanka iroiro
* fix misskey-js?
* :v:
* 移行を行ったアカウントからのフォローリクエストの自動許可を調整
* newUriを外に出す
* newUriを外に出す2
* clean up
* fix newUri
* prevent moving if the destination account has already moved
* set alsoKnownAs via /i/update
* fix database initialization
* add return type
* prohibit updating alsoKnownAs after moving
* skip to add to alsoKnownAs if toUrl is known
* skip adding to the list if it already has
* use Acct.parse instead
* rename error code
* :art:
* 制限を5から10に緩和
* movedTo(Uri), alsoKnownAsはユーザーidを返すように
* test api res
* fix
* 元アカウントはミュートし続ける
* :art:
* unfollow
* fix
* getUserUriをUserEntityServiceに
* ?
* job!
* :art:
* instance => server
* accountMovedShort, forbiddenBecauseYouAreMigrated
* accountMovedShort
* fix test
* import, pin禁止
* 実績を凍結する
* clean up
* :v:
* change message
* ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに
* Revert "ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに"
This reverts commit 3bd7be35d8aa455cb01ae58f8172a71a50485db1.
* validateAlsoKnownAs
* 移行後2時間以内はインポート可能なファイルサイズを拡大
* clean up
* どうせactorをupdatePersonで更新するならupdatePersonしか移行処理を発行しないことにする
* handle error?
* リモートからの移行処理の条件を是正
* log, port
* fix
* fix
* enhance(dev): non-production環境でhttpサーバー間でもユーザー、ノートの連合が可能なように
* refactor (use checkHttps)
* MISSKEY_WEBFINGER_USE_HTTP
* Environment Variable readme
* NEVER USE IN PRODUCTION
* fix punyHost
* fix indent
* fix
* experimental
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-29 15:09:29 +00:00
|
|
|
return this.isRemoteUser(user)
|
|
|
|
? user.uri : this.genLocalUserUri(user.id);
|
|
|
|
}
|
|
|
|
|
|
|
|
@bindThis
|
|
|
|
public genLocalUserUri(userId: string): string {
|
|
|
|
return `${this.config.url}/users/${userId}`;
|
|
|
|
}
|
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
public async pack<ExpectsMe extends boolean | null = null, D extends boolean = false>(
|
2023-08-16 08:51:28 +00:00
|
|
|
src: MiUser['id'] | MiUser,
|
|
|
|
me?: { id: MiUser['id']; } | null | undefined,
|
2019-04-07 12:50:36 +00:00
|
|
|
options?: {
|
2022-01-18 13:27:10 +00:00
|
|
|
detail?: D,
|
2019-04-07 12:50:36 +00:00
|
|
|
includeSecrets?: boolean,
|
2023-08-16 08:51:28 +00:00
|
|
|
userProfile?: MiUserProfile,
|
2022-04-17 12:18:18 +00:00
|
|
|
},
|
2022-01-18 13:27:10 +00:00
|
|
|
): Promise<IsMeAndIsUserDetailed<ExpectsMe, D>> {
|
2019-04-07 12:50:36 +00:00
|
|
|
const opts = Object.assign({
|
|
|
|
detail: false,
|
2021-12-09 14:58:30 +00:00
|
|
|
includeSecrets: false,
|
2019-04-07 12:50:36 +00:00
|
|
|
}, options);
|
|
|
|
|
2023-04-06 10:48:24 +00:00
|
|
|
const user = typeof src === 'object' ? src : await this.usersRepository.findOneByOrFail({ id: src });
|
|
|
|
|
2021-03-24 02:05:37 +00:00
|
|
|
const meId = me ? me.id : null;
|
2022-01-18 13:27:10 +00:00
|
|
|
const isMe = meId === user.id;
|
2023-08-16 08:51:28 +00:00
|
|
|
const iAmModerator = me ? await this.roleService.isModerator(me as MiUser) : false;
|
2019-04-07 12:50:36 +00:00
|
|
|
|
2022-01-18 13:27:10 +00:00
|
|
|
const relation = meId && !isMe && opts.detail ? await this.getRelation(meId, user.id) : null;
|
2022-09-17 18:27:08 +00:00
|
|
|
const pins = opts.detail ? await this.userNotePiningsRepository.createQueryBuilder('pin')
|
2021-03-22 02:38:32 +00:00
|
|
|
.where('pin.userId = :userId', { userId: user.id })
|
|
|
|
.innerJoinAndSelect('pin.note', 'note')
|
2021-03-22 03:41:38 +00:00
|
|
|
.orderBy('pin.id', 'DESC')
|
2021-03-22 02:38:32 +00:00
|
|
|
.getMany() : [];
|
2023-01-21 04:14:55 +00:00
|
|
|
const profile = opts.detail ? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id })) : null;
|
2019-04-07 12:50:36 +00:00
|
|
|
|
2021-11-07 09:04:32 +00:00
|
|
|
const followingCount = profile == null ? null :
|
2023-12-18 11:59:20 +00:00
|
|
|
(profile.followingVisibility === 'public') || isMe ? user.followingCount :
|
|
|
|
(profile.followingVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
|
2021-11-07 09:04:32 +00:00
|
|
|
null;
|
|
|
|
|
|
|
|
const followersCount = profile == null ? null :
|
2023-12-18 11:59:20 +00:00
|
|
|
(profile.followersVisibility === 'public') || isMe ? user.followersCount :
|
|
|
|
(profile.followersVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
|
2021-11-07 09:04:32 +00:00
|
|
|
null;
|
|
|
|
|
2023-01-12 12:02:26 +00:00
|
|
|
const isModerator = isMe && opts.detail ? this.roleService.isModerator(user) : null;
|
|
|
|
const isAdmin = isMe && opts.detail ? this.roleService.isAdministrator(user) : null;
|
2023-10-20 22:53:57 +00:00
|
|
|
const unreadAnnouncements = isMe && opts.detail ?
|
|
|
|
(await this.announcementService.getUnreadAnnouncements(user)).map((announcement) => ({
|
|
|
|
createdAt: this.idService.parse(announcement.id).date.toISOString(),
|
|
|
|
...announcement,
|
|
|
|
})) : null;
|
2023-01-12 12:02:26 +00:00
|
|
|
|
2023-11-01 04:34:05 +00:00
|
|
|
const notificationsInfo = isMe && opts.detail ? await this.getNotificationsInfo(user.id) : null;
|
|
|
|
|
2019-04-23 13:35:26 +00:00
|
|
|
const packed = {
|
2019-04-07 12:50:36 +00:00
|
|
|
id: user.id,
|
|
|
|
name: user.name,
|
|
|
|
username: user.username,
|
|
|
|
host: user.host,
|
2023-04-06 10:48:24 +00:00
|
|
|
avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
|
|
|
|
avatarBlurhash: user.avatarBlurhash,
|
2023-10-22 04:02:24 +00:00
|
|
|
avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll().then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({
|
|
|
|
id: ud.id,
|
|
|
|
angle: ud.angle || undefined,
|
|
|
|
flipH: ud.flipH || undefined,
|
2023-12-14 11:58:08 +00:00
|
|
|
offsetX: ud.offsetX || undefined,
|
|
|
|
offsetY: ud.offsetY || undefined,
|
2023-10-22 04:02:24 +00:00
|
|
|
url: decorations.find(d => d.id === ud.id)!.url,
|
2023-10-21 09:38:07 +00:00
|
|
|
}))) : [],
|
2023-10-18 00:54:18 +00:00
|
|
|
isBot: user.isBot,
|
|
|
|
isCat: user.isCat,
|
2023-04-07 09:48:45 +00:00
|
|
|
instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
|
2020-10-27 07:16:59 +00:00
|
|
|
name: instance.name,
|
|
|
|
softwareName: instance.softwareName,
|
|
|
|
softwareVersion: instance.softwareVersion,
|
|
|
|
iconUrl: instance.iconUrl,
|
|
|
|
faviconUrl: instance.faviconUrl,
|
|
|
|
themeColor: instance.themeColor,
|
|
|
|
} : undefined) : undefined,
|
2023-02-08 11:07:19 +00:00
|
|
|
emojis: this.customEmojiService.populateEmojis(user.emojis, user.host),
|
2021-04-17 06:30:26 +00:00
|
|
|
onlineStatus: this.getOnlineStatus(user),
|
2023-02-05 01:37:03 +00:00
|
|
|
// パフォーマンス上の理由でローカルユーザーのみ
|
2023-03-12 07:38:08 +00:00
|
|
|
badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then(rs => rs.sort((a, b) => b.displayOrder - a.displayOrder).map(r => ({
|
2023-02-05 01:37:03 +00:00
|
|
|
name: r.name,
|
|
|
|
iconUrl: r.iconUrl,
|
2023-03-12 07:38:08 +00:00
|
|
|
displayOrder: r.displayOrder,
|
2023-02-05 01:37:03 +00:00
|
|
|
}))) : undefined,
|
2019-04-07 12:50:36 +00:00
|
|
|
|
|
|
|
...(opts.detail ? {
|
2019-04-12 16:43:22 +00:00
|
|
|
url: profile!.url,
|
2021-04-16 08:34:06 +00:00
|
|
|
uri: user.uri,
|
enhance: account migration (#10592)
* copy block and mute then create follow and unfollow jobs
* copy block and mute and update lists when detecting an account has moved
* no need to care promise orders
* refactor updating actor and target
* automatically accept if a locked account had accepted an old account
* fix exception format
* prevent the old account from calling some endpoints
* do not unfollow when moving
* adjust following and follower counts
* check movedToUri when receiving a follow request
* skip if no need to adjust
* Revert "disable account migration"
This reverts commit 2321214c98591bcfe1385c1ab5bf0ff7b471ae1d.
* fix translation specifier
* fix checking alsoKnownAs and uri
* fix updating account
* fix refollowing locked account
* decrease followersCount if followed by the old account
* adjust following and followers counts when unfollowing
* fix copying mutings
* prohibit moved account from moving again
* fix move service
* allow app creation after moving
* fix lint
* remove unnecessary field
* fix cache update
* add e2e test
* add e2e test of accepting the new account automatically
* force follow if any error happens
* remove unnecessary joins
* use Array.map instead of for const of
* ユーザーリストの移行は追加のみを行う
* nanka iroiro
* fix misskey-js?
* :v:
* 移行を行ったアカウントからのフォローリクエストの自動許可を調整
* newUriを外に出す
* newUriを外に出す2
* clean up
* fix newUri
* prevent moving if the destination account has already moved
* set alsoKnownAs via /i/update
* fix database initialization
* add return type
* prohibit updating alsoKnownAs after moving
* skip to add to alsoKnownAs if toUrl is known
* skip adding to the list if it already has
* use Acct.parse instead
* rename error code
* :art:
* 制限を5から10に緩和
* movedTo(Uri), alsoKnownAsはユーザーidを返すように
* test api res
* fix
* 元アカウントはミュートし続ける
* :art:
* unfollow
* fix
* getUserUriをUserEntityServiceに
* ?
* job!
* :art:
* instance => server
* accountMovedShort, forbiddenBecauseYouAreMigrated
* accountMovedShort
* fix test
* import, pin禁止
* 実績を凍結する
* clean up
* :v:
* change message
* ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに
* Revert "ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに"
This reverts commit 3bd7be35d8aa455cb01ae58f8172a71a50485db1.
* validateAlsoKnownAs
* 移行後2時間以内はインポート可能なファイルサイズを拡大
* clean up
* どうせactorをupdatePersonで更新するならupdatePersonしか移行処理を発行しないことにする
* handle error?
* リモートからの移行処理の条件を是正
* log, port
* fix
* fix
* enhance(dev): non-production環境でhttpサーバー間でもユーザー、ノートの連合が可能なように
* refactor (use checkHttps)
* MISSKEY_WEBFINGER_USE_HTTP
* Environment Variable readme
* NEVER USE IN PRODUCTION
* fix punyHost
* fix indent
* fix
* experimental
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-29 15:09:29 +00:00
|
|
|
movedTo: user.movedToUri ? this.apPersonService.resolvePerson(user.movedToUri).then(user => user.id).catch(() => null) : null,
|
|
|
|
alsoKnownAs: user.alsoKnownAs
|
|
|
|
? Promise.all(user.alsoKnownAs.map(uri => this.apPersonService.fetchPerson(uri).then(user => user?.id).catch(() => null)))
|
|
|
|
.then(xs => xs.length === 0 ? null : xs.filter(x => x != null) as string[])
|
|
|
|
: null,
|
2023-10-16 01:45:22 +00:00
|
|
|
createdAt: this.idService.parse(user.id).date.toISOString(),
|
2019-04-23 13:35:26 +00:00
|
|
|
updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
|
2022-01-18 13:27:10 +00:00
|
|
|
lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
|
2023-04-06 10:48:24 +00:00
|
|
|
bannerUrl: user.bannerUrl,
|
|
|
|
bannerBlurhash: user.bannerBlurhash,
|
2019-04-14 02:58:10 +00:00
|
|
|
isLocked: user.isLocked,
|
2023-01-15 11:52:53 +00:00
|
|
|
isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
|
2023-10-18 00:54:18 +00:00
|
|
|
isSuspended: user.isSuspended,
|
2019-04-12 16:43:22 +00:00
|
|
|
description: profile!.description,
|
|
|
|
location: profile!.location,
|
|
|
|
birthday: profile!.birthday,
|
2021-02-13 03:28:26 +00:00
|
|
|
lang: profile!.lang,
|
2019-07-17 15:11:39 +00:00
|
|
|
fields: profile!.fields,
|
2023-09-21 02:58:51 +00:00
|
|
|
verifiedLinks: profile!.verifiedLinks,
|
2022-09-17 18:27:08 +00:00
|
|
|
followersCount: followersCount ?? 0,
|
|
|
|
followingCount: followingCount ?? 0,
|
2019-04-07 12:50:36 +00:00
|
|
|
notesCount: user.notesCount,
|
|
|
|
pinnedNoteIds: pins.map(pin => pin.noteId),
|
2022-09-17 18:27:08 +00:00
|
|
|
pinnedNotes: this.noteEntityService.packMany(pins.map(pin => pin.note!), me, {
|
2021-12-09 14:58:30 +00:00
|
|
|
detail: true,
|
2019-04-07 12:50:36 +00:00
|
|
|
}),
|
2019-07-06 21:56:13 +00:00
|
|
|
pinnedPageId: profile!.pinnedPageId,
|
2022-09-17 18:27:08 +00:00
|
|
|
pinnedPage: profile!.pinnedPageId ? this.pageEntityService.pack(profile!.pinnedPageId, me) : null,
|
2021-10-17 16:16:59 +00:00
|
|
|
publicReactions: profile!.publicReactions,
|
2023-12-18 11:59:20 +00:00
|
|
|
followersVisibility: profile!.followersVisibility,
|
|
|
|
followingVisibility: profile!.followingVisibility,
|
2019-05-03 09:55:24 +00:00
|
|
|
twoFactorEnabled: profile!.twoFactorEnabled,
|
2019-07-06 16:38:36 +00:00
|
|
|
usePasswordLessLogin: profile!.usePasswordLessLogin,
|
2019-07-03 11:18:07 +00:00
|
|
|
securityKeys: profile!.twoFactorEnabled
|
2022-09-17 18:27:08 +00:00
|
|
|
? this.userSecurityKeysRepository.countBy({
|
2021-12-09 14:58:30 +00:00
|
|
|
userId: user.id,
|
2019-07-03 11:18:07 +00:00
|
|
|
}).then(result => result >= 1)
|
|
|
|
: false,
|
2023-03-12 07:38:08 +00:00
|
|
|
roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({
|
2023-01-13 03:07:24 +00:00
|
|
|
id: role.id,
|
|
|
|
name: role.name,
|
|
|
|
color: role.color,
|
2023-02-05 01:37:03 +00:00
|
|
|
iconUrl: role.iconUrl,
|
2023-01-13 03:07:24 +00:00
|
|
|
description: role.description,
|
|
|
|
isModerator: role.isModerator,
|
|
|
|
isAdministrator: role.isAdministrator,
|
2023-03-12 07:38:08 +00:00
|
|
|
displayOrder: role.displayOrder,
|
2023-01-13 03:07:24 +00:00
|
|
|
}))),
|
2023-04-13 04:34:54 +00:00
|
|
|
memo: meId == null ? null : await this.userMemosRepository.findOneBy({
|
|
|
|
userId: meId,
|
|
|
|
targetUserId: user.id,
|
|
|
|
}).then(row => row?.memo ?? null),
|
2023-05-07 03:04:16 +00:00
|
|
|
moderationNote: iAmModerator ? (profile!.moderationNote ?? '') : undefined,
|
2019-04-07 12:50:36 +00:00
|
|
|
} : {}),
|
|
|
|
|
2022-01-18 13:27:10 +00:00
|
|
|
...(opts.detail && isMe ? {
|
2019-04-07 12:50:36 +00:00
|
|
|
avatarId: user.avatarId,
|
|
|
|
bannerId: user.bannerId,
|
2023-01-12 12:02:26 +00:00
|
|
|
isModerator: isModerator,
|
|
|
|
isAdmin: isAdmin,
|
2020-02-18 10:05:11 +00:00
|
|
|
injectFeaturedNote: profile!.injectFeaturedNote,
|
2021-02-06 13:47:15 +00:00
|
|
|
receiveAnnouncementEmail: profile!.receiveAnnouncementEmail,
|
2019-04-12 16:43:22 +00:00
|
|
|
alwaysMarkNsfw: profile!.alwaysMarkNsfw,
|
2022-07-07 12:06:37 +00:00
|
|
|
autoSensitive: profile!.autoSensitive,
|
2019-04-12 16:43:22 +00:00
|
|
|
carefulBot: profile!.carefulBot,
|
2019-05-26 23:41:24 +00:00
|
|
|
autoAcceptFollowed: profile!.autoAcceptFollowed,
|
2020-11-25 12:31:34 +00:00
|
|
|
noCrawle: profile!.noCrawle,
|
2023-05-11 07:22:46 +00:00
|
|
|
preventAiLearning: profile!.preventAiLearning,
|
2020-12-11 12:16:20 +00:00
|
|
|
isExplorable: user.isExplorable,
|
2021-08-21 03:41:56 +00:00
|
|
|
isDeleted: user.isDeleted,
|
2023-08-28 09:25:31 +00:00
|
|
|
twoFactorBackupCodesStock: profile?.twoFactorBackupSecret?.length === 5 ? 'full' : (profile?.twoFactorBackupSecret?.length ?? 0) > 0 ? 'partial' : 'none',
|
2021-04-17 06:30:26 +00:00
|
|
|
hideOnlineStatus: user.hideOnlineStatus,
|
2022-09-17 18:27:08 +00:00
|
|
|
hasUnreadSpecifiedNotes: this.noteUnreadsRepository.count({
|
2020-08-18 13:44:21 +00:00
|
|
|
where: { userId: user.id, isSpecified: true },
|
2021-12-09 14:58:30 +00:00
|
|
|
take: 1,
|
2020-08-18 13:44:21 +00:00
|
|
|
}).then(count => count > 0),
|
2022-09-17 18:27:08 +00:00
|
|
|
hasUnreadMentions: this.noteUnreadsRepository.count({
|
2020-08-18 13:44:21 +00:00
|
|
|
where: { userId: user.id, isMentioned: true },
|
2021-12-09 14:58:30 +00:00
|
|
|
take: 1,
|
2020-08-18 13:44:21 +00:00
|
|
|
}).then(count => count > 0),
|
2023-08-13 11:12:29 +00:00
|
|
|
hasUnreadAnnouncement: unreadAnnouncements!.length > 0,
|
|
|
|
unreadAnnouncements,
|
2020-01-29 19:37:25 +00:00
|
|
|
hasUnreadAntenna: this.getHasUnreadAntenna(user.id),
|
2023-04-04 22:52:49 +00:00
|
|
|
hasUnreadChannel: false, // 後方互換性のため
|
2023-11-01 04:34:05 +00:00
|
|
|
hasUnreadNotification: notificationsInfo?.hasUnread, // 後方互換性のため
|
2020-02-15 00:10:49 +00:00
|
|
|
hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id),
|
2023-11-01 04:34:05 +00:00
|
|
|
unreadNotificationsCount: notificationsInfo?.unreadCount,
|
2020-07-27 04:34:20 +00:00
|
|
|
mutedWords: profile!.mutedWords,
|
2023-11-23 09:56:20 +00:00
|
|
|
hardMutedWords: profile!.hardMutedWords,
|
2021-12-09 12:38:56 +00:00
|
|
|
mutedInstances: profile!.mutedInstances,
|
2023-09-29 23:12:25 +00:00
|
|
|
mutingNotificationTypes: [], // 後方互換性のため
|
2023-09-29 02:29:54 +00:00
|
|
|
notificationRecieveConfig: profile!.notificationRecieveConfig,
|
2021-02-13 03:28:26 +00:00
|
|
|
emailNotificationTypes: profile!.emailNotificationTypes,
|
2023-01-21 04:14:55 +00:00
|
|
|
achievements: profile!.achievements,
|
|
|
|
loggedInDays: profile!.loggedInDates.length,
|
2023-01-25 10:34:10 +00:00
|
|
|
policies: this.roleService.getUserPolicies(user.id),
|
2019-04-07 12:50:36 +00:00
|
|
|
} : {}),
|
|
|
|
|
2019-04-10 09:10:09 +00:00
|
|
|
...(opts.includeSecrets ? {
|
2019-04-12 16:43:22 +00:00
|
|
|
email: profile!.email,
|
|
|
|
emailVerified: profile!.emailVerified,
|
2019-07-03 11:18:07 +00:00
|
|
|
securityKeysList: profile!.twoFactorEnabled
|
2022-09-17 18:27:08 +00:00
|
|
|
? this.userSecurityKeysRepository.find({
|
2019-07-03 11:18:07 +00:00
|
|
|
where: {
|
2021-12-09 14:58:30 +00:00
|
|
|
userId: user.id,
|
2019-07-03 11:18:07 +00:00
|
|
|
},
|
2022-03-26 06:34:00 +00:00
|
|
|
select: {
|
|
|
|
id: true,
|
|
|
|
name: true,
|
|
|
|
lastUsed: true,
|
|
|
|
},
|
2019-07-03 11:18:07 +00:00
|
|
|
})
|
2021-12-09 14:58:30 +00:00
|
|
|
: [],
|
2019-04-10 09:10:09 +00:00
|
|
|
} : {}),
|
|
|
|
|
2019-04-07 12:50:36 +00:00
|
|
|
...(relation ? {
|
|
|
|
isFollowing: relation.isFollowing,
|
|
|
|
isFollowed: relation.isFollowed,
|
|
|
|
hasPendingFollowRequestFromYou: relation.hasPendingFollowRequestFromYou,
|
|
|
|
hasPendingFollowRequestToYou: relation.hasPendingFollowRequestToYou,
|
|
|
|
isBlocking: relation.isBlocking,
|
|
|
|
isBlocked: relation.isBlocked,
|
|
|
|
isMuted: relation.isMuted,
|
2023-03-07 23:56:09 +00:00
|
|
|
isRenoteMuted: relation.isRenoteMuted,
|
2023-09-21 09:48:15 +00:00
|
|
|
notify: relation.following?.notify ?? 'none',
|
2023-10-03 11:26:11 +00:00
|
|
|
withReplies: relation.following?.withReplies ?? false,
|
2021-12-09 14:58:30 +00:00
|
|
|
} : {}),
|
2022-01-18 13:27:10 +00:00
|
|
|
} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
|
2019-04-23 13:35:26 +00:00
|
|
|
|
|
|
|
return await awaitAll(packed);
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
2019-04-07 12:50:36 +00:00
|
|
|
|
2022-09-17 18:27:08 +00:00
|
|
|
public packMany<D extends boolean = false>(
|
2023-08-16 08:51:28 +00:00
|
|
|
users: (MiUser['id'] | MiUser)[],
|
|
|
|
me?: { id: MiUser['id'] } | null | undefined,
|
2019-04-25 04:27:07 +00:00
|
|
|
options?: {
|
2022-01-18 13:27:10 +00:00
|
|
|
detail?: D,
|
2019-04-25 04:27:07 +00:00
|
|
|
includeSecrets?: boolean,
|
2022-04-17 12:18:18 +00:00
|
|
|
},
|
2022-01-18 13:27:10 +00:00
|
|
|
): Promise<IsUserDetailed<D>[]> {
|
2019-04-25 04:27:07 +00:00
|
|
|
return Promise.all(users.map(u => this.pack(u, me, options)));
|
2022-09-17 18:27:08 +00:00
|
|
|
}
|
|
|
|
}
|