2023-04-12 09:13:58 +09:00
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
2023-05-29 11:54:49 +09:00
|
|
|
import type * as Bull from 'bullmq';
|
2023-04-12 09:13:58 +09:00
|
|
|
|
|
|
|
import { UserFollowingService } from '@/core/UserFollowingService.js';
|
|
|
|
import { UserBlockingService } from '@/core/UserBlockingService.js';
|
|
|
|
import { bindThis } from '@/decorators.js';
|
|
|
|
import type Logger from '@/logger.js';
|
|
|
|
|
|
|
|
import { QueueLoggerService } from '../QueueLoggerService.js';
|
|
|
|
import { RelationshipJobData } from '../types.js';
|
|
|
|
import type { UsersRepository } from '@/models/index.js';
|
|
|
|
import { DI } from '@/di-symbols.js';
|
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-30 00:09:29 +09:00
|
|
|
import { LocalUser, RemoteUser } from '@/models/entities/User.js';
|
2023-04-12 09:13:58 +09:00
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class RelationshipProcessorService {
|
|
|
|
private logger: Logger;
|
|
|
|
|
|
|
|
constructor(
|
|
|
|
@Inject(DI.usersRepository)
|
|
|
|
private usersRepository: UsersRepository,
|
|
|
|
|
|
|
|
private queueLoggerService: QueueLoggerService,
|
|
|
|
private userFollowingService: UserFollowingService,
|
|
|
|
private userBlockingService: UserBlockingService,
|
|
|
|
) {
|
|
|
|
this.logger = this.queueLoggerService.logger.createSubLogger('follow-block');
|
|
|
|
}
|
|
|
|
|
|
|
|
@bindThis
|
|
|
|
public async processFollow(job: Bull.Job<RelationshipJobData>): Promise<string> {
|
|
|
|
this.logger.info(`${job.data.from.id} is trying to follow ${job.data.to.id}`);
|
|
|
|
await this.userFollowingService.follow(job.data.from, job.data.to, job.data.requestId, job.data.silent);
|
|
|
|
return 'ok';
|
|
|
|
}
|
|
|
|
|
|
|
|
@bindThis
|
|
|
|
public async processUnfollow(job: Bull.Job<RelationshipJobData>): Promise<string> {
|
|
|
|
this.logger.info(`${job.data.from.id} is trying to unfollow ${job.data.to.id}`);
|
|
|
|
const [follower, followee] = await Promise.all([
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.from.id }),
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.to.id }),
|
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-30 00:09:29 +09:00
|
|
|
]) as [LocalUser | RemoteUser, LocalUser | RemoteUser];
|
2023-04-12 09:13:58 +09:00
|
|
|
await this.userFollowingService.unfollow(follower, followee, job.data.silent);
|
|
|
|
return 'ok';
|
|
|
|
}
|
|
|
|
|
|
|
|
@bindThis
|
|
|
|
public async processBlock(job: Bull.Job<RelationshipJobData>): Promise<string> {
|
|
|
|
this.logger.info(`${job.data.from.id} is trying to block ${job.data.to.id}`);
|
|
|
|
const [blockee, blocker] = await Promise.all([
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.from.id }),
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.to.id }),
|
|
|
|
]);
|
|
|
|
await this.userBlockingService.block(blockee, blocker, job.data.silent);
|
|
|
|
return 'ok';
|
|
|
|
}
|
|
|
|
|
|
|
|
@bindThis
|
|
|
|
public async processUnblock(job: Bull.Job<RelationshipJobData>): Promise<string> {
|
|
|
|
this.logger.info(`${job.data.from.id} is trying to unblock ${job.data.to.id}`);
|
|
|
|
const [blockee, blocker] = await Promise.all([
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.from.id }),
|
|
|
|
this.usersRepository.findOneByOrFail({ id: job.data.to.id }),
|
|
|
|
]);
|
|
|
|
await this.userBlockingService.unblock(blockee, blocker);
|
|
|
|
return 'ok';
|
|
|
|
}
|
|
|
|
}
|