[${(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-
-
- +
- {{ param }}
{{ 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 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(() => ({
@@ -272,34 +272,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() {
@@ -456,7 +459,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 +471,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 +496,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/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index c5baeda7b0..06a28db088 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -140,15 +140,15 @@ function toggleDayOfWeek(ad, 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,
});
}
@@ -160,7 +160,7 @@ function remove(ad) {
}).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(() => {
@@ -170,7 +170,7 @@ function remove(ad) {
}
function save(ad) {
- if (ad.id == null) {
+ if (ad.id === '') {
misskeyApi('admin/ad/create', {
...ad,
expiresAt: new Date(ad.expiresAt).getTime(),
@@ -207,7 +207,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/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index ac7797becc..e5e0f087e1 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -23,8 +23,8 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ 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/database.vue b/packages/frontend/src/pages/admin/database.vue
index d51f43c098..f41967d3bd 100644
--- a/packages/frontend/src/pages/admin/database.vue
+++ b/packages/frontend/src/pages/admin/database.vue
@@ -6,19 +6,18 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue
index bc957ff38a..c1a8b992b7 100644
--- a/packages/frontend/src/pages/drop-and-fusion.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.vue
@@ -48,8 +48,8 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -87,6 +87,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/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..473207fe6e 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -198,7 +198,7 @@ if (iAmModerator) {
});
}
-async function fetch(): Promise {
+async function _fetch_(): Promise {
if (iAmAdmin) {
meta.value = await misskeyApi('admin/meta');
}
@@ -276,7 +276,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..a52b562c7f 100644
--- a/packages/frontend/src/pages/list.vue
+++ b/packages/frontend/src/pages/list.vue
@@ -103,6 +103,7 @@ definePage(() => ({
icon: 'ti ti-list',
}));
+
-
+
+
-
-
-
-
-
- {{ 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 +222,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,11 +229,13 @@ 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 { ensureSignin, iAmAdmin, iAmModerator } from '@/i.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
import MkPagination from '@/components/MkPagination.vue';
import { Paginator } from '@/utility/paginator.js';
+const $i = ensureSignin();
+
const props = withDefaults(defineProps<{
userId: string;
initialTab?: string;
@@ -244,18 +243,19 @@ 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 }) }}
+
+
+
+
+
+
+
-
+
{{ table[0] }}
{{ bytes(table[1].size) }} ({{ number(table[1].count) }} recs)
-
+
{{ i18n.tsx.lastNDays({ n: 7 }) }} {{ i18n.ts.ranking }} ({{ gameMode.toUpperCase() }})
-
-
-
- {{ i18n.ts.title }}
-
-
-
- {{ i18n.ts.description }}
-
-
- {{ i18n.ts.markAsSensitive }}
-
-
-
-
-
- {{ i18n.ts.attachFile }}
-
-
-
-
- {{ file.name }}
-
-