[${(new Date()).toString()}] ${text.replace(/\n/g,'
')}
+
![]()
@@ -61,8 +61,8 @@ import { ACHIEVEMENT_TYPES, ACHIEVEMENT_BADGES, claimAchievement } from '@/utili
const props = withDefaults(defineProps<{
user: Misskey.entities.User;
- withLocked: boolean;
- withDescription: boolean;
+ withLocked?: boolean;
+ withDescription?: boolean;
}>(), {
withLocked: true,
withDescription: true,
@@ -71,7 +71,7 @@ const props = withDefaults(defineProps<{
const achievements = ref{{ reaction.replace('@.', '') }}
@@ -20,7 +20,7 @@ import MkReactionIcon from '@/components/MkReactionIcon.vue';
defineProps<{
showing: boolean;
reaction: string;
- targetElement: HTMLElement;
+ anchorElement: HTMLElement;
}>();
const emit = defineEmits<{
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue
index d24e0b15bf..1c785f0fd1 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.details.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
{{ content }}
@@ -18,7 +18,7 @@ import MkTooltip from '@/components/MkTooltip.vue';
defineProps<{
showing: boolean;
content: string;
- targetElement: HTMLElement;
+ anchorElement: HTMLElement;
}>();
const emit = defineEmits<{
diff --git a/packages/frontend/src/components/grid/MkDataCell.vue b/packages/frontend/src/components/grid/MkDataCell.vue
index 444509e6b3..6f1dae8398 100644
--- a/packages/frontend/src/components/grid/MkDataCell.vue
+++ b/packages/frontend/src/components/grid/MkDataCell.vue
@@ -48,6 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
-
-
-
-
-
- MIME Type
- {{ file.type }}
-
-
- Size
- {{ bytes(file.size) }}
-
-
- ID
- {{ file.id }}
-
-
- MD5
- {{ file.md5 }}
-
-
- {{ i18n.ts.createdAt }}
-
-
-
- {{ i18n.ts.sensitive }}
-
-
-
- {{ i18n.ts.delete }}
-
-
-
-
- {{ i18n.ts.requireAdminForView }}
-
- IP
- {{ info.requestIp }}
-
-
- Headers
-
- {{ k }}
- {{ v }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.moderationNote }}
- {{ i18n.ts.moderationNoteDescription }}
-
+
+ {{ i18n.ts.moderationNote }}
+ {{ i18n.ts.moderationNoteDescription }}
+
-
-
-
-
+
+ {{ i18n.ts.isSystemAccount }}
+ {{ i18n.ts.isSystemAccount }}
- {{ i18n.ts.instanceInfo }}
+ {{ i18n.ts.instanceInfo }}
-
+ {{ i18n.ts.createdAt }}
+
+
+ {{ i18n.ts.lastActiveDate }}
+
+
+ {{ i18n.ts.email }}
+ {{ info.email }}
+
+
+
-
+
-
+
+
-
- ID
- {{ user.id }}
-
-
-
-
- {{ i18n.ts.createdAt }}
-
-
- {{ i18n.ts.lastActiveDate }}
-
-
- {{ i18n.ts.email }}
- {{ info.email }}
-
-
-
+
+
- {{ i18n.ts.suspend }}
+
+
+ {{ i18n.ts.suspend }}
-
-
- {{ i18n.ts._role.policies }}
-
-
-
-
- IP
- {{ i18n.ts.requireAdminForView }}
- The date is the IP address was first acknowledged.
-
-
-
- {{ i18n.ts.deleteAccount }}
+
-
- {{ i18n.ts.resetPassword }}
-
-
-
-
-
- {{ policy }} ... {{ info.policies[policy] }}
-
-
- {{ record.createdAt }}
- {{ record.ip }}
-
-
-
- {{ i18n.ts.unsetUserAvatar }}
- {{ i18n.ts.unsetUserBanner }}
-
-
+ {{ i18n.ts.resetPassword }}
-
-
- {{ i18n.ts.assign }}
-
-
-
-
-
-
-
-
-
- Assigned:
- Period: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}
- Period: {{ i18n.ts.indefinitely }}
-
- {{ i18n.ts.new }}
-
-
- {{ i18n.ts.filter }}
-
-
-
-
-
-
-
-
+
+ IP
+ {{ i18n.ts.requireAdminForView }}
+ The date is the IP address was first acknowledged.
+
+
-
-
-
-
-
-
-
- {{ announcement.title }}
- {{ i18n.ts.messageRead }}
+
+
+ {{ i18n.ts._role.policies }}
+
+
-
+
-
-
-
+ {{ policy }} ... {{ info.policies[policy] }}
-
+
+ {{ record.createdAt }}
+ {{ record.ip }}
+
+
+
- ();
-const init = ref>();
-const info = ref();
-const ips = ref(null);
+const {
+ model: chartSrc,
+ def: chartSrcDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.notes, value: 'per-user-notes' },
+],
+ initialValue: 'per-user-notes',
+});
+const user = ref(result.user);
+const info = ref(result.info);
+const ips = ref(result.ips);
const ap = ref(null);
-const moderator = ref(false);
-const silenced = ref(false);
-const suspended = ref(false);
-const isSystem = ref(false);
-const moderationNote = ref('');
+const moderator = ref(info.value.isModerator);
+const silenced = ref(info.value.isSilenced);
+const suspended = ref(info.value.isSuspended);
+const isSystem = ref(user.value.host == null && user.value.username.includes('.'));
+const moderationNote = ref(info.value.moderationNote);
const filesPaginator = markRaw(new Paginator('admin/drive/files', {
limit: 10,
computedParams: computed(() => ({
@@ -263,7 +270,16 @@ const filesPaginator = markRaw(new Paginator('admin/drive/files', {
})),
}));
-const announcementsStatus = ref<'active' | 'archived'>('active');
+const {
+ model: announcementsStatus,
+ def: announcementsStatusDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.active, value: 'active' },
+ { label: i18n.ts.archived, value: 'archived' },
+ ],
+ initialValue: 'active',
+});
const announcementsPaginator = markRaw(new Paginator('admin/announcements/list', {
limit: 10,
@@ -272,34 +288,37 @@ const announcementsPaginator = markRaw(new Paginator('admin/announcements/list',
status: announcementsStatus.value,
})),
}));
-const expandedRoles = ref([]);
+const expandedRoleIds = ref<(typeof info.value.roles[number]['id'])[]>([]);
-function createFetcher() {
- return () => Promise.all([misskeyApi('users/show', {
+function _fetch_() {
+ return Promise.all([misskeyApi('users/show', {
userId: props.userId,
}), misskeyApi('admin/show-user', {
userId: props.userId,
}), iAmAdmin ? misskeyApi('admin/get-user-ips', {
userId: props.userId,
- }) : Promise.resolve(null)]).then(([_user, _info, _ips]) => {
- user.value = _user;
- info.value = _info;
- ips.value = _ips;
- moderator.value = info.value.isModerator;
- silenced.value = info.value.isSilenced;
- suspended.value = info.value.isSuspended;
- moderationNote.value = info.value.moderationNote;
- isSystem.value = user.value.host == null && user.value.username.includes('.');
-
- watch(moderationNote, async () => {
- await misskeyApi('admin/update-user-note', { userId: user.value.id, text: moderationNote.value });
- await refreshUser();
- });
- });
+ }) : Promise.resolve(null)]).then(([_user, _info, _ips]) => ({
+ user: _user,
+ info: _info,
+ ips: _ips,
+ }));
}
-function refreshUser() {
- init.value = createFetcher();
+watch(moderationNote, async () => {
+ await misskeyApi('admin/update-user-note', { userId: user.value.id, text: moderationNote.value });
+ await refreshUser();
+});
+
+async function refreshUser() {
+ const result = await _fetch_();
+ user.value = result.user;
+ info.value = result.info;
+ ips.value = result.ips;
+ moderator.value = info.value.isModerator;
+ silenced.value = info.value.isSilenced;
+ suspended.value = info.value.isSuspended;
+ isSystem.value = user.value.host == null && user.value.username.includes('.');
+ moderationNote.value = info.value.moderationNote;
}
async function updateRemoteUser() {
@@ -424,22 +443,22 @@ async function assignRole() {
const { canceled, result: roleId } = await os.select({
title: i18n.ts._role.chooseRoleToAssign,
- items: roles.map(r => ({ text: r.name, value: r.id })),
+ items: roles.map(r => ({ label: r.name, value: r.id })),
});
- if (canceled) return;
+ if (canceled || roleId == null) return;
const { canceled: canceled2, result: period } = await os.select({
title: i18n.ts.period + ': ' + roles.find(r => r.id === roleId)!.name,
items: [{
- value: 'indefinitely', text: i18n.ts.indefinitely,
+ value: 'indefinitely', label: i18n.ts.indefinitely,
}, {
- value: 'oneHour', text: i18n.ts.oneHour,
+ value: 'oneHour', label: i18n.ts.oneHour,
}, {
- value: 'oneDay', text: i18n.ts.oneDay,
+ value: 'oneDay', label: i18n.ts.oneDay,
}, {
- value: 'oneWeek', text: i18n.ts.oneWeek,
+ value: 'oneWeek', label: i18n.ts.oneWeek,
}, {
- value: 'oneMonth', text: i18n.ts.oneMonth,
+ value: 'oneMonth', label: i18n.ts.oneMonth,
}],
default: 'indefinitely',
});
@@ -456,7 +475,7 @@ async function assignRole() {
refreshUser();
}
-async function unassignRole(role, ev) {
+async function unassignRole(role: typeof info.value.roles[number], ev: MouseEvent) {
os.popupMenu([{
text: i18n.ts.unassign,
icon: 'ti ti-x',
@@ -468,11 +487,11 @@ async function unassignRole(role, ev) {
}], ev.currentTarget ?? ev.target);
}
-function toggleRoleItem(role) {
- if (expandedRoles.value.includes(role.id)) {
- expandedRoles.value = expandedRoles.value.filter(x => x !== role.id);
+function toggleRoleItem(role: typeof info.value.roles[number]) {
+ if (expandedRoleIds.value.includes(role.id)) {
+ expandedRoleIds.value = expandedRoleIds.value.filter(x => x !== role.id);
} else {
- expandedRoles.value.push(role.id);
+ expandedRoleIds.value.push(role.id);
}
}
@@ -493,12 +512,6 @@ async function editAnnouncement(announcement) {
});
}
-watch(() => props.userId, () => {
- init.value = createFetcher();
-}, {
- immediate: true,
-});
-
watch(user, () => {
misskeyApi('ap/get', {
uri: user.value.uri ?? `${url}/users/${user.value.id}`,
diff --git a/packages/frontend/src/pages/admin/RolesEditorFormula.vue b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
index 89ecc155b2..9d9db9158d 100644
--- a/packages/frontend/src/pages/admin/RolesEditorFormula.vue
+++ b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
@@ -6,26 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
>({
get: () => v.value.type,
set: (t) => {
if (t === 'and') v.value.values = [];
@@ -118,6 +121,8 @@ const type = computed({
},
});
+const assignedToDef = computed(() => roles.filter(r => r.target === 'manual').map(r => ({ label: r.name, value: r.id })) satisfies MkSelectItem[]);
+
function addValue() {
v.value.values.push({ id: genId(), type: 'isRemote' });
}
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
index b69c818b48..7c3f736506 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
@@ -22,27 +22,19 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.title }}
-
+
{{ i18n.ts._abuseReport._notificationRecipient.recipientType }}
-
-
{{ methodCaption }}
-
+
+
-
-
-
-
-
- {{ i18n.ts.deleteAccount }}
+
+
+ {{ i18n.tsx.recentNHours({ n: 90 }) }}
- {{ i18n.tsx.recentNDays({ n: 90 }) }}
-
+ {{ i18n.ts.unsetUserAvatar }}
+ {{ i18n.ts.unsetUserBanner }}
+
+ {{ i18n.ts.assign }}
+
+
-
+
+
+
+
+
Assigned:
+ Period: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id)!.expiresAt!).toLocaleString() }}
+ Period: {{ i18n.ts.indefinitely }}
-
-
+
@@ -224,7 +219,6 @@ import MkButton from '@/components/MkButton.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
import MkSelect from '@/components/MkSelect.vue';
-import FormSuspense from '@/components/form/suspense.vue';
import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue';
import MkInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
@@ -232,10 +226,14 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { acct } from '@/filters/user.js';
import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
-import { iAmAdmin, $i, iAmModerator } from '@/i.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
+import { ensureSignin, iAmAdmin, iAmModerator } from '@/i.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
import MkPagination from '@/components/MkPagination.vue';
import { Paginator } from '@/utility/paginator.js';
+import type { ChartSrc } from '@/components/MkChart.vue';
+
+const $i = ensureSignin();
const props = withDefaults(defineProps<{
userId: string;
@@ -244,18 +242,27 @@ const props = withDefaults(defineProps<{
initialTab: 'overview',
});
+const result = await _fetch_();
+
const tab = ref(props.initialTab);
-const chartSrc = ref('per-user-notes');
-const user = ref
+ {{ i18n.ts.new }}
-
-
+
+ {{ i18n.ts.filter }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ announcement.title }}
+ {{ i18n.ts.messageRead }}
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
{{ i18n.tsx.recentNHours({ n: 90 }) }}
+ {{ i18n.tsx.recentNDays({ n: 90 }) }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -69,6 +49,7 @@ import { computed, defineAsyncComponent, ref, watch } from 'vue';
import { genId } from '@/utility/id.js';
import MkInput from '@/components/MkInput.vue';
import MkSelect from '@/components/MkSelect.vue';
+import type { GetMkSelectValueTypesFromDef, MkSelectItem } from '@/components/MkSelect.vue';
import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
import { deepClone } from '@/utility/clone.js';
@@ -99,7 +80,29 @@ watch(v, () => {
emit('update:modelValue', v.value);
}, { deep: true });
-const type = computed({
+const typeDef = [
+ { label: i18n.ts._role._condition.isLocal, value: 'isLocal' },
+ { label: i18n.ts._role._condition.isRemote, value: 'isRemote' },
+ { label: i18n.ts._role._condition.isSuspended, value: 'isSuspended' },
+ { label: i18n.ts._role._condition.isLocked, value: 'isLocked' },
+ { label: i18n.ts._role._condition.isBot, value: 'isBot' },
+ { label: i18n.ts._role._condition.isCat, value: 'isCat' },
+ { label: i18n.ts._role._condition.isExplorable, value: 'isExplorable' },
+ { label: i18n.ts._role._condition.roleAssignedTo, value: 'roleAssignedTo' },
+ { label: i18n.ts._role._condition.createdLessThan, value: 'createdLessThan' },
+ { label: i18n.ts._role._condition.createdMoreThan, value: 'createdMoreThan' },
+ { label: i18n.ts._role._condition.followersLessThanOrEq, value: 'followersLessThanOrEq' },
+ { label: i18n.ts._role._condition.followersMoreThanOrEq, value: 'followersMoreThanOrEq' },
+ { label: i18n.ts._role._condition.followingLessThanOrEq, value: 'followingLessThanOrEq' },
+ { label: i18n.ts._role._condition.followingMoreThanOrEq, value: 'followingMoreThanOrEq' },
+ { label: i18n.ts._role._condition.notesLessThanOrEq, value: 'notesLessThanOrEq' },
+ { label: i18n.ts._role._condition.notesMoreThanOrEq, value: 'notesMoreThanOrEq' },
+ { label: i18n.ts._role._condition.and, value: 'and' },
+ { label: i18n.ts._role._condition.or, value: 'or' },
+ { label: i18n.ts._role._condition.not, value: 'not' },
+] as const satisfies MkSelectItem[];
+
+const type = computed
-
+
{{ i18n.ts._abuseReport._notificationRecipient.notifiedUser }}
-
-
+
{{ i18n.ts._abuseReport._notificationRecipient.notifiedWebhook }}
-
@@ -79,14 +71,13 @@ import MkModalWindow from '@/components/MkModalWindow.vue';
import { i18n } from '@/i18n.js';
import MkInput from '@/components/MkInput.vue';
import { misskeyApi } from '@/utility/misskey-api.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
import MkSelect from '@/components/MkSelect.vue';
import { showSystemWebhookEditorDialog } from '@/components/MkSystemWebhookEditor.impl.js';
import MkSwitch from '@/components/MkSwitch.vue';
import MkDivider from '@/components/MkDivider.vue';
import * as os from '@/os.js';
-type NotificationRecipientMethod = 'email' | 'webhook';
-
const emit = defineEmits<{
(ev: 'submitted'): void;
(ev: 'canceled'): void;
@@ -105,9 +96,28 @@ const dialogEl = useTemplateRef('dialogEl');
const loading = ref(0);
const title = ref('');
-const method = ref('email');
-const userId = ref(null);
-const systemWebhookId = ref(null);
+const {
+ model: method,
+ def: methodDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts._abuseReport._notificationRecipient._recipientType.mail, value: 'email' },
+ { label: i18n.ts._abuseReport._notificationRecipient._recipientType.webhook, value: 'webhook' },
+ ],
+ initialValue: 'email',
+});
+const {
+ model: userId,
+ def: userIdDef,
+} = useMkSelect({
+ items: computed(() => moderators.value.map(u => ({ label: u.name ? `${u.name}(${u.username})` : u.username, value: u.id as string | null }))),
+});
+const {
+ model: systemWebhookId,
+ def: systemWebhookIdDef,
+} = useMkSelect({
+ items: computed(() => systemWebhooks.value.map(w => ({ label: w.name, value: w.id }))),
+});
const isActive = ref(true);
const moderators = ref([]);
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
index f5e77cbe4e..893bd8d6d3 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
@@ -13,11 +13,8 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts._abuseReport._notificationRecipient.recipientType }}
-
-
-
{{ i18n.ts._abuseReport._notificationRecipient.keywords }}
@@ -51,10 +48,21 @@ import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import MkDivider from '@/components/MkDivider.vue';
import { i18n } from '@/i18n.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
const recipients = ref([]);
-const filterMethod = ref(null);
+const {
+ model: filterMethod,
+ def: filterMethodDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.all, value: null },
+ { label: i18n.ts._abuseReport._notificationRecipient._recipientType.mail, value: 'email' },
+ { label: i18n.ts._abuseReport._notificationRecipient._recipientType.webhook, value: 'webhook' },
+ ],
+ initialValue: null,
+});
const filterText = ref('');
const filteredRecipients = computed(() => {
diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue
index ab462229a7..76bf20b409 100644
--- a/packages/frontend/src/pages/admin/abuses.vue
+++ b/packages/frontend/src/pages/admin/abuses.vue
@@ -16,23 +16,14 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.state }}
-
-
-
-
+
{{ i18n.ts.reporteeOrigin }}
-
-
-
-
+
{{ i18n.ts.reporterOrigin }}
-
-
-
@@ -64,13 +55,44 @@ import MkPagination from '@/components/MkPagination.vue';
import XAbuseReport from '@/components/MkAbuseReport.vue';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
import MkButton from '@/components/MkButton.vue';
import { store } from '@/store.js';
import { Paginator } from '@/utility/paginator.js';
-const state = ref('unresolved');
-const reporterOrigin = ref('combined');
-const targetUserOrigin = ref('combined');
+const {
+ model: state,
+ def: stateDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.all, value: 'all' },
+ { label: i18n.ts.unresolved, value: 'unresolved' },
+ { label: i18n.ts.resolved, value: 'resolved' },
+ ],
+ initialValue: 'unresolved',
+});
+const {
+ model: reporterOrigin,
+ def: reporterOriginDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.all, value: 'combined' },
+ { label: i18n.ts.local, value: 'local' },
+ { label: i18n.ts.remote, value: 'remote' },
+ ],
+ initialValue: 'combined',
+});
+const {
+ model: targetUserOrigin,
+ def: targetUserOriginDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.all, value: 'combined' },
+ { label: i18n.ts.local, value: 'local' },
+ { label: i18n.ts.remote, value: 'remote' },
+ ],
+ initialValue: 'combined',
+});
const searchUsername = ref('');
const searchHost = ref('');
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index c5baeda7b0..94940a84ae 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -6,27 +6,29 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.state }}
-
-
-
+
URL
+
{{ i18n.ts.imageUrl }}
+
Form
+
+
{{ i18n.ts.ratio }}
@@ -46,6 +49,11 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.expiration }}
+
+
+ {{ i18n.ts.sensitive }}
+
+
{{ i18n.ts.advancedSettings }}
@@ -59,9 +67,11 @@ SPDX-License-Identifier: AGPL-3.0-only
+
{{ i18n.ts.memo }}
+
+
{{ i18n.ts.more }}
@@ -91,10 +102,12 @@ import MkRadios from '@/components/MkRadios.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkSelect from '@/components/MkSelect.vue';
import FormSplit from '@/components/form/split.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
const ads = ref([]);
@@ -102,7 +115,17 @@ const ads = ref([]);
const localTime = new Date();
const localTimeDiff = localTime.getTimezoneOffset() * 60 * 1000;
const daysOfWeek: string[] = [i18n.ts._weekday.sunday, i18n.ts._weekday.monday, i18n.ts._weekday.tuesday, i18n.ts._weekday.wednesday, i18n.ts._weekday.thursday, i18n.ts._weekday.friday, i18n.ts._weekday.saturday];
-const filterType = ref('all');
+const {
+ model: filterType,
+ def: filterTypeDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts.all, value: 'all' },
+ { label: i18n.ts.publishing, value: 'publishing' },
+ { label: i18n.ts.expired, value: 'expired' },
+ ],
+ initialValue: 'all',
+});
let publishing: boolean | null = null;
misskeyApi('admin/ad/list', { publishing: publishing }).then(adsResponse => {
@@ -121,7 +144,7 @@ misskeyApi('admin/ad/list', { publishing: publishing }).then(adsResponse => {
}
});
-const filterItems = (v) => {
+const filterItems = (v: typeof filterType.value) => {
if (v === 'publishing') {
publishing = true;
} else if (v === 'expired') {
@@ -134,33 +157,34 @@ const filterItems = (v) => {
};
// 選択された曜日(index)のビットフラグを操作する
-function toggleDayOfWeek(ad, index) {
+function toggleDayOfWeek(ad: Misskey.entities.Ad, index: number) {
ad.dayOfWeek ^= 1 << index;
}
function add() {
ads.value.unshift({
- id: null,
+ id: '',
memo: '',
place: 'square',
priority: 'middle',
ratio: 1,
url: '',
- imageUrl: null,
- expiresAt: null,
- startsAt: null,
+ imageUrl: '',
+ expiresAt: new Date().toISOString(),
+ startsAt: new Date().toISOString(),
dayOfWeek: 0,
+ isSensitive: false,
});
}
-function remove(ad) {
+function remove(ad: Misskey.entities.Ad) {
os.confirm({
type: 'warning',
text: i18n.tsx.removeAreYouSure({ x: ad.url }),
}).then(({ canceled }) => {
if (canceled) return;
ads.value = ads.value.filter(x => x !== ad);
- if (ad.id == null) return;
+ if (ad.id === '') return;
os.apiWithDialog('admin/ad/delete', {
id: ad.id,
}).then(() => {
@@ -169,8 +193,8 @@ function remove(ad) {
});
}
-function save(ad) {
- if (ad.id == null) {
+function save(ad: Misskey.entities.Ad) {
+ if (ad.id === '') {
misskeyApi('admin/ad/create', {
...ad,
expiresAt: new Date(ad.expiresAt).getTime(),
@@ -207,7 +231,7 @@ function save(ad) {
}
function more() {
- misskeyApi('admin/ad/list', { untilId: ads.value.reduce((acc, ad) => ad.id != null ? ad : acc).id, publishing: publishing }).then(adsResponse => {
+ misskeyApi('admin/ad/list', { untilId: ads.value.reduce((acc, ad) => ad.id !== '' ? ad : acc).id, publishing: publishing }).then(adsResponse => {
if (adsResponse == null) return;
ads.value = ads.value.concat(adsResponse.map(r => {
const exdate = new Date(r.expiresAt);
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index e5903d6257..b90a724b17 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -10,10 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}
{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}
-
+
{{ i18n.ts.filter }}
-
-
-
- {{ i18n.ts._serverSettings.showActivityiesForVisitor }}
+
+ {{ i18n.ts._serverSettings.showActivitiesForVisitor }}
@@ -152,6 +152,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref, computed } from 'vue';
import JSON5 from 'json5';
import { host } from '@@/js/config.js';
+import type { ClientOptions } from '@/instance.js';
import MkInput from '@/components/MkInput.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import * as os from '@/os.js';
@@ -166,9 +167,13 @@ import MkSwitch from '@/components/MkSwitch.vue';
const meta = await misskeyApi('admin/meta');
-const entrancePageStyle = ref(meta.clientOptions.entrancePageStyle ?? 'classic');
-const showTimelineForVisitor = ref(meta.clientOptions.showTimelineForVisitor ?? true);
-const showActivityiesForVisitor = ref(meta.clientOptions.showActivityiesForVisitor ?? true);
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+const entrancePageStyle = ref(meta.clientOptions.entrancePageStyle ?? 'classic');
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+const showTimelineForVisitor = ref(meta.clientOptions.showTimelineForVisitor ?? true);
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+const showActivitiesForVisitor = ref(meta.clientOptions.showActivitiesForVisitor ?? true);
+
const iconUrl = ref(meta.iconUrl);
const app192IconUrl = ref(meta.app192IconUrl);
const app512IconUrl = ref(meta.app512IconUrl);
@@ -186,11 +191,11 @@ const manifestJsonOverride = ref(meta.manifestJsonOverride === '' ? '{}' : JSON.
function save() {
os.apiWithDialog('admin/update-meta', {
- clientOptions: {
+ clientOptions: ({
entrancePageStyle: entrancePageStyle.value,
showTimelineForVisitor: showTimelineForVisitor.value,
- showActivityiesForVisitor: showActivityiesForVisitor.value,
- },
+ showActivitiesForVisitor: showActivitiesForVisitor.value,
+ } as ClientOptions) as any,
iconUrl: iconUrl.value,
app192IconUrl: app192IconUrl.value,
app512IconUrl: app512IconUrl.value,
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.search.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.search.vue
index 9938d5cc4a..6b5272914b 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.search.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.search.vue
@@ -56,20 +56,24 @@ SPDX-License-Identifier: AGPL-3.0-only
sensitive
-
-
-
localOnly
-
-
-
{{ i18n.ts._customEmojisManager._local._register.uploadSettingDescription }}
(null);
const otherPostsPaginator = markRaw(new Paginator('users/gallery/posts', {
limit: 6,
computedParams: computed(() => ({
- userId: post.value.user.id,
+ userId: post.value!.user.id,
})),
}));
@@ -109,33 +109,38 @@ function fetchPost() {
}
function copyLink() {
+ if (!post.value) return;
copyToClipboard(`${url}/gallery/${post.value.id}`);
}
function share() {
+ if (!post.value) return;
navigator.share({
title: post.value.title,
- text: post.value.description,
+ text: post.value.description ?? undefined,
url: `${url}/gallery/${post.value.id}`,
});
}
function shareWithNote() {
+ if (!post.value) return;
os.post({
initialText: `${post.value.title} ${url}/gallery/${post.value.id}`,
});
}
function like() {
+ if (!post.value) return;
os.apiWithDialog('gallery/posts/like', {
postId: props.postId,
}).then(() => {
- post.value.isLiked = true;
- post.value.likedCount++;
+ post.value!.isLiked = true;
+ post.value!.likedCount++;
});
}
async function unlike() {
+ if (!post.value) return;
const confirm = await os.confirm({
type: 'warning',
text: i18n.ts.unlikeConfirm,
@@ -144,8 +149,8 @@ async function unlike() {
os.apiWithDialog('gallery/posts/unlike', {
postId: props.postId,
}).then(() => {
- post.value.isLiked = false;
- post.value.likedCount--;
+ post.value!.isLiked = false;
+ post.value!.likedCount--;
});
}
diff --git a/packages/frontend/src/pages/install-extensions.vue b/packages/frontend/src/pages/install-extensions.vue
index 1b3c6616cc..cad3b2a00a 100644
--- a/packages/frontend/src/pages/install-extensions.vue
+++ b/packages/frontend/src/pages/install-extensions.vue
@@ -80,7 +80,7 @@ function close_(): void {
}
}
-async function fetch() {
+async function _fetch_() {
if (!url.value || !hash.value) {
errorKV.value = {
title: i18n.ts._externalResourceInstaller._errors._invalidParams.title,
@@ -161,7 +161,7 @@ async function fetch() {
},
raw: res.data,
};
- } catch (err) {
+ } catch (err: any) {
switch (err.message.toLowerCase()) {
case 'this theme is already installed':
errorKV.value = {
@@ -229,7 +229,7 @@ async function install() {
const urlParams = new URLSearchParams(window.location.search);
url.value = urlParams.get('url');
hash.value = urlParams.get('hash');
-fetch();
+_fetch_();
definePage(() => ({
title: i18n.ts._externalResourceInstaller.title,
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 4be5fa447d..61a40202c0 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -92,18 +92,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ list.likedCount }}
+ {{ list.likedCount }}
{{ list.likedCount }}
{{ i18n.ts.import }}
@@ -41,7 +41,7 @@ const props = defineProps<{
listId: string;
}>();
-const list = ref(null);
+const list = ref(null);
const error = ref(null);
const users = ref([]);
@@ -51,8 +51,9 @@ function fetchList(): void {
forPublic: true,
}).then(_list => {
list.value = _list;
+ if (_list.userIds == null || _list.userIds.length === 0) return;
misskeyApi('users/show', {
- userIds: list.value.userIds,
+ userIds: _list.userIds,
}).then(_users => {
users.value = _users;
});
@@ -68,7 +69,7 @@ function like() {
}).then(() => {
if (list.value == null) return;
list.value.isLiked = true;
- list.value.likedCount++;
+ list.value.likedCount = (list.value.likedCount != null ? list.value.likedCount + 1 : 1);
});
}
@@ -79,7 +80,7 @@ function unlike() {
}).then(() => {
if (list.value == null) return;
list.value.isLiked = false;
- list.value.likedCount--;
+ list.value.likedCount = (list.value.likedCount != null ? Math.max(0, list.value.likedCount - 1) : 0);
});
}
@@ -88,7 +89,7 @@ async function create() {
const { canceled, result: name } = await os.inputText({
title: i18n.ts.enterListName,
});
- if (canceled) return;
+ if (canceled || name == null) return;
await os.apiWithDialog('users/lists/create-from-public', { name: name, listId: list.value.id });
}
@@ -103,6 +104,7 @@ definePage(() => ({
icon: 'ti ti-list',
}));
+
diff --git a/packages/frontend/src/pages/qr.show.vue b/packages/frontend/src/pages/qr.show.vue
new file mode 100644
index 0000000000..28f80e0963
--- /dev/null
+++ b/packages/frontend/src/pages/qr.show.vue
@@ -0,0 +1,234 @@
+
+
+
+(null);
-const valueForEditor = ref(null);
+const valueForEditor = ref('');
function fetchValue() {
misskeyApi('i/registry/get-detail', {
diff --git a/packages/frontend/src/pages/registry.vue b/packages/frontend/src/pages/registry.vue
index 3762dadd12..389438242e 100644
--- a/packages/frontend/src/pages/registry.vue
+++ b/packages/frontend/src/pages/registry.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._registry.createKey }}
-
+
{{ i18n.ts.uploadFolder }}
-
@@ -63,7 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/gallery/edit.vue b/packages/frontend/src/pages/gallery/edit.vue
index cf0d700962..12d1a37390 100644
--- a/packages/frontend/src/pages/gallery/edit.vue
+++ b/packages/frontend/src/pages/gallery/edit.vue
@@ -4,162 +4,35 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
-
+
+
-
-
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index eab435c002..31a716fb0e 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ i18n.ts.title }}
-
-
-
- {{ i18n.ts.description }}
-
-
- {{ i18n.ts.markAsSensitive }}
-
-
-
-
-
- {{ i18n.ts.attachFile }}
-
-
-
-
- {{ file.name }}
-
- {{ post.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -154,6 +143,7 @@ import MkUserCardMini from '@/components/MkUserCardMini.vue';
import MkPagination from '@/components/MkPagination.vue';
import { getProxiedImageUrlNullable } from '@/utility/media-proxy.js';
import { dateString } from '@/filters/date.js';
+import { useMkSelect } from '@/composables/use-mkselect.js';
import MkTextarea from '@/components/MkTextarea.vue';
import { Paginator } from '@/utility/paginator.js';
@@ -163,7 +153,25 @@ const props = defineProps<{
const tab = ref('overview');
-const chartSrc = ref('instance-requests');
+const {
+ model: chartSrc,
+ def: chartSrcDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts._instanceCharts.requests, value: 'instance-requests' },
+ { label: i18n.ts._instanceCharts.users, value: 'instance-users' },
+ { label: i18n.ts._instanceCharts.usersTotal, value: 'instance-users-total' },
+ { label: i18n.ts._instanceCharts.notes, value: 'instance-notes' },
+ { label: i18n.ts._instanceCharts.notesTotal, value: 'instance-notes-total' },
+ { label: i18n.ts._instanceCharts.ff, value: 'instance-ff' },
+ { label: i18n.ts._instanceCharts.ffTotal, value: 'instance-ff-total' },
+ { label: i18n.ts._instanceCharts.cacheSize, value: 'instance-drive-usage' },
+ { label: i18n.ts._instanceCharts.cacheSizeTotal, value: 'instance-drive-usage-total' },
+ { label: i18n.ts._instanceCharts.files, value: 'instance-drive-files' },
+ { label: i18n.ts._instanceCharts.filesTotal, value: 'instance-drive-files-total' },
+ ],
+ initialValue: 'instance-requests',
+});
const meta = ref(null);
const instance = ref(null);
const suspensionState = ref<'none' | 'manuallySuspended' | 'goneSuspended' | 'autoSuspendedForNotResponding' | 'softwareSuspended'>('none');
@@ -198,7 +206,7 @@ if (iAmModerator) {
});
}
-async function fetch(): Promise {
+async function _fetch_(): Promise {
if (iAmAdmin) {
meta.value = await misskeyApi('admin/meta');
}
@@ -276,7 +284,7 @@ function refreshMetadata(): void {
});
}
-fetch();
+_fetch_();
const headerActions = computed(() => [{
text: `https://${props.host}`,
diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue
index 1261428c1c..efb1186fe5 100644
--- a/packages/frontend/src/pages/list.vue
+++ b/packages/frontend/src/pages/list.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/qr.vue b/packages/frontend/src/pages/qr.vue
new file mode 100644
index 0000000000..2e5629f232
--- /dev/null
+++ b/packages/frontend/src/pages/qr.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+ ![Misskey Logo]()
+ ![Misskey Logo]()
+
+
+
+
+ {{ acct }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/registry.value.vue b/packages/frontend/src/pages/registry.value.vue
index 5c5bbfba39..827866ae2a 100644
--- a/packages/frontend/src/pages/registry.value.vue
+++ b/packages/frontend/src/pages/registry.value.vue
@@ -62,10 +62,10 @@ const props = defineProps<{
}>();
const scope = computed(() => props.path.split('/').slice(0, -1));
-const key = computed(() => props.path.split('/').at(-1));
+const key = computed(() => props.path.split('/').at(-1)!);
const value = ref
+ {{ i18n.ts._qr.showTabTitle }}
+ {{ i18n.ts._qr.readTabTitle }}
+
+
+
-
+
{{ domain.domain ? domain.domain.toUpperCase() : i18n.ts.system }}
{{ scope.length === 0 ? '(root)' : scope.join('/') }}
diff --git a/packages/frontend/src/pages/reset-password.vue b/packages/frontend/src/pages/reset-password.vue
index 9e2069f0e5..53077c34b0 100644
--- a/packages/frontend/src/pages/reset-password.vue
+++ b/packages/frontend/src/pages/reset-password.vue
@@ -34,6 +34,7 @@ const props = defineProps<{
const password = ref('');
async function save() {
+ if (props.token == null) return;
await os.apiWithDialog('reset-password', {
token: props.token,
password: password.value,
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 69429728d0..aae638641a 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -164,7 +164,7 @@ const $i = ensureSignin();
const props = defineProps<{
game: Misskey.entities.ReversiGameDetailed;
- connection?: Misskey.ChannelConnection | null;
+ connection?: Misskey.IChannelConnection | null;
}>();
const showBoardLabels = ref(false);
diff --git a/packages/frontend/src/pages/reversi/game.setting.vue b/packages/frontend/src/pages/reversi/game.setting.vue
index 8392384963..1e01496bbb 100644
--- a/packages/frontend/src/pages/reversi/game.setting.vue
+++ b/packages/frontend/src/pages/reversi/game.setting.vue
@@ -132,7 +132,7 @@ const mapCategories = Array.from(new Set(Object.values(Reversi.maps).map(x => x.
const props = defineProps<{
game: Misskey.entities.ReversiGameDetailed;
- connection: Misskey.ChannelConnection;
+ connection: Misskey.IChannelConnection;
}>();
const shareWhenStart = defineModel('shareWhenStart', { default: false });
diff --git a/packages/frontend/src/pages/reversi/game.vue b/packages/frontend/src/pages/reversi/game.vue
index a447572cc0..b1ba4da247 100644
--- a/packages/frontend/src/pages/reversi/game.vue
+++ b/packages/frontend/src/pages/reversi/game.vue
@@ -33,7 +33,7 @@ const props = defineProps<{
}>();
const game = shallowRef(null);
-const connection = shallowRef(null);
+const connection = shallowRef | null>(null);
const shareWhenStart = ref(false);
watch(() => props.gameId, () => {
diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue
index 751a67190a..d73363d058 100644
--- a/packages/frontend/src/pages/scratchpad.vue
+++ b/packages/frontend/src/pages/scratchpad.vue
@@ -82,10 +82,10 @@ const logs = ref<{
text: string;
print: boolean;
}[]>([]);
-const root = ref();
+const root = ref();
const components = ref[]>([]);
const uiKey = ref(0);
-const uiInspectorOpenedComponents = ref(new Map);
+const uiInspectorOpenedComponents = ref(new WeakMap, boolean>);
const saved = miLocalStorage.getItem('scratchpad');
if (saved) {
@@ -186,11 +186,13 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
const showns = computed(() => {
+ if (root.value == null) return new Set();
const result = new Set();
(function addChildrenToResult(c: AsUiComponent) {
result.add(c.id);
- if (c.children) {
- const childComponents = components.value.filter(v => c.children.includes(v.value.id));
+ const children = c.children;
+ if (children) {
+ const childComponents = components.value.filter(v => children.includes(v.value.id));
for (const child of childComponents) {
addChildrenToResult(child.value);
}
diff --git a/packages/frontend/src/pages/settings/2fa.qrdialog.vue b/packages/frontend/src/pages/settings/2fa.qrdialog.vue
index 5bb125e67c..780040f699 100644
--- a/packages/frontend/src/pages/settings/2fa.qrdialog.vue
+++ b/packages/frontend/src/pages/settings/2fa.qrdialog.vue
@@ -135,7 +135,7 @@ const emit = defineEmits<{
const dialog = useTemplateRef('dialog');
const page = ref(0);
-const token = ref(null);
+const token = ref(null);
const backupCodes = ref();
function cancel() {
@@ -145,7 +145,7 @@ function cancel() {
async function tokenDone() {
if (token.value == null) return;
const res = await os.apiWithDialog('i/2fa/done', {
- token: typeof token.value === 'string' ? token.value : token.value.toString(),
+ token: token.value.toString(), // 実装ミスなどでnumberが入る可能性を払拭できないため念のためtoString
});
backupCodes.value = res.backupCodes;
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue
index 1f98fab618..2cc13744b1 100644
--- a/packages/frontend/src/pages/settings/2fa.vue
+++ b/packages/frontend/src/pages/settings/2fa.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.delete }}
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.installedDate }}
+
{{ i18n.ts.lastUsedDate }}
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index c58cd57c65..d3d642f156 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -17,13 +17,13 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts._2fa.renewTOTP }}
{{ i18n.ts._2fa.whyTOTPOnlyRenew }}
@@ -58,7 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._2fa.registerSecurityKey }}
-
+
{{ key.name }}
@@ -24,29 +26,29 @@ import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { $i } from '@/i.js';
-import { switchAccount, removeAccount, login, getAccountWithSigninDialog, getAccountWithSignupDialog } from '@/accounts.js';
+import { switchAccount, removeAccount, login, getAccountWithSigninDialog, getAccountWithSignupDialog, getAccounts } from '@/accounts.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import MkUserCardMini from '@/components/MkUserCardMini.vue';
import { prefer } from '@/preferences.js';
-const accounts = prefer.r.accounts;
+const accounts = await getAccounts();
function refreshAllAccounts() {
// TODO
}
-function menu(host: string, account: Misskey.entities.UserDetailed, ev: MouseEvent) {
+function showMenu(host: string, id: string, ev: MouseEvent) {
let menu: MenuItem[];
menu = [{
text: i18n.ts.switch,
icon: 'ti ti-switch-horizontal',
- action: () => switchAccount(host, account.id),
+ action: () => switchAccount(host, id),
}, {
text: i18n.ts.remove,
icon: 'ti ti-trash',
- action: () => removeAccount(host, account.id),
+ action: () => removeAccount(host, id),
}];
os.popupMenu(menu, ev.currentTarget ?? ev.target);
diff --git a/packages/frontend/src/pages/settings/apps.vue b/packages/frontend/src/pages/settings/apps.vue
index 5f51a5e079..54e214241b 100644
--- a/packages/frontend/src/pages/settings/apps.vue
+++ b/packages/frontend/src/pages/settings/apps.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ token.name }}
{{ token.description }}
-
-
+
{{ i18n.ts.sort }}
-
@@ -60,6 +59,7 @@ import { i18n } from '@/i18n.js';
import bytes from '@/filters/bytes.js';
import { definePage } from '@/page.js';
import MkSelect from '@/components/MkSelect.vue';
+import { useMkSelect } from '@/composables/use-mkselect.js';
import { getDriveFileMenu } from '@/utility/get-drive-file-menu.js';
import { Paginator } from '@/utility/paginator.js';
@@ -69,15 +69,19 @@ const paginator = markRaw(new Paginator('drive/files', {
computedParams: computed(() => ({ sort: sortMode.value })),
}));
-const sortOptions = [
- { value: 'sizeDesc', displayName: i18n.ts._drivecleaner.orderBySizeDesc },
- { value: 'createdAtAsc', displayName: i18n.ts._drivecleaner.orderByCreatedAtAsc },
-];
-
const capacity = ref(0);
const usage = ref(0);
const fetching = ref(true);
-const sortModeSelect = ref('sizeDesc');
+const {
+ model: sortModeSelect,
+ def: sortModeSelectDef,
+} = useMkSelect({
+ items: [
+ { label: i18n.ts._drivecleaner.orderBySizeDesc, value: 'sizeDesc' },
+ { label: i18n.ts._drivecleaner.orderByCreatedAtAsc, value: 'createdAtAsc' },
+ ],
+ initialValue: 'sizeDesc',
+});
fetchDriveInfo();
diff --git a/packages/frontend/src/pages/settings/drive.WatermarkItem.vue b/packages/frontend/src/pages/settings/drive.WatermarkItem.vue
index b466f35fc5..bb91d5e212 100644
--- a/packages/frontend/src/pages/settings/drive.WatermarkItem.vue
+++ b/packages/frontend/src/pages/settings/drive.WatermarkItem.vue
@@ -43,7 +43,7 @@ async function edit() {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkWatermarkEditorDialog.vue')), {
preset: deepClone(props.preset),
}, {
- ok: (preset: WatermarkPreset) => {
+ ok: (preset) => {
emit('updatePreset', preset);
},
closed: () => dispose(),
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index cfa4df18fc..f58ff4c78c 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.uploadFolder }}
{{ uploadFolder ? uploadFolder.name : '-' }}
-
+
@@ -129,13 +129,37 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.defaultImageCompressionLevel }}
-
+ {{ i18n.ts.defaultCompressionLevel }}
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.video }}
+
+
+
+
+
+ {{ i18n.ts.defaultCompressionLevel }}
+
@@ -196,6 +220,7 @@ const meterStyle = computed(() => {
const keepOriginalFilename = prefer.model('keepOriginalFilename');
const defaultWatermarkPresetId = prefer.model('defaultWatermarkPresetId');
const defaultImageCompressionLevel = prefer.model('defaultImageCompressionLevel');
+const defaultVideoCompressionLevel = prefer.model('defaultVideoCompressionLevel');
const watermarkPresetsSyncEnabled = ref(prefer.isSyncEnabled('watermarkPresets'));
diff --git a/packages/frontend/src/pages/settings/email.vue b/packages/frontend/src/pages/settings/email.vue
index fb8f51041e..469a3c2f1c 100644
--- a/packages/frontend/src/pages/settings/email.vue
+++ b/packages/frontend/src/pages/settings/email.vue
@@ -74,7 +74,7 @@ import { instance } from '@/instance.js';
const $i = ensureSignin();
-const emailAddress = ref($i.email);
+const emailAddress = ref($i.email ?? '');
const onChangeReceiveAnnouncementEmail = (v) => {
misskeyApi('i/update', {
diff --git a/packages/frontend/src/pages/settings/emoji-palette.vue b/packages/frontend/src/pages/settings/emoji-palette.vue
index 5ff5f45a2f..9c70461847 100644
--- a/packages/frontend/src/pages/settings/emoji-palette.vue
+++ b/packages/frontend/src/pages/settings/emoji-palette.vue
@@ -36,20 +36,16 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts._emojiPalette.paletteForMain }}
-
-
-
+
{{ i18n.ts._emojiPalette.paletteForReaction }}
-
-
@@ -68,6 +64,8 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
@@ -99,12 +97,15 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.style }}
{{ i18n.ts.needReloadToApply }}
-
-
-
@@ -119,8 +120,9 @@ SPDX-License-Identifier: AGPL-3.0-only