merge: upstream (1)

2024-01-21 13:11:23 +01:00
parent 0d766a6310 3784b39a5f
commit db012fc8c3
258 changed files with 18802 additions and 7557 deletions
@@ -494,6 +494,8 @@ export class ClientServerService {
 				isSuspended: false,
 			});

+			vary(reply.raw, 'Accept');
+
 			if (user != null) {
 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 				const meta = await this.metaService.fetch();
@@ -533,6 +535,8 @@ export class ClientServerService {
 				return;
 			}

+			vary(reply.raw, 'Accept');
+
 			reply.redirect(`/@${user.username}${ user.host == null ? '' : '@' + user.host}`);
 		});