-
@@ -28,9 +31,12 @@
import { watch } from 'vue';
import * as misskey from 'misskey-js';
import { getStaticImageUrl } from '@/scripts/media-proxy';
+import bytes from '@/filters/bytes';
import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
import { defaultStore } from '@/store';
import { i18n } from '@/i18n';
+import * as os from '@/os';
+import { iAmModerator } from '@/account';
const props = defineProps<{
image: misskey.entities.DriveFile;
@@ -38,21 +44,33 @@ const props = defineProps<{
}>();
let hide = $ref(true);
-let darkMode = $ref(defaultStore.state.darkMode);
+let darkMode: boolean = $ref(defaultStore.state.darkMode);
-const url = (props.raw || defaultStore.state.loadRawImages)
+const url = $computed(() => (props.raw || defaultStore.state.loadRawImages)
? props.image.url
: defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(props.image.url)
- : props.image.thumbnailUrl;
+ : props.image.thumbnailUrl,
+);
// Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
watch(() => props.image, () => {
- hide = (defaultStore.state.nsfw === 'force') ? true : props.image.isSensitive && (defaultStore.state.nsfw !== 'ignore');
+ hide = (defaultStore.state.nsfw === 'force' || defaultStore.state.enableDataSaverMode) ? true : (props.image.isSensitive && defaultStore.state.nsfw !== 'ignore');
}, {
deep: true,
immediate: true,
});
+
+function showMenu(ev: MouseEvent) {
+ os.popupMenu([...(iAmModerator ? [{
+ text: i18n.ts.markAsSensitive,
+ icon: 'ti ti-eye-off',
+ action: () => {
+ os.apiWithDialog('drive/files/update', { fileId: props.image.id, isSensitive: true });
+ },
+ }] : [])], ev.currentTarget ?? ev.target);
+}
+
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index d36cc2d26b5b..e456ff3eec76 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -2,10 +2,16 @@
- {{ i18n.ts.sensitive }}
+ {{ i18n.ts.sensitive }}{{ defaultStore.state.enableDataSaverMode ? ` (${i18n.ts.image}${image.size ? ' ' + bytes(image.size) : ''})` : '' }}
+ {{ defaultStore.state.enableDataSaverMode && image.size ? bytes(image.size) : i18n.ts.image }}
{{ i18n.ts.clickToShow }}
GIF
ALT
+ NSFW
-
+
();
+let content = $shallowRef();
let omitted = $ref(false);
let ignoreOmit = $ref(false);
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 42a3748d9aa5..c65cb7d6e5d2 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -247,6 +247,10 @@ watch($$(text), () => {
checkMissingMention();
}, { immediate: true });
+watch($$(visibility), () => {
+ checkMissingMention();
+}, { immediate: true });
+
watch($$(visibleUsers), () => {
checkMissingMention();
}, {
@@ -900,27 +904,28 @@ defineExpose({
}
.headerLeft {
- display: grid;
- grid-template-columns: repeat(2, minmax(36px, 50px));
- grid-template-rows: minmax(40px, 100%);
+ display: flex;
+ flex: 0 1 100px;
}
.cancel {
padding: 0;
font-size: 1em;
height: 100%;
+ flex: 0 1 50px;
}
.account {
height: 100%;
display: inline-flex;
vertical-align: bottom;
+ flex: 0 1 50px;
}
.avatar {
width: 28px;
height: 28px;
- margin: auto 0;
+ margin: auto;
}
.headerRight {
diff --git a/packages/frontend/src/components/MkRadio.vue b/packages/frontend/src/components/MkRadio.vue
index fcf454c77a93..5db2f5ee6d79 100644
--- a/packages/frontend/src/components/MkRadio.vue
+++ b/packages/frontend/src/components/MkRadio.vue
@@ -24,7 +24,7 @@ import { } from 'vue';
const props = defineProps<{
modelValue: any;
value: any;
- disabled: boolean;
+ disabled?: boolean;
}>();
const emit = defineEmits<{
diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue
index 8590ccf9ae2a..e2240fb4e135 100644
--- a/packages/frontend/src/components/MkRadios.vue
+++ b/packages/frontend/src/components/MkRadios.vue
@@ -1,5 +1,5 @@
+
+
diff --git a/packages/frontend/src/components/MkRetentionHeatmap.vue b/packages/frontend/src/components/MkRetentionHeatmap.vue
index 85c009f74601..f33f68cab723 100644
--- a/packages/frontend/src/components/MkRetentionHeatmap.vue
+++ b/packages/frontend/src/components/MkRetentionHeatmap.vue
@@ -44,7 +44,13 @@ async function renderChart() {
const data = [];
for (const record of raw) {
- let i = 0;
+ data.push({
+ x: 0,
+ y: record.createdAt,
+ v: record.users,
+ });
+
+ let i = 1;
for (const date of Object.keys(record.data).sort((a, b) => new Date(a).getTime() - new Date(b).getTime())) {
data.push({
x: i,
@@ -61,8 +67,14 @@ async function renderChart() {
const color = defaultStore.state.darkMode ? '#b4e900' : '#86b300';
- // 視覚上の分かりやすさのため上から最も大きい3つの値の平均を最大値とする
- const max = raw.map(x => x.users).slice().sort((a, b) => b - a).slice(0, 3).reduce((a, b) => a + b, 0) / 3;
+ const getYYYYMMDD = (date: Date) => {
+ const y = date.getFullYear().toString().padStart(2, '0');
+ const m = (date.getMonth() + 1).toString().padStart(2, '0');
+ const d = date.getDate().toString().padStart(2, '0');
+ return `${y}/${m}/${d}`;
+ };
+
+ const max = (createdAt: string) => raw.find(x => x.createdAt === createdAt)!.users;
const marginEachCell = 12;
@@ -78,7 +90,7 @@ async function renderChart() {
borderRadius: 3,
backgroundColor(c) {
const value = c.dataset.data[c.dataIndex].v;
- const a = value / max;
+ const a = value / max(c.dataset.data[c.dataIndex].y);
return alpha(color, a);
},
fill: true,
@@ -115,7 +127,7 @@ async function renderChart() {
maxRotation: 0,
autoSkipPadding: 0,
autoSkip: false,
- callback: (value, index, values) => value + 1,
+ callback: (value, index, values) => value,
},
},
y: {
@@ -150,11 +162,11 @@ async function renderChart() {
callbacks: {
title(context) {
const v = context[0].dataset.data[context[0].dataIndex];
- return v.d;
+ return getYYYYMMDD(new Date(new Date(v.y).getTime() + (v.x * 86400000)));
},
label(context) {
const v = context.dataset.data[context.dataIndex];
- return ['Active: ' + v.v];
+ return [`Active: ${v.v} (${Math.round((v.v / max(v.y)) * 100)}%)`];
},
},
//mode: 'index',
diff --git a/packages/frontend/src/components/MkSample.vue b/packages/frontend/src/components/MkSample.vue
index 7a3bc208880d..922b862b4702 100644
--- a/packages/frontend/src/components/MkSample.vue
+++ b/packages/frontend/src/components/MkSample.vue
@@ -87,7 +87,7 @@ export default defineComponent({
},
async openDrive() {
- os.selectDriveFile();
+ os.selectDriveFile(false);
},
async selectUser() {
diff --git a/packages/frontend/src/components/MkSignup.vue b/packages/frontend/src/components/MkSignup.vue
deleted file mode 100644
index 30279148f800..000000000000
--- a/packages/frontend/src/components/MkSignup.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
new file mode 100644
index 000000000000..0e8bdb321e24
--- /dev/null
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -0,0 +1,272 @@
+
+;
+export const ServerRulesOnly = {
+ ...Empty,
+ args: {
+ ...Empty.args,
+ serverRules: [
+ 'ルール',
+ ],
+ },
+} satisfies StoryObj;
+export const TOSOnly = {
+ ...Empty,
+ args: {
+ ...Empty.args,
+ tosUrl: 'https://example.com/tos',
+ },
+} satisfies StoryObj;
+export const ServerRulesAndTOS = {
+ ...Empty,
+ args: {
+ ...Empty.args,
+ serverRules: ServerRulesOnly.args.serverRules,
+ tosUrl: TOSOnly.args.tosUrl,
+ },
+} satisfies StoryObj;
diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue
new file mode 100644
index 000000000000..6da81c3bcb08
--- /dev/null
+++ b/packages/frontend/src/components/MkSignupDialog.rules.vue
@@ -0,0 +1,124 @@
+
+
{{ i18n.ts.signup }}
-
-
+
+
+
diff --git a/packages/frontend/src/components/MkSwitch.vue b/packages/frontend/src/components/MkSwitch.vue
index 8bb8637dda7e..d9f6716f92d6 100644
--- a/packages/frontend/src/components/MkSwitch.vue
+++ b/packages/frontend/src/components/MkSwitch.vue
@@ -9,7 +9,7 @@
:disabled="disabled"
@keydown.enter="toggle"
>
-
+
diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue
index 5086c1b31950..f560ebcd8a33 100644
--- a/packages/frontend/src/components/MkUserInfo.vue
+++ b/packages/frontend/src/components/MkUserInfo.vue
@@ -1,30 +1,30 @@
-
+
@@ -13,7 +19,7 @@
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 36ec778a14b4..d95f8de311a9 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -12,6 +12,7 @@
-
+
@@ -40,6 +41,7 @@
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSignupDialog.rules.stories.impl.ts b/packages/frontend/src/components/MkSignupDialog.rules.stories.impl.ts
new file mode 100644
index 000000000000..2d9545573002
--- /dev/null
+++ b/packages/frontend/src/components/MkSignupDialog.rules.stories.impl.ts
@@ -0,0 +1,94 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { expect } from '@storybook/jest';
+import { userEvent, waitFor, within } from '@storybook/testing-library';
+import { StoryObj } from '@storybook/vue3';
+import { onBeforeUnmount } from 'vue';
+import MkSignupServerRules from './MkSignupDialog.rules.vue';
+import { i18n } from '@/i18n';
+import { instance } from '@/instance';
+export const Empty = {
+ render(args) {
+ return {
+ components: {
+ MkSignupServerRules,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index 790c1e94df43..17f8b864254a 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -1,24 +1,40 @@
+
+
+
+
+ {{ i18n.ts.serverRules }}
+
+
+ {{ i18n.ts.agree }}
+
+
+
+ {{ i18n.ts.termsOfService }}
+
+
+ {{ i18n.ts.termsOfService }}
+
+ {{ i18n.ts.agree }}
+
+
+
+ {{ i18n.ts.basicNotesBeforeCreateAccount }}
+
+
+ {{ i18n.ts.basicNotesBeforeCreateAccount }}
+
+ {{ i18n.ts.agree }}
+
+
+
+
+ {{ i18n.ts.invitationRequiredToRegister }}
+
+
+ {{ i18n.ts.pleaseConfirmBelowBeforeSignup }}
+
+ -
+
- +
{{ i18n.ts.pleaseAgreeAllToContinue }}
+
+
+
+
+
+
+
-
-
-
+
+
+
- {{ i18n.ts.followsYou }}
-
+ {{ i18n.ts.followsYou }}
+
-
-
{{ i18n.ts.notes }}
{{ user.notesCount }} +
+
+ {{ i18n.ts._role._options.alwaysMarkNsfw }}
+
+ {{ i18n.ts._role.useBaseValue }}
+ {{ role.policies.alwaysMarkNsfw.value ? i18n.ts.yes : i18n.ts.no }}
+
+
+
+
{{ i18n.ts._role._options.pinMax }}
@@ -409,6 +433,7 @@ import { watch } from 'vue';
import { throttle } from 'throttle-debounce';
import RolesEditorFormula from './RolesEditorFormula.vue';
import MkInput from '@/components/MkInput.vue';
+import MkColorInput from '@/components/MkColorInput.vue';
import MkSelect from '@/components/MkSelect.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkFolder from '@/components/MkFolder.vue';
@@ -475,6 +500,7 @@ const save = throttle(100, () => {
isAdministrator: role.isAdministrator,
isModerator: role.isModerator,
isPublic: role.isPublic,
+ isExplorable: role.isExplorable,
asBadge: role.asBadge,
canEditMembersByModerator: role.canEditMembersByModerator,
policies: role.policies,
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index a1e467edbdf0..e8dbe1c5f0ed 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -75,6 +75,14 @@
+
+ {{ i18n.ts._role._options.alwaysMarkNsfw }}
+ {{ policies.alwaysMarkNsfw ? i18n.ts.yes : i18n.ts.no }}
+
+ {{ i18n.ts.enable }}
+
+
+
{{ i18n.ts._role._options.pinMax }}
{{ policies.pinLimit }}
diff --git a/packages/frontend/src/pages/admin/server-rules.vue b/packages/frontend/src/pages/admin/server-rules.vue
new file mode 100644
index 000000000000..85781c0bd00c
--- /dev/null
+++ b/packages/frontend/src/pages/admin/server-rules.vue
@@ -0,0 +1,128 @@
+
+
-
- {{ i18n.ts.tosUrl }}
-
-
{{ i18n.ts.maintainerName }}
@@ -36,14 +31,6 @@
+
- {{ i18n.ts.notes }}
{{ user.notesCount }}
-
@@ -40,99 +40,99 @@ defineProps<{
}>();
-
diff --git a/packages/frontend/src/components/MkUserList.vue b/packages/frontend/src/components/MkUserList.vue
index 51eb426e97d2..3571ca84d9c2 100644
--- a/packages/frontend/src/components/MkUserList.vue
+++ b/packages/frontend/src/components/MkUserList.vue
@@ -8,7 +8,7 @@
- {{ i18n.ts.following }}
{{ user.followingCount }} +
+
- {{ i18n.ts.following }}
{{ user.followingCount }}
-
- {{ i18n.ts.followers }}
{{ user.followersCount }} +
+
{{ i18n.ts.followers }}
{{ user.followersCount }}
+
;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
new file mode 100644
index 000000000000..adb8d4334965
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
@@ -0,0 +1,101 @@
+
+;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.vue b/packages/frontend/src/components/MkUserSetupDialog.User.vue
new file mode 100644
index 000000000000..d66f34f1650b
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.vue
@@ -0,0 +1,101 @@
+
+;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
new file mode 100644
index 000000000000..096b88c309a5
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -0,0 +1,145 @@
+
+
+ {{ i18n.ts.initialAccountSetting }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue
new file mode 100644
index 000000000000..fb705786cf73
--- /dev/null
+++ b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue
@@ -0,0 +1,157 @@
+
+
-
+
{{ i18n.ts.selectWidget }}
- {{ i18n.ts.add }}
+ {{ i18n.ts.add }}
{{ i18n.ts.close }}
- ;
+export const Long = {
+ ...Default,
+ args: {
+ ...Default.args,
+ user: {
+ ...userDetailed(),
+ username: 'the_quick_brown_fox_jumped_over_the_lazy_dog',
+ host: 'misskey.example',
+ },
+ },
+ decorators: [
+ () => ({
+ template: ';
+export const VeryLong = {
+ ...Default,
+ args: {
+ ...Default.args,
+ user: {
+ ...userDetailed(),
+ username: '2c7cc62a697ea3a7826521f3fd34f0cb273693cbe5e9310f35449f43622a5cdc',
+ host: 'the.quick.brown.fox.jumped.over.the.lazy.dog.very.long.hostname.nostr.example',
+ },
+ },
+ decorators: [
+ () => ({
+ template: ';
diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue
index 2b9f892fc6d0..59358aef70c0 100644
--- a/packages/frontend/src/components/global/MkAcct.vue
+++ b/packages/frontend/src/components/global/MkAcct.vue
@@ -1,5 +1,9 @@
-
+
+ @{{ user.username }}
+ @{{ user.host || host }}
+
+
@{{ user.username }}
@{{ user.host || host }}
@@ -8,6 +12,7 @@
+
+
+
+
diff --git a/packages/frontend/src/components/global/MkError.stories.impl.ts b/packages/frontend/src/components/global/MkError.stories.impl.ts
index 60ac5c91ad72..8252a4d76eb9 100644
--- a/packages/frontend/src/components/global/MkError.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkError.stories.impl.ts
@@ -1,4 +1,5 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { action } from '@storybook/addon-actions';
import { expect } from '@storybook/jest';
import { waitFor } from '@storybook/testing-library';
import { StoryObj } from '@storybook/vue3';
@@ -20,14 +21,21 @@ export const Default = {
...this.args,
};
},
+ events() {
+ return {
+ retry: action('retry'),
+ };
+ },
},
- template: '
@@ -41,17 +57,30 @@ import { fetchInstance } from '@/instance';
import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata';
import MkButton from '@/components/MkButton.vue';
+import FormLink from '@/components/form/link.vue';
+let enableRegistration: boolean = $ref(false);
+let emailRequiredForSignup: boolean = $ref(false);
let sensitiveWords: string = $ref('');
+let preservedUsernames: string = $ref('');
+let tosUrl: string | null = $ref(null);
async function init() {
const meta = await os.api('admin/meta');
+ enableRegistration = !meta.disableRegistration;
+ emailRequiredForSignup = meta.emailRequiredForSignup;
sensitiveWords = meta.sensitiveWords.join('\n');
+ preservedUsernames = meta.preservedUsernames.join('\n');
+ tosUrl = meta.tosUrl;
}
function save() {
os.apiWithDialog('admin/update-meta', {
+ disableRegistration: !enableRegistration,
+ emailRequiredForSignup,
+ tosUrl,
sensitiveWords: sensitiveWords.split('\n'),
+ preservedUsernames: preservedUsernames.split('\n'),
}).then(() => {
fetchInstance();
});
diff --git a/packages/frontend/src/pages/admin/roles.edit.vue b/packages/frontend/src/pages/admin/roles.edit.vue
index b1aa03f1f74f..c211ef2f055f 100644
--- a/packages/frontend/src/pages/admin/roles.edit.vue
+++ b/packages/frontend/src/pages/admin/roles.edit.vue
@@ -54,6 +54,7 @@ if (props.id) {
target: 'manual',
condFormula: { id: uuid(), type: 'isRemote' },
isPublic: false,
+ isExplorable: false,
asBadge: false,
canEditMembersByModerator: false,
displayOrder: 0,
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 873ff02feb22..49942c87ce58 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -8,10 +8,9 @@
{{ i18n.ts._role.description }}
-
+
{{ i18n.ts.color }}
- #RRGGBB
-
+
{{ i18n.ts._role.iconUrl }}
@@ -59,6 +58,11 @@
{{ i18n.ts._role.descriptionOfAsBadge }}
+
+ {{ i18n.ts._role.isExplorable }}
+ {{ i18n.ts._role.descriptionOfIsExplorable }}
+
+
{{ i18n.ts._role.policies }}
{{ i18n.ts._role._options.driveCapacity }}
@@ -227,6 +231,26 @@
+
+ {{ i18n.ts._initialAccountSetting.theseSettingsCanEditLater }}
+
+
+ {{ i18n.ts.avatar }}
+
+
+
+ {{ i18n.ts._profile.name }}
+
+
+
+ {{ i18n.ts._profile.description }}
+
+
+ {{ i18n.ts._initialAccountSetting.youCanEditMoreSettingsInSettingsPageLater }}
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts
new file mode 100644
index 000000000000..7413f4884bd5
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts
@@ -0,0 +1,32 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { StoryObj } from '@storybook/vue3';
+import { userDetailed } from '../../.storybook/fakes';
+import MkUserSetupDialog_User from './MkUserSetupDialog.User.vue';
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkUserSetupDialog_User,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+
+ {{ i18n.ts._profile.changeAvatar }}
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
new file mode 100644
index 000000000000..55790602d567
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
@@ -0,0 +1,51 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { StoryObj } from '@storybook/vue3';
+import { rest } from 'msw';
+import { commonHandlers } from '../../.storybook/mocks';
+import { userDetailed } from '../../.storybook/fakes';
+import MkUserSetupDialog from './MkUserSetupDialog.vue';
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkUserSetupDialog,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+
+
+
+
+ {{ i18n.ts.noAccountDescription }}
+
+ {{ i18n.ts.follow }}
+
+{{ i18n.ts.youFollowing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._initialAccountSetting.profileSetting }}
+
+ {{ i18n.ts._initialAccountSetting.accountCreated }}
+ {{ i18n.ts._initialAccountSetting.letsStartAccountSetup }}
+
+
+ {{ i18n.ts.continue }}
+
+
+
+
+
+
+ {{ i18n.ts.continue }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.continue }}
+
+ {{ i18n.ts.pushNotification }}
+ {{ i18n.t('_initialAccountSetting.pushNotificationDescription', { name: instance.name ?? host }) }}
+
+
+
+
+
+
+
+
+ {{ instance.name ?? host }}
+
+ {{ i18n.ts.help }}
+
+
+ {{ i18n.ts.close }}
+
+ {{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}
+ {{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
new file mode 100644
index 000000000000..62267681273b
--- /dev/null
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue
index d074fdd1506b..33e594acd80b 100644
--- a/packages/frontend/src/components/MkWidgets.vue
+++ b/packages/frontend/src/components/MkWidgets.vue
@@ -2,11 +2,11 @@
+ ![]()
+
+
+
+
+ + + + {{ instanceName }} +
+
+
+
+
+
+ {{ i18n.ts.invitationRequiredToRegister }}
+
+
+ {{ i18n.ts.joinThisServer }}
+ {{ i18n.ts.exploreOtherServers }}
+ {{ i18n.ts.login }}
+
+
+
+
+
+ {{ i18n.ts.users }}
+
+
+ {{ i18n.ts.notes }}
+
+
+ {{ i18n.ts.letsLookAtTimeline }}
+
+
+
+
+
+
@@ -541,7 +541,7 @@ defineExpose({
flex: 1;
overflow: auto;
background: var(--panel);
- container-type: inline-size;
+ container-type: size;
}
$handleSize: 8px;
diff --git a/packages/frontend/src/components/global/MkAcct.stories.impl.ts b/packages/frontend/src/components/global/MkAcct.stories.impl.ts
index d5e3fc356829..9d5fd3947dc5 100644
--- a/packages/frontend/src/components/global/MkAcct.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkAcct.stories.impl.ts
@@ -41,3 +41,35 @@ export const Detail = {
detail: true,
},
} satisfies StoryObj
-
-
+
+ {{ i18n.ts.enableRegistration }}
+
+
+
+ {{ i18n.ts.emailRequiredForSignup }}
+
+
+ {{ i18n.ts.serverRules }}
+
+
+
+ {{ i18n.ts.tosUrl }}
+
+
+
+ {{ i18n.ts.preservedUsernames }}
+ {{ i18n.ts.preservedUsernamesDescription }}
+
+
+
+ {{ i18n.ts.sensitiveWords }}
+ {{ i18n.ts.sensitiveWordsDescription }}
+
-
- {{ i18n.ts.sensitiveWords }}
- {{ i18n.ts.sensitiveWordsDescription }}
-
-
-
@@ -206,7 +210,7 @@
-
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 65e64930d526..7ec3c381f3a3 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -13,11 +13,6 @@
{{ i18n.ts.instanceDescription }}
-
+
+
+
+
+ {{ i18n.ts._serverRules.description }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.add }}
+ {{ i18n.ts.save }}
+
+
-
- {{ i18n.ts.enableRegistration }}
-
-
-
- {{ i18n.ts.emailRequiredForSignup }}
-
-
{{ i18n.ts.enableChartsForRemoteUser }}
@@ -73,11 +60,9 @@
{{ i18n.ts.backgroundImageUrl }}
-
-
+
{{ i18n.ts.themeColor }}
- #RRGGBB
-
+
{{ i18n.ts.instanceDefaultLightTheme }}
@@ -166,10 +151,10 @@ import { fetchInstance } from '@/instance';
import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata';
import MkButton from '@/components/MkButton.vue';
+import MkColorInput from '@/components/MkColorInput.vue';
let name: string | null = $ref(null);
let description: string | null = $ref(null);
-let tosUrl: string | null = $ref(null);
let maintainerName: string | null = $ref(null);
let maintainerEmail: string | null = $ref(null);
let iconUrl: string | null = $ref(null);
@@ -180,8 +165,6 @@ let defaultLightTheme: any = $ref(null);
let defaultDarkTheme: any = $ref(null);
let pinnedUsers: string = $ref('');
let cacheRemoteFiles: boolean = $ref(false);
-let enableRegistration: boolean = $ref(false);
-let emailRequiredForSignup: boolean = $ref(false);
let enableServiceWorker: boolean = $ref(false);
let enableChartsForRemoteUser: boolean = $ref(false);
let enableChartsForFederatedInstances: boolean = $ref(false);
@@ -194,7 +177,6 @@ async function init() {
const meta = await os.api('admin/meta');
name = meta.name;
description = meta.description;
- tosUrl = meta.tosUrl;
iconUrl = meta.iconUrl;
bannerUrl = meta.bannerUrl;
backgroundImageUrl = meta.backgroundImageUrl;
@@ -205,8 +187,6 @@ async function init() {
maintainerEmail = meta.maintainerEmail;
pinnedUsers = meta.pinnedUsers.join('\n');
cacheRemoteFiles = meta.cacheRemoteFiles;
- enableRegistration = !meta.disableRegistration;
- emailRequiredForSignup = meta.emailRequiredForSignup;
enableServiceWorker = meta.enableServiceWorker;
enableChartsForRemoteUser = meta.enableChartsForRemoteUser;
enableChartsForFederatedInstances = meta.enableChartsForFederatedInstances;
@@ -220,7 +200,6 @@ function save() {
os.apiWithDialog('admin/update-meta', {
name,
description,
- tosUrl,
iconUrl,
bannerUrl,
backgroundImageUrl,
@@ -231,8 +210,6 @@ function save() {
maintainerEmail,
pinnedUsers: pinnedUsers.split('\n'),
cacheRemoteFiles,
- disableRegistration: !enableRegistration,
- emailRequiredForSignup,
enableServiceWorker,
enableChartsForRemoteUser,
enableChartsForFederatedInstances,
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 9cb440d2bb5c..a74ab40473a5 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -11,6 +11,10 @@
{{ i18n.ts.description }}
+
+ {{ i18n.ts.color }}
+
+
{{ i18n.ts._channel.setBanner }}
(null);
let bannerId = $ref(null);
+let color = $ref('#000');
const pinnedNotes = ref([]);
watch(() => bannerId, async () => {
@@ -101,6 +108,7 @@ async function fetchChannel() {
pinnedNotes.value = channel.pinnedNoteIds.map(id => ({
id,
}));
+ color = channel.color;
}
fetchChannel();
@@ -128,6 +136,7 @@ function save() {
description: description,
bannerId: bannerId,
pinnedNoteIds: pinnedNotes.value.map(x => x.id),
+ color: color,
};
if (props.channelId) {
@@ -143,6 +152,23 @@ function save() {
}
}
+async function archive() {
+ const { canceled } = await os.confirm({
+ type: 'warning',
+ title: i18n.t('channelArchiveConfirmTitle', { name: name }),
+ text: i18n.ts.channelArchiveConfirmDescription,
+ });
+
+ if (canceled) return;
+
+ os.api('channels/update', {
+ channelId: props.channelId,
+ isArchived: true,
+ }).then(() => {
+ os.success();
+ });
+}
+
function setBannerImage(evt) {
selectFile(evt.currentTarget ?? evt.target, null).then(file => {
bannerId = file.id;
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 437c1fae31b9..af1b4d2056ee 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -28,6 +28,8 @@
@@ -42,8 +46,9 @@
-
+
@@ -55,6 +60,7 @@ import { computed, ref, watch, defineAsyncComponent } from 'vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkButton from '@/components/MkButton.vue';
import MkInput from '@/components/MkInput.vue';
+import MkColorInput from '@/components/MkColorInput.vue';
import { selectFile } from '@/scripts/select-file';
import * as os from '@/os';
import { useRouter } from '@/router';
@@ -75,6 +81,7 @@ let name = $ref(null);
let description = $ref(null);
let bannerUrl = $ref
+ {{ i18n.ts.thisChannelArchived }}
+
+
+
+
+
+
+
+ {{ i18n.ts.search }}
+
+
@@ -63,8 +76,10 @@ import { deviceKind } from '@/scripts/device-kind';
import MkNotes from '@/components/MkNotes.vue';
import { url } from '@/config';
import MkButton from '@/components/MkButton.vue';
+import MkInput from '@/components/MkInput.vue';
import { defaultStore } from '@/store';
import MkNote from '@/components/MkNote.vue';
+import MkInfo from '@/components/MkInfo.vue';
import MkFoldableSection from '@/components/MkFoldableSection.vue';
const router = useRouter();
@@ -76,6 +91,8 @@ const props = defineProps<{
let tab = $ref('timeline');
let channel = $ref(null);
let favorited = $ref(false);
+let searchQuery = $ref('');
+let searchPagination = $ref();
const featuredPagination = $computed(() => ({
endpoint: 'notes/featured' as const,
limit: 10,
@@ -123,6 +140,21 @@ async function unfavorite() {
});
}
+async function search() {
+ const query = searchQuery.toString().trim();
+
+ if (query == null) return;
+
+ searchPagination = {
+ endpoint: 'notes/search',
+ limit: 10,
+ params: {
+ query: searchQuery,
+ channelId: channel.id,
+ },
+ };
+}
+
const headerActions = $computed(() => {
if (channel && channel.userId) {
const share = {
@@ -160,6 +192,10 @@ const headerTabs = $computed(() => [{
key: 'featured',
title: i18n.ts.featured,
icon: 'ti ti-bolt',
+}, {
+ key: 'search',
+ title: i18n.ts.search,
+ icon: 'ti ti-search',
}]);
definePageMetadata(computed(() => channel ? {
@@ -170,7 +206,7 @@ definePageMetadata(computed(() => channel ? {
diff --git a/packages/frontend/src/pages/settings/account-info.vue b/packages/frontend/src/pages/settings/account-stats.vue
similarity index 94%
rename from packages/frontend/src/pages/settings/account-info.vue
rename to packages/frontend/src/pages/settings/account-stats.vue
index 584808b0b4cd..a0f1541b4016 100644
--- a/packages/frontend/src/pages/settings/account-info.vue
+++ b/packages/frontend/src/pages/settings/account-stats.vue
@@ -1,18 +1,6 @@
-
- ID
- {{ $i.id }}
-
-
-
-
- {{ i18n.ts.registeredDate }}
-
-
-
-
+
{{ i18n.ts.statistics }}
{{ i18n.ts.notesCount }}
diff --git a/packages/frontend/src/pages/settings/delete-account.vue b/packages/frontend/src/pages/settings/delete-account.vue
deleted file mode 100644
index c6e79165c5ae..000000000000
--- a/packages/frontend/src/pages/settings/delete-account.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-
-{{ i18n.ts.showFixedPostForm }}
- {{ i18n.ts.showFixedPostFormInChannel }}
+
+
- {{ i18n.ts.behavior }}
+ {{ i18n.ts.displayOfNote }}
- {{ i18n.ts.whenServerDisconnected }}
-
-
-
+
+
+ {{ i18n.ts.instanceTicker }}
+
+
+
+
+
+ {{ i18n.ts.nsfw }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.notificationDisplay }}
+
+
@@ -46,22 +93,15 @@
@@ -84,27 +124,29 @@
- {{ i18n.ts.aiChanMode }}
-
-
-
- {{ i18n.ts.instanceTicker }}
-
-
-
-
+ {{ i18n.ts.behavior }}
-
- {{ i18n.ts.nsfw }}
-
-
-
-
+
- {{ i18n.ts.numberOfPageCache }}
- {{ i18n.ts.numberOfPageCacheDescription }}
-
+
+ {{ i18n.ts.aiChanMode }}
+
{{ i18n.ts.deck }}
@@ -160,6 +202,7 @@ const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('disableShowingAnimatedImages'));
const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
+const enableDataSaverMode = computed(defaultStore.makeGetterSetter('enableDataSaverMode'));
const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
const showFixedPostForm = computed(defaultStore.makeGetterSetter('showFixedPostForm'));
@@ -170,6 +213,9 @@ const enableInfiniteScroll = computed(defaultStore.makeGetterSetter('enableInfin
const useReactionPickerForContextMenu = computed(defaultStore.makeGetterSetter('useReactionPickerForContextMenu'));
const squareAvatars = computed(defaultStore.makeGetterSetter('squareAvatars'));
const aiChanMode = computed(defaultStore.makeGetterSetter('aiChanMode'));
+const mediaListWithOneImageAppearance = computed(defaultStore.makeGetterSetter('mediaListWithOneImageAppearance'));
+const notificationPosition = computed(defaultStore.makeGetterSetter('notificationPosition'));
+const notificationStackAxis = computed(defaultStore.makeGetterSetter('notificationStackAxis'));
watch(lang, () => {
miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/pages/settings/import-export.vue b/packages/frontend/src/pages/settings/import-export.vue
index a8274f560139..89b4104020f2 100644
--- a/packages/frontend/src/pages/settings/import-export.vue
+++ b/packages/frontend/src/pages/settings/import-export.vue
@@ -32,7 +32,7 @@
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -47,7 +47,7 @@
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -62,7 +62,7 @@
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -77,13 +77,28 @@
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
+
+ {{ i18n.ts.antennas }}
+
@@ -97,6 +112,7 @@ import * as os from '@/os';
import { selectFile } from '@/scripts/select-file';
import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata';
+import { $i } from '@/account';
const excludeMutingUsers = ref(false);
const excludeInactiveUsers = ref(false);
@@ -150,6 +166,10 @@ const exportMuting = () => {
os.api('i/export-mute', {}).then(onExportSuccess).catch(onError);
};
+const exportAntennas = () => {
+ os.api('i/export-antennas', {}).then(onExportSuccess).catch(onError);
+};
+
const importFollowing = async (ev) => {
const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('i/import-following', { fileId: file.id }).then(onImportSuccess).catch(onError);
@@ -170,6 +190,11 @@ const importBlocking = async (ev) => {
os.api('i/import-blocking', { fileId: file.id }).then(onImportSuccess).catch(onError);
};
+const importAntennas = async (ev) => {
+ const file = await selectFile(ev.currentTarget ?? ev.target);
+ os.api('i/import-antennas', { fileId: file.id }).then(onImportSuccess).catch(onError);
+};
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 17af7417fda4..34a962ef4cf8 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -164,12 +164,12 @@ const menuDef = computed(() => [{
text: i18n.ts.importAndExport,
to: '/settings/import-export',
active: currentPage?.route.name === 'import-export',
- }, /*{
+ }, {
icon: 'ti ti-plane',
- text: i18n.ts.accountMigration,
+ text: `${i18n.ts.accountMigration} (${i18n.ts.experimental})`,
to: '/settings/migration',
active: currentPage?.route.name === 'migration',
- },*/ {
+ }, {
icon: 'ti ti-dots',
text: i18n.ts.other,
to: '/settings/other',
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
index 2ef8af7481d1..541992875e5b 100644
--- a/packages/frontend/src/pages/settings/migration.vue
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -1,63 +1,121 @@
- {{ i18n.ts._accountDelete.mayTakeTime }}
- {{ i18n.ts._accountDelete.sendEmail }}
- {{ i18n.ts._accountDelete.requestAccountDelete }}
- {{ i18n.ts._accountDelete.inProgress }}
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index d3fb422e01d4..73c2b2e6040e 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -119,6 +119,13 @@ function saveProfile() {
os.api('i/update', {
alwaysMarkNsfw: !!alwaysMarkNsfw,
autoSensitive: !!autoSensitive,
+ }).catch(err => {
+ os.alert({
+ type: 'error',
+ title: i18n.ts.error,
+ text: err.message,
+ });
+ alwaysMarkNsfw = true;
});
}
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 904fd3f95291..ba0f3274fc82 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -20,24 +20,71 @@
-
+ {{ i18n.ts.showFixedPostForm }}
+ {{ i18n.ts.showFixedPostFormInChannel }}
+
+
- {{ i18n.ts.openImageInNewTab }}
- {{ i18n.ts.enableInfiniteScroll }}
+ {{ i18n.ts.showNoteActionsOnlyHover }}
+ {{ i18n.ts.showClipButtonInNoteFooter }}
+ {{ i18n.ts.largeNoteReactions }}
+ {{ i18n.ts.collapseRenotes }}
+ {{ i18n.ts.enableAdvancedMfm }}
+ {{ i18n.ts.enableAnimatedMfm }}
+ {{ i18n.ts.showGapBetweenNotesInTimeline }}
+ {{ i18n.ts.loadRawImages }}
{{ i18n.ts.useReactionPickerForContextMenu }}
-
+
+ {{ i18n.ts.position }}
+
+
+
+
+
+
+
+ {{ i18n.ts.stackAxis }}
+
+
+
- {{ i18n.ts.showNoteActionsOnlyHover }}
- {{ i18n.ts.showClipButtonInNoteFooter }}
- {{ i18n.ts.largeNoteReactions }}
- {{ i18n.ts.collapseRenotes }}
- {{ i18n.ts.enableAdvancedMfm }}
- {{ i18n.ts.enableAnimatedMfm }}
{{ i18n.ts.reduceUiAnimation }}
{{ i18n.ts.useBlurEffect }}
{{ i18n.ts.useBlurEffectForModal }}
- {{ i18n.ts.showGapBetweenNotesInTimeline }}
- {{ i18n.ts.loadRawImages }}
{{ i18n.ts.disableShowingAnimatedImages }}
{{ i18n.ts.squareAvatars }}
{{ i18n.ts.useSystemFont }}
{{ i18n.ts.disableDrawer }}
{{ i18n.ts.forceShowAds }}
+ {{ i18n.ts.dataSaver }}
+
+ {{ i18n.ts.whenServerDisconnected }}
+
+
+
+
+
+ {{ i18n.ts.numberOfPageCache }}
+ {{ i18n.ts.numberOfPageCacheDescription }}
+
+
+
-
+ {{ i18n.ts.openImageInNewTab }}
+ {{ i18n.ts.enableInfiniteScroll }}
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
-
+
+ {{ i18n.ts.thisIsExperimentalFeature }}
+
+
+
+ {{ i18n.ts._accountMigration.moveFrom }}
+ {{ i18n.ts._accountMigration.moveFromSub }}
+
+
+
+
+
{{ i18n.ts._accountMigration.moveTo }}
-
-
- {{ i18n.ts._accountMigration.moveToLabel }}
-
-
- {{ i18n.ts._accountMigration.moveAccountDescription }}
-
- {{ i18n.ts._accountMigration.moveFrom }}
-
-
- {{ i18n.ts._accountMigration.moveFromLabel }}
-
-
- {{ i18n.ts._accountMigration.moveFromDescription }}
+
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 9f13f7a1dd33..1bf4cdc99ae4 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -3,7 +3,7 @@
+
+ {{ i18n.ts._accountMigration.moveFromDescription }}
+
+
+
+ {{ i18n.ts.add }}
+ {{ i18n.ts.save }}
+
+
+
+
+ {{ i18n.t('_accountMigration.moveFromLabel', { n: i + 1 }) }}
+
+
+
+ {{ i18n.ts._accountMigration.moveAccountDescription }}
+
+
+ {{ i18n.ts._accountMigration.moveAccountHowTo }}
+ {{ i18n.ts._accountMigration.moveCannotBeUndone }}
+
+
+
+ {{ i18n.ts._accountMigration.moveToLabel }}
+
+
+ {{ i18n.ts._accountMigration.startMigration }}
+
+
+
+ {{ i18n.ts._accountMigration.postMigrationNote }}
+ {{ i18n.ts._accountMigration.movedAndCannotBeUndone }}
+
+
{{ i18n.ts._accountMigration.movedTo }}
+
-
+
-
{{ i18n.ts.followsYou }}
@@ -45,6 +48,25 @@
{{ role.name }}
@@ -21,6 +21,9 @@
+
+
+ Moderation note
+
+
+
+ Add moderation note
+
+
+
+
+
-
-
-
-
-
-
diff --git a/packages/frontend/src/pages/welcome.setup.vue b/packages/frontend/src/pages/welcome.setup.vue
index 212d156a8349..7728d97a6554 100644
--- a/packages/frontend/src/pages/welcome.setup.vue
+++ b/packages/frontend/src/pages/welcome.setup.vue
@@ -1,8 +1,11 @@
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
{{ instanceName }}
-
-
-
-
-
-
- {{ i18n.ts.signup }}
- {{ i18n.ts.login }}
-
-
-
- {{ onlineUsersCount }}
-
-
-
-
-
- {{ number(stats.originalUsersCount) }}
-
-
- {{ number(stats.originalNotesCount) }}
-
-
-