Merge 388548bf19 into 3c81926f71

fix(frontend): serverContextの値を利用する条件が間違っていたのを修正 (#15166 )
Merge branch 'develop' into chore-docker-debian-version
2024-12-23 00:29:22 +09:00 · 2024-12-22 13:53:45 +09:00 · 2024-12-22 13:36:17 +09:00 · 2024-12-14 19:45:05 +09:00 · 2024-11-30 15:45:50 +09:00 · 2024-11-29 17:59:06 +09:00
4 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
-ARG NODE_VERSION=22.11.0-bullseye
+ARG NODE_VERSION=22.11.0-bookworm
 # build assets & compile TypeScript
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@ -49,7 +49,7 @@ import { genEmbedCode } from '@/scripts/get-embed-code.js';
 import { assertServerContext, serverContext } from '@/server-context.js';
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_CLIP = $i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
+const CTX_CLIP = !$i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
 const props = defineProps<{
 	clipId: string,
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@ -67,7 +67,7 @@ import { serverContext, assertServerContext } from '@/server-context.js';
 import { $i } from '@/account.js';
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_NOTE = $i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
+const CTX_NOTE = !$i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
 const props = defineProps<{
 	noteId: string;
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@ -54,7 +54,7 @@ const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
 const XRaw = defineAsyncComponent(() => import('./raw.vue'));
 // contextは非ログイン状態の情報しかないためログイン時は利用できない
-const CTX_USER = $i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
+const CTX_USER = !$i && assertServerContext(serverContext, 'user') ? serverContext.user : null;
 const props = withDefaults(defineProps<{
 	acct: string;
Author	SHA1	Message	Date
KanariKanaru	b3671f617a	Merge `388548bf19` into `3c81926f71`	2024-12-22 13:53:45 +09:00
かっこかり	3c81926f71	fix(frontend): serverContextの値を利用する条件が間違っていたのを修正 (#15166 ) Some checks are pending Check SPDX-License-Identifier / check-spdx-license-id (push) Waiting to run Details Check copyright year / check_copyright_year (push) Waiting to run Details Publish Docker image (develop) / Build (linux/amd64) (push) Waiting to run Details Publish Docker image (develop) / Build (linux/arm64) (push) Waiting to run Details Publish Docker image (develop) / merge (push) Blocked by required conditions Details Dockle / dockle (push) Waiting to run Details Lint / pnpm_install (push) Waiting to run Details Lint / lint (backend) (push) Blocked by required conditions Details Lint / lint (frontend) (push) Blocked by required conditions Details Lint / lint (frontend-embed) (push) Blocked by required conditions Details Lint / lint (frontend-shared) (push) Blocked by required conditions Details Lint / lint (misskey-bubble-game) (push) Blocked by required conditions Details Lint / lint (misskey-js) (push) Blocked by required conditions Details Lint / lint (misskey-reversi) (push) Blocked by required conditions Details Lint / lint (sw) (push) Blocked by required conditions Details Lint / typecheck (backend) (push) Blocked by required conditions Details Lint / typecheck (misskey-js) (push) Blocked by required conditions Details Lint / typecheck (sw) (push) Blocked by required conditions Details Storybook / build (push) Waiting to run Details Test (frontend) / vitest (22.11.0) (push) Waiting to run Details Test (frontend) / e2e (chrome, 22.11.0) (push) Waiting to run Details Test (production install and build) / production (22.11.0) (push) Waiting to run Details	2024-12-22 13:36:17 +09:00
KanariKanaru	388548bf19	Merge branch 'develop' into chore-docker-debian-version	2024-12-14 19:45:05 +09:00
KanariKanaru	ab5d21d164	Merge branch 'develop' into chore-docker-debian-version	2024-11-30 15:45:50 +09:00
KanariKanaru	9e412faac8	Chore: Docker内のDebianのバージョンを上げる(bookworm)	2024-11-29 17:59:06 +09:00