mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-16 01:55:44 +01:00
d28866f71a
* 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 2321214c98
.
* 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?
* ✌️
* 移行を行ったアカウントからのフォローリクエストの自動許可を調整
* 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
* 🎨
* 制限を5から10に緩和
* movedTo(Uri), alsoKnownAsはユーザーidを返すように
* test api res
* fix
* 元アカウントはミュートし続ける
* 🎨
* unfollow
* fix
* getUserUriをUserEntityServiceに
* ?
* job!
* 🎨
* instance => server
* accountMovedShort, forbiddenBecauseYouAreMigrated
* accountMovedShort
* fix test
* import, pin禁止
* 実績を凍結する
* clean up
* ✌️
* 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>
91 lines
3.1 KiB
TypeScript
91 lines
3.1 KiB
TypeScript
import { Inject, Injectable } from '@nestjs/common';
|
|
import { Not, IsNull } from 'typeorm';
|
|
import type { FollowingsRepository, UsersRepository } from '@/models/index.js';
|
|
import type { User } from '@/models/entities/User.js';
|
|
import { QueueService } from '@/core/QueueService.js';
|
|
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { Config } from '@/config.js';
|
|
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
|
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
|
|
@Injectable()
|
|
export class UserSuspendService {
|
|
constructor(
|
|
@Inject(DI.config)
|
|
private config: Config,
|
|
|
|
@Inject(DI.usersRepository)
|
|
private usersRepository: UsersRepository,
|
|
|
|
@Inject(DI.followingsRepository)
|
|
private followingsRepository: FollowingsRepository,
|
|
|
|
private userEntityService: UserEntityService,
|
|
private queueService: QueueService,
|
|
private globalEventService: GlobalEventService,
|
|
private apRendererService: ApRendererService,
|
|
) {
|
|
}
|
|
|
|
@bindThis
|
|
public async doPostSuspend(user: { id: User['id']; host: User['host'] }): Promise<void> {
|
|
this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
|
|
|
|
if (this.userEntityService.isLocalUser(user)) {
|
|
// 知り得る全SharedInboxにDelete配信
|
|
const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
|
|
|
|
const queue: string[] = [];
|
|
|
|
const followings = await this.followingsRepository.find({
|
|
where: [
|
|
{ followerSharedInbox: Not(IsNull()) },
|
|
{ followeeSharedInbox: Not(IsNull()) },
|
|
],
|
|
select: ['followerSharedInbox', 'followeeSharedInbox'],
|
|
});
|
|
|
|
const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
|
|
|
|
for (const inbox of inboxes) {
|
|
if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
|
|
}
|
|
|
|
for (const inbox of queue) {
|
|
this.queueService.deliver(user, content, inbox, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
@bindThis
|
|
public async doPostUnsuspend(user: User): Promise<void> {
|
|
this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
|
|
|
|
if (this.userEntityService.isLocalUser(user)) {
|
|
// 知り得る全SharedInboxにUndo Delete配信
|
|
const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user), user));
|
|
|
|
const queue: string[] = [];
|
|
|
|
const followings = await this.followingsRepository.find({
|
|
where: [
|
|
{ followerSharedInbox: Not(IsNull()) },
|
|
{ followeeSharedInbox: Not(IsNull()) },
|
|
],
|
|
select: ['followerSharedInbox', 'followeeSharedInbox'],
|
|
});
|
|
|
|
const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
|
|
|
|
for (const inbox of inboxes) {
|
|
if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
|
|
}
|
|
|
|
for (const inbox of queue) {
|
|
this.queueService.deliver(user as any, content, inbox, true);
|
|
}
|
|
}
|
|
}
|
|
}
|