Merge 26e0b77d83 into 3c81926f71

fix(frontend): serverContextの値を利用する条件が間違っていたのを修正 (#15166 )
Merge branch 'develop' into fix/15018-check-local-only
2024-12-23 00:29:22 +09:00 · 2024-12-22 13:58:42 +09:00 · 2024-12-22 13:36:17 +09:00 · 2024-11-25 08:49:57 +09:00 · 2024-11-22 21:27:01 +09:00 · 2024-11-22 21:23:49 +09:00
5 changed files with 5 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -18,7 +18,7 @@
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
 - Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
-
+- Fix: 連合OFFで投稿されたノートに対する冗長な処理を抑止 ( #15018 )

 ## 2024.11.0

--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@ -677,7 +677,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			nm.notify();

 			//#region AP deliver
-			if (this.userEntityService.isLocalUser(user)) {
+			if (!data.localOnly && this.userEntityService.isLocalUser(user)) {
 				(async () => {
 					const noteActivity = await this.renderNoteOrRenoteActivity(data, note);
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);
--- 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
おさむのひと	0082e84a46	Merge `26e0b77d83` into `3c81926f71`	2024-12-22 13:58:42 +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
おさむのひと	26e0b77d83	Merge branch 'develop' into fix/15018-check-local-only	2024-11-25 08:49:57 +09:00
おさむのひと	bf82decbc9	fix CHANGELOG.md	2024-11-22 21:27:01 +09:00
おさむのひと	06e65e378c	Merge branch 'develop' into fix/15018-check-local-only	2024-11-22 21:23:49 +09:00
おさむのひと	b45aca2725	Merge branch 'develop' into fix/15018-check-local-only	2024-11-21 21:54:00 +09:00
おさむのひと	36cdb5f8c7	fix CHANGELOG.md	2024-11-21 21:51:58 +09:00
おさむのひと	62104def2c	fix(backend): localOnlyなノートの時は配送処理そのものを起動しない	2024-11-21 20:44:46 +09:00