+
{{ i18n.ts.continue }}
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index f240e6dc46..4f75a36fbe 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
ref="dialog"
:width="500"
:height="600"
- @close="dialog?.close()"
+ @close="onClose"
@closed="$emit('closed')"
>
{{ i18n.ts.signup }}
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:leaveToClass="$style.transition_x_leaveTo"
>
- >();
const isAcceptedServerRule = ref(false);
+function onClose() {
+ emit('cancelled');
+ dialog.value?.close();
+}
+
function onSignup(res: Misskey.entities.SignupResponse) {
emit('done', res);
dialog.value?.close();
diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue
index 0d68d02e35..08a78c8d81 100644
--- a/packages/frontend/src/components/global/MkAd.vue
+++ b/packages/frontend/src/components/global/MkAd.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index fe9e1ce088..f06cfffee4 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -26,11 +26,11 @@ import { onMounted, onUnmounted, shallowRef, ref } from 'vue';
import MkModal from './MkModal.vue';
const props = withDefaults(defineProps<{
- withOkButton: boolean;
- withCloseButton: boolean;
- okButtonDisabled: boolean;
- width: number;
- height: number;
+ withOkButton?: boolean;
+ withCloseButton?: boolean;
+ okButtonDisabled?: boolean;
+ width?: number;
+ height?: number;
}>(), {
withOkButton: false,
withCloseButton: true,
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 8bd02000e6..eeadd49936 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -46,7 +46,7 @@ import type { MenuItem } from '@/types/menu.js';
import * as os from '@/os.js';
const props = defineProps<{
- modelValue: string | null;
+ modelValue: string | number | null;
required?: boolean;
readonly?: boolean;
disabled?: boolean;
diff --git a/packages/frontend/src/components/MkSignin.password.vue b/packages/frontend/src/components/MkSignin.password.vue
index 5608122a39..cd003a39df 100644
--- a/packages/frontend/src/components/MkSignin.password.vue
+++ b/packages/frontend/src/components/MkSignin.password.vue
@@ -24,11 +24,11 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+
+
+ {{ i18n.ts.pleaseSelectAccount }}
+
+
+
+ {{ i18n.ts.selectAccount }}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{ name ? i18n.tsx._auth.shareAccess({ name }) : i18n.ts._auth.shareAccessAsk }}
+
+
+ {{ name ? i18n.tsx._auth.permission({ name }) : i18n.ts._auth.permissionAsk }}
+
+
+ -
+
- {{ i18n.ts._permissions[p] }} +
+
+
+
+ {{ i18n.ts._auth.scopeUser }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._auth.accepted }}
+ {{ i18n.ts._auth.pleaseGoBack }}
+
+
+
+
+
+
+
+ {{ i18n.ts._auth.denied }}
+
+
+
+
+
+
+
+ {{ i18n.ts.somethingHappened }}
+
+
+
-
+
-.root {
-
-}
-
.main {
text-align: center;
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 68b98c2ab7..fbbfb6ea61 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -269,6 +269,9 @@ const patronsWithIcon = [{
}, {
name: '如月ユカ',
icon: 'https://assets.misskey-hub.net/patrons/f24a042076a041b6811a2f124eb620ca.jpg',
+}, {
+ name: 'Yatoigawa',
+ icon: 'https://assets.misskey-hub.net/patrons/505e3568885a4a488431a8f22b4553d0.jpg',
}];
const patrons = [
@@ -375,6 +378,8 @@ const patrons = [
'はとぽぷさん',
'100の人 (エスパー・イーシア)',
'ケモナーのケシン',
+ 'こまつぶり',
+ 'まゆつな空高',
];
const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 8a206a2f79..fd15ae1d66 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} {{ i18n.ts.check }}
{{ i18n.ts.noMaintainerInformationWarning }} {{ i18n.ts.configure }}
- {{ i18n.ts.noInquiryUrlWarning }} {{ i18n.ts.configure }}
+ {{ i18n.ts.noInquiryUrlWarning }} {{ i18n.ts.configure }}
{{ i18n.ts.noBotProtectionWarning }} {{ i18n.ts.configure }}
{{ i18n.ts.noEmailServerWarning }} {{ i18n.ts.configure }}
diff --git a/packages/frontend/src/pages/avatar-decoration-edit-dialog.vue b/packages/frontend/src/pages/avatar-decoration-edit-dialog.vue
new file mode 100644
index 0000000000..a834f1c5fd
--- /dev/null
+++ b/packages/frontend/src/pages/avatar-decoration-edit-dialog.vue
@@ -0,0 +1,220 @@
+
+
+
+
+ {{ avatarDecoration.name }}
+ New decoration
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
index b97e7c0eea..a5cafb1678 100644
--- a/packages/frontend/src/pages/avatar-decorations.vue
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -5,92 +5,38 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
+
+
+ {{ i18n.ts.name }}
+
+
+ {{ i18n.ts.imageUrl }}
+
+
+ {{ i18n.ts.description }}
+
+
+ {{ i18n.ts.availableRoles }}
+ {{ rolesThatCanBeUsedThisDecoration.length === 0 ? i18n.ts.all : rolesThatCanBeUsedThisDecoration.length }}
+
+
+ {{ i18n.ts.delete }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.add }}
+
+
+
+
+
+ {{ props.avatarDecoration ? i18n.ts.update : i18n.ts.create }}
+
+
-
- {{ avatarDecoration.name }}
- {{ avatarDecoration.description }}
-
-
-
-
-
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 969aa6bbf7..3b3f41d9b1 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
ref="windowEl"
:initialWidth="400"
:initialHeight="500"
- :canResize="false"
+ :canResize="true"
@close="windowEl.close()"
@closed="$emit('closed')"
>
diff --git a/packages/frontend/src/pages/miauth.vue b/packages/frontend/src/pages/miauth.vue
index ffaf739ed0..e89dd5c4a5 100644
--- a/packages/frontend/src/pages/miauth.vue
+++ b/packages/frontend/src/pages/miauth.vue
@@ -4,95 +4,79 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
-
+
-
-
-
-
-
-
-
- {{ i18n.ts.name }}
-
-
- {{ i18n.ts.description }}
-
-
- {{ i18n.ts.imageUrl }}
-
-
-
-
+
+ {{ avatarDecoration.name }}
+
-
+
-
-
- >();
const exceeded = computed(() => ($i.policies.avatarDecorationLimit - $i.avatarDecorations.length) <= 0);
+const locked = computed(() => props.decoration.roleIdsThatCanBeUsedThisDecoration.length > 0 && !$i.roles.some(r => props.decoration.roleIdsThatCanBeUsedThisDecoration.includes(r.id)));
const angle = ref((props.usingIndex != null ? $i.avatarDecorations[props.usingIndex].angle : null) ?? 0);
const flipH = ref((props.usingIndex != null ? $i.avatarDecorations[props.usingIndex].flipH : null) ?? false);
const offsetX = ref((props.usingIndex != null ? $i.avatarDecorations[props.usingIndex].offsetX : null) ?? 0);
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index e277dfad71..da3d36b31a 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -45,17 +45,89 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.lockdown }}
+ {{ i18n.ts.lockdown }}{{ i18n.ts.beta }}
- {{ i18n.ts._accountSettings.requireSigninToViewContents }}{{ i18n.ts.beta }}
+ {{ i18n.ts._accountSettings.requireSigninToViewContents }}
+
+
+ {{ i18n.ts._accountSettings.makeNotesFollowersOnlyBefore }}
+
+
+
+
+ {{ i18n.ts._accountSettings.makeNotesHiddenBefore }}
+
+
@@ -87,7 +159,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
- {{ i18n.ts._auth.denied }}
-
-
- {{ i18n.ts._auth.callback }}
{{ i18n.ts._auth.pleaseGoBack }}
-
-
+
-
- {{ i18n.tsx._auth.permission({ name }) }}
-{{ i18n.ts._auth.permissionAsk }}
--
-
- {{ i18n.ts._permissions[p] }} -
{{ i18n.tsx._auth.shareAccess({ name }) }}
- {{ i18n.ts._auth.shareAccessAsk }}
-
- {{ i18n.ts.cancel }}
- {{ i18n.ts.accept }}
-
-
+
diff --git a/packages/frontend/src/pages/oauth.vue b/packages/frontend/src/pages/oauth.vue
index 733e34eb2c..8719a769e5 100644
--- a/packages/frontend/src/pages/oauth.vue
+++ b/packages/frontend/src/pages/oauth.vue
@@ -4,40 +4,28 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
+
+
-
+
+
+ {{ i18n.ts._auth.byClickingYouWillBeRedirectedToThisUrl }}
+ {{ callback }}
+
-
-
-
+ {{ i18n.ts._auth.pleaseLogin }}
-
-
@@ -61,6 +61,7 @@ const props = defineProps<{
id: string;
url: string;
name: string;
+ roleIdsThatCanBeUsedThisDecoration: string[];
};
}>();
@@ -83,6 +84,7 @@ const emit = defineEmits<{
const dialog = shallowRef
-
- {{ i18n.tsx._auth.permission({ name }) }}
-{{ i18n.ts._auth.permissionAsk }}
--
-
- {{ i18n.ts._permissions[p] }} -
{{ i18n.tsx._auth.shareAccess({ name }) }}
- {{ i18n.ts._auth.shareAccessAsk }}
-
+
+
diff --git a/packages/frontend/src/pages/settings/accounts.vue b/packages/frontend/src/pages/settings/accounts.vue
index 1bbedb817e..16f0716a12 100644
--- a/packages/frontend/src/pages/settings/accounts.vue
+++ b/packages/frontend/src/pages/settings/accounts.vue
@@ -19,13 +19,13 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue b/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
index 853e536ea3..aa899ac649 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
@@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
-
-
-
-
+ {{ i18n.ts._auth.pleaseLogin }}
-{{ i18n.ts._accountSettings.requireSigninToViewContentsDescription1 }}
{{ i18n.ts._accountSettings.requireSigninToViewContentsDescription2 }}
{{ i18n.ts._accountSettings.requireSigninToViewContentsDescription3 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._accountSettings.makeNotesFollowersOnlyBeforeDescription }}
+ {{ i18n.ts._accountSettings.mayNotEffectForFederatedNotes }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._accountSettings.makeNotesHiddenBeforeDescription }}
+ {{ i18n.ts._accountSettings.mayNotEffectForFederatedNotes }}
+
+