release: v2024.11.0-kakurega.1.39.6 (#166)

hideki0403 · Nov 27, 2024 · 9135c0e · 9135c0e
2 parents 1206c12 + b81f208
commit 9135c0e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG_KAKUREGA.md b/CHANGELOG_KAKUREGA.md
@@ -1,3 +1,10 @@
+## 1.39.6
+Release: 2024/11/27  
+Base: 2024.11.0  
+
+### 修正
+- ログアウト状態でユーザーのプロフィール (概要タブ) が表示されない問題を修正
+
 ## 1.39.5
 Release: 2024/11/22  
 Base: 2024.11.0  

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-kakurega.1.39.5",
+	"version": "2024.11.0-kakurega.1.39.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
@@ -588,7 +588,7 @@ export class ClientServerService {
 					reply.header('X-Robots-Tag', 'noai');
 				}
 
-				const _user = await this.userEntityService.pack(user);
+				const _user = await this.userEntityService.pack(user, null, { schema: 'UserDetailedNotMe' });
 
 				return await reply.view('user', {
 					user, profile, me,

diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
@@ -301,7 +301,7 @@ watch([props.user], () => {
 
 onMounted(() => {
 	window.requestAnimationFrame(parallaxLoop);
-	narrow.value = rootEl.value!.clientWidth < 1000;
+	narrow.value = rootEl.value != null ? rootEl.value.clientWidth < 1000 : null;
 
 	if (props.user.birthday) {
 		const m = new Date().getMonth() + 1;

diff --git a/packages/frontend/src/server-context.ts b/packages/frontend/src/server-context.ts
@@ -10,14 +10,14 @@ const providedContextEl = document.getElementById('misskey_clientCtx');
 export type ServerContext = {
 	clip?: Misskey.entities.Clip;
 	note?: Misskey.entities.Note;
-	user?: Misskey.entities.UserLite;
+	user?: Misskey.entities.UserDetailed;
 } | null;
 
 export const serverContext: ServerContext = (providedContextEl && providedContextEl.textContent) ? JSON.parse(providedContextEl.textContent) : null;
 
-export function getServerContext<K extends keyof NonNullable<ServerContext>>(entity: K): Required<Pick<NonNullable<ServerContext>, K>> | null {
+export function getServerContext<K extends keyof NonNullable<ServerContext>>(entity: K): NonNullable<NonNullable<ServerContext>[K]> | null {
 	// contextは非ログイン状態の情報しかないためログイン時は利用できない
 	if ($i) return null;
 
-	return serverContext ? (serverContext[entity] ?? null) : null;
+	return serverContext?.[entity] ?? null;
 }