+
+
+ {{ i18n.ts.deletedNote }}
+
+
+
+
+
+ {{ i18n.ts.deletedNote }}
+
+
+
{{ i18n.tsx._drafts.postTo({ channel: draft.channel.name }) }}
diff --git a/packages/frontend/src/components/MkPullToRefresh.vue b/packages/frontend/src/components/MkPullToRefresh.vue
index b0638db785..c792ff3488 100644
--- a/packages/frontend/src/components/MkPullToRefresh.vue
+++ b/packages/frontend/src/components/MkPullToRefresh.vue
@@ -56,10 +56,12 @@ const emit = defineEmits<{
}>();
function getScreenY(event: TouchEvent | MouseEvent | PointerEvent): number {
- if (event.touches && event.touches[0] && event.touches[0].screenY != null) {
+ if (('touches' in event) && event.touches[0] && event.touches[0].screenY != null) {
return event.touches[0].screenY;
- } else {
+ } else if ('screenY' in event) {
return event.screenY;
+ } else {
+ return 0; // TSを黙らせるため
}
}
@@ -67,13 +69,13 @@ function getScreenY(event: TouchEvent | MouseEvent | PointerEvent): number {
function lockDownScroll() {
if (scrollEl == null) return;
scrollEl.style.touchAction = 'pan-x pan-down pinch-zoom';
- scrollEl.style.overscrollBehavior = 'none';
+ scrollEl.style.overscrollBehavior = 'auto none';
}
function unlockDownScroll() {
if (scrollEl == null) return;
scrollEl.style.touchAction = 'auto';
- scrollEl.style.overscrollBehavior = 'contain';
+ scrollEl.style.overscrollBehavior = 'auto contain';
}
function moveStartByMouse(event: MouseEvent) {
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 7a5848de48..67a9094cad 100644
--- a/packages/frontend/src/components/MkRange.vue
+++ b/packages/frontend/src/components/MkRange.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+ {{ i18n.ts._role._options.watermarkAvailable }}
+ {{ policies.watermarkAvailable ? i18n.ts.yes : i18n.ts.no }}
+
+ {{ i18n.ts.enable }}
+
+
@@ -180,6 +180,8 @@ function onMouseenter() {
let lastClickTime: number | null = null;
function onMousedown(ev: MouseEvent | TouchEvent) {
+ if (props.disabled) return; // Prevent interaction if disabled
+
ev.preventDefault();
tooltipForDragShowing.value = true;
@@ -292,6 +294,11 @@ function onMousedown(ev: MouseEvent | TouchEvent) {
border: solid 1px var(--MI_THEME-panel);
border-radius: 6px;
+ &.disabled {
+ pointer-events: none;
+ opacity: 0.6;
+ }
+
> .container {
flex: 1;
position: relative;
diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue
index 36d1103549..7d62456e03 100644
--- a/packages/frontend/src/components/MkReactionIcon.vue
+++ b/packages/frontend/src/components/MkReactionIcon.vue
@@ -24,6 +24,7 @@ const elRef = useTemplateRef('elRef');
if (props.withTooltip) {
useTooltip(elRef, (showing) => {
+ if (elRef.value == null) return;
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), {
showing,
reaction: props.reaction.replace(/^:(\w+):$/, ':$1@.:'),
diff --git a/packages/frontend/src/components/MkRolePreview.vue b/packages/frontend/src/components/MkRolePreview.vue
index 3f14c5b5e0..15149b3f0c 100644
--- a/packages/frontend/src/components/MkRolePreview.vue
+++ b/packages/frontend/src/components/MkRolePreview.vue
@@ -41,7 +41,7 @@ import { i18n } from '@/i18n.js';
const props = withDefaults(defineProps<{
role: Misskey.entities.Role;
forModeration: boolean;
- detailed: boolean;
+ detailed?: boolean;
}>(), {
detailed: true,
});
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 58a4edfddf..485d163ac4 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -174,7 +174,7 @@ watch([modelValue, () => props.items], () => {
}, { immediate: true, deep: true });
function show() {
- if (opening.value) return;
+ if (opening.value || props.disabled || props.readonly) return;
focus();
opening.value = true;
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index aebec7a8f6..0f8713d4af 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.requireAdminForView }}
@@ -86,12 +97,15 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { iAmAdmin, iAmModerator } from '@/i.js';
+import MkTabs from '@/components/MkTabs.vue';
const tab = ref('overview');
const file = ref(null);
const info = ref(null);
const isSensitive = ref(false);
+const usageTab = ref<'note' | 'chat'>('note');
const XNotes = defineAsyncComponent(() => import('./drive.file.notes.vue'));
+const XChat = defineAsyncComponent(() => import('./admin-file.chat.vue'));
const props = defineProps<{
fileId: string,
@@ -147,9 +161,9 @@ const headerTabs = computed(() => [{
title: i18n.ts.overview,
icon: 'ti ti-info-circle',
}, iAmModerator ? {
- key: 'notes',
- title: i18n.ts._fileViewer.attachedNotes,
- icon: 'ti ti-pencil',
+ key: 'usage',
+ title: i18n.ts._fileViewer.usage,
+ icon: 'ti ti-plus',
} : null, iAmModerator ? {
key: 'ip',
title: 'IP',
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index a266e1df6f..c172e22688 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -780,6 +780,26 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+ {{ i18n.ts._role._options.watermarkAvailable }}
+
+ {{ i18n.ts._role.useBaseValue }}
+ {{ role.policies.watermarkAvailable.value ? i18n.ts.yes : i18n.ts.no }}
+
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
- ![]()
+ ![]()
{{ instance.name || `(${i18n.ts.unknown})` }}
diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue
index 4368aff8be..1261428c1c 100644
--- a/packages/frontend/src/pages/list.vue
+++ b/packages/frontend/src/pages/list.vue
@@ -62,24 +62,29 @@ function fetchList(): void {
}
function like() {
+ if (list.value == null) return;
os.apiWithDialog('users/lists/favorite', {
listId: list.value.id,
}).then(() => {
+ if (list.value == null) return;
list.value.isLiked = true;
list.value.likedCount++;
});
}
function unlike() {
+ if (list.value == null) return;
os.apiWithDialog('users/lists/unfavorite', {
listId: list.value.id,
}).then(() => {
+ if (list.value == null) return;
list.value.isLiked = false;
list.value.likedCount--;
});
}
async function create() {
+ if (list.value == null) return;
const { canceled, result: name } = await os.inputText({
title: i18n.ts.enterListName,
});
diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue
index 4c664a0951..f48dc5be4d 100644
--- a/packages/frontend/src/pages/my-clips/index.vue
+++ b/packages/frontend/src/pages/my-clips/index.vue
@@ -64,6 +64,7 @@ async function create() {
default: false,
},
});
+
if (canceled) return;
os.apiWithDialog('clips/create', result);
diff --git a/packages/frontend/src/pages/my-lists/list.vue b/packages/frontend/src/pages/my-lists/list.vue
index 74ac47c571..6b5a797023 100644
--- a/packages/frontend/src/pages/my-lists/list.vue
+++ b/packages/frontend/src/pages/my-lists/list.vue
@@ -73,10 +73,6 @@ import { Paginator } from '@/utility/paginator.js';
const $i = ensureSignin();
-const {
- enableInfiniteScroll,
-} = prefer.r;
-
const props = defineProps<{
listId: string;
}>();
diff --git a/packages/frontend/src/pages/registry.keys.vue b/packages/frontend/src/pages/registry.keys.vue
index 39575fe1f7..8eb2ab9fd0 100644
--- a/packages/frontend/src/pages/registry.keys.vue
+++ b/packages/frontend/src/pages/registry.keys.vue
@@ -79,7 +79,9 @@ async function createKey() {
default: scope.value.join('/'),
},
});
+
if (canceled) return;
+
os.apiWithDialog('i/registry/set', {
scope: result.scope.split('/'),
key: result.key,
diff --git a/packages/frontend/src/pages/registry.vue b/packages/frontend/src/pages/registry.vue
index 5e59082b50..3762dadd12 100644
--- a/packages/frontend/src/pages/registry.vue
+++ b/packages/frontend/src/pages/registry.vue
@@ -56,7 +56,9 @@ async function createKey() {
label: i18n.ts._registry.scope,
},
});
+
if (canceled) return;
+
os.apiWithDialog('i/registry/set', {
scope: result.scope.split('/'),
key: result.key,
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index 0614b1242b..1b99f6dea5 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -87,7 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.watermark }}
{{ i18n.ts._watermarkEditor.tip }}
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index ef7b73c2b1..0e400778aa 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -110,6 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 01f676fde6..d74167cc2d 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -25,7 +25,6 @@ SPDX-License-Identifier: AGPL-3.0-only