mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-21 11:40:49 +00:00
enhance(server): Improve user block (#7640)
* enhance(server): Improve user block
* Update CHANGELOG.md
* ユーザーリスト対応
* 相手から見れなくなるように
* Update 1629004542760-chart-reindex.ts
2365761ba5 (commitcomment-54919821)
* update test
* add test
* add todos
* Update 1629004542760-chart-reindex.ts
This commit is contained in:
@@ -6,7 +6,7 @@ import renderBlock from '../../remote/activitypub/renderer/block';
|
||||
import { deliver } from '../../queue';
|
||||
import renderReject from '../../remote/activitypub/renderer/reject';
|
||||
import { User } from '../../models/entities/user';
|
||||
import { Blockings, Users, FollowRequests, Followings } from '../../models';
|
||||
import { Blockings, Users, FollowRequests, Followings, UserListJoinings, UserLists } from '../../models';
|
||||
import { perUserFollowingChart } from '../chart';
|
||||
import { genId } from '@/misc/gen-id';
|
||||
|
||||
@@ -15,7 +15,8 @@ export default async function(blocker: User, blockee: User) {
|
||||
cancelRequest(blocker, blockee),
|
||||
cancelRequest(blockee, blocker),
|
||||
unFollow(blocker, blockee),
|
||||
unFollow(blockee, blocker)
|
||||
unFollow(blockee, blocker),
|
||||
removeFromList(blockee, blocker),
|
||||
]);
|
||||
|
||||
await Blockings.insert({
|
||||
@@ -112,3 +113,16 @@ async function unFollow(follower: User, followee: User) {
|
||||
deliver(follower, content, followee.inbox);
|
||||
}
|
||||
}
|
||||
|
||||
async function removeFromList(listOwner: User, user: User) {
|
||||
const userLists = await UserLists.find({
|
||||
userId: listOwner.id,
|
||||
});
|
||||
|
||||
for (const userList of userLists) {
|
||||
await UserListJoinings.delete({
|
||||
userListId: userList.id,
|
||||
userId: user.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user