Merge remote-tracking branch 'misskey-dev/develop' into io

2024-03-02 05:23:53 +09:00
parent 62e7961aea fe5efd926e
commit 9ab785c48f
94 changed files with 4169 additions and 2564 deletions
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@@ -244,6 +244,8 @@ export class MiUserProfile {
 			type: 'follower';
 		} | {
 			type: 'mutualFollow';
+		} | {
+			type: 'followingOrFollower';
 		} | {
 			type: 'list';
 			userListId: MiUserList['id'];