merge upstream for 2024.2.1

2024-03-02 16:36:49 +00:00 · 2024-03-02 16:36:49 +00:00 · af548d05ca
commit af548d05ca
parent eab7d5bd27
137 changed files with 4524 additions and 2933 deletions
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@ -256,6 +256,8 @@ export class MiUserProfile {
 			type: 'follower';
 		} | {
 			type: 'mutualFollow';
+		} | {
+			type: 'followingOrFollower';
 		} | {
 			type: 'list';
 			userListId: MiUserList['id'];