OpenSource/misskey
OpenSource/misskey
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-27 06:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix move service

Browse source
This commit is contained in:
Namekuji 2023-04-15 06:49:01 -04:00
parent 21677aa30d
commit 8d6f50c4c3
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/backend/src/core/AccountMoveService.ts
View file

@ -1,5 +1,5 @@
import { Inject, Injectable } from '@nestjs/common';
import { IsNull, In } from 'typeorm';
import { IsNull, In, MoreThan, Not } from 'typeorm';
import { bindThis } from '@/decorators.js';
import { DI } from '@/di-symbols.js';
@ -138,6 +138,7 @@ export class AccountMoveService {
]);
// follow the new account and unfollow the old one
const proxy = await this.proxyAccountService.fetch();
const followings = await this.followingsRepository.find({
relations: {
follower: true,
@ -145,6 +146,7 @@ export class AccountMoveService {
where: {
followeeId: src.id,
followerHost: IsNull(), // follower is local
followerId: proxy ? Not(proxy.id) : undefined,
},
});
const followJobs: RelationshipJobData[] = [];
@ -185,27 +187,14 @@ export class AccountMoveService {
@bindThis
public async copyMutings(src: ThinUser, dst: ThinUser): Promise<void> {
// Insert new mutings with the same values except mutee
const mutings = await this.mutingsRepository.find({
relations: {
muter: true,
},
where: { muteeId: src.id }
});
const newMuting: Partial<Muting>[] = [];
for (const muting of mutings) {
newMuting.push({
id: this.idService.genId(),
createdAt: new Date(),
expiresAt: muting.expiresAt,
muterId: muting.muterId,
muteeId: dst.id,
});
const mutings = await this.mutingsRepository.findBy({ muteeId: src.id, expiresAt: MoreThan(new Date()) });
const muteIds = mutings.map(mute => mute.id);
if (muteIds.length > 0) {
await this.mutingsRepository.update({ id: In(muteIds) }, { muteeId: dst.id });
for (const muterId of mutings.map(mute => mute.muterId)) {
this.cacheService.userMutingsCache.refresh(muterId);
}
}
await this.mutingsRepository.insert(mutings);
for (const mute of mutings) {
if (mute.muter) this.cacheService.userMutingsCache.refresh(mute.muter.id);
}
// no need to unmute the old account because it may be still functional
}
@bindThis