Compare commits

...

7 Commits

Author SHA1 Message Date
かっこかり
0c16906783
Merge a83c6879ea into 3c81926f71 2024-12-22 13:55:26 +09:00
かっこかり
3c81926f71
fix(frontend): serverContextの値を利用する条件が間違っていたのを修正 (#15166)
Some checks are pending
Check SPDX-License-Identifier / check-spdx-license-id (push) Waiting to run
Check copyright year / check_copyright_year (push) Waiting to run
Publish Docker image (develop) / Build (linux/amd64) (push) Waiting to run
Publish Docker image (develop) / Build (linux/arm64) (push) Waiting to run
Publish Docker image (develop) / merge (push) Blocked by required conditions
Dockle / dockle (push) Waiting to run
Lint / pnpm_install (push) Waiting to run
Lint / lint (backend) (push) Blocked by required conditions
Lint / lint (frontend) (push) Blocked by required conditions
Lint / lint (frontend-embed) (push) Blocked by required conditions
Lint / lint (frontend-shared) (push) Blocked by required conditions
Lint / lint (misskey-bubble-game) (push) Blocked by required conditions
Lint / lint (misskey-js) (push) Blocked by required conditions
Lint / lint (misskey-reversi) (push) Blocked by required conditions
Lint / lint (sw) (push) Blocked by required conditions
Lint / typecheck (backend) (push) Blocked by required conditions
Lint / typecheck (misskey-js) (push) Blocked by required conditions
Lint / typecheck (sw) (push) Blocked by required conditions
Storybook / build (push) Waiting to run
Test (frontend) / vitest (22.11.0) (push) Waiting to run
Test (frontend) / e2e (chrome, 22.11.0) (push) Waiting to run
Test (production install and build) / production (22.11.0) (push) Waiting to run
2024-12-22 13:36:17 +09:00
かっこかり
a83c6879ea
Merge branch 'develop' into fix-15118 2024-12-16 23:43:36 +09:00
かっこかり
85ee7142f7
Update MkPostForm.vue 2024-12-14 20:43:36 +09:00
かっこかり
5748229183
Merge branch 'develop' into fix-15118 2024-12-14 16:33:29 +09:00
kakkokari-gtyih
927d0bd3ce Update Changelog 2024-12-14 16:32:36 +09:00
kakkokari-gtyih
6ad11d5db6 fix(frontend): ファイルの添付可能数を超えたらノートボタンを押せないように 2024-12-14 16:31:41 +09:00
6 changed files with 12 additions and 4 deletions

View File

@ -13,6 +13,7 @@
- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正 - Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803) (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
- Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正 - Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
- Fix: ノート作成画面でファイルの添付可能個数を超えてもノートボタンが押せていた問題を修正
### Server ### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 ) - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )

View File

@ -251,6 +251,7 @@ const canPost = computed((): boolean => {
quoteId.value != null quoteId.value != null
) && ) &&
(textLength.value <= maxTextLength.value) && (textLength.value <= maxTextLength.value) &&
(files.value.length <= 16) &&
(!poll.value || poll.value.choices.length >= 2); (!poll.value || poll.value.choices.length >= 2);
}); });

View File

@ -22,7 +22,9 @@ SPDX-License-Identifier: AGPL-3.0-only
</div> </div>
</template> </template>
</Sortable> </Sortable>
<p :class="$style.remain">{{ 16 - props.modelValue.length }}/16</p> <p :class="[$style.remain, {
[$style.exceeded]: props.modelValue.length > 16,
}]">{{ 16 - props.modelValue.length }}/16</p>
</div> </div>
</template> </template>
@ -239,5 +241,9 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent | Keyboar
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 90%; font-size: 90%;
&.exceeded {
color: var(--MI_THEME-error);
}
} }
</style> </style>

View File

@ -49,7 +49,7 @@ import { genEmbedCode } from '@/scripts/get-embed-code.js';
import { assertServerContext, serverContext } from '@/server-context.js'; import { assertServerContext, serverContext } from '@/server-context.js';
// context // context
const CTX_CLIP = $i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null; const CTX_CLIP = !$i && assertServerContext(serverContext, 'clip') ? serverContext.clip : null;
const props = defineProps<{ const props = defineProps<{
clipId: string, clipId: string,

View File

@ -67,7 +67,7 @@ import { serverContext, assertServerContext } from '@/server-context.js';
import { $i } from '@/account.js'; import { $i } from '@/account.js';
// context // context
const CTX_NOTE = $i && assertServerContext(serverContext, 'note') ? serverContext.note : null; const CTX_NOTE = !$i && assertServerContext(serverContext, 'note') ? serverContext.note : null;
const props = defineProps<{ const props = defineProps<{
noteId: string; noteId: string;

View File

@ -54,7 +54,7 @@ const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
const XRaw = defineAsyncComponent(() => import('./raw.vue')); const XRaw = defineAsyncComponent(() => import('./raw.vue'));
// context // 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<{ const props = withDefaults(defineProps<{
acct: string; acct: string;