+
@@ -132,6 +133,7 @@ import I18n from '@/components/I18n.vue';
import EmMediaList from '@/components/EmMediaList.vue';
import EmNoteSub from '@/components/EmNoteSub.vue';
import EmNoteSimple from '@/components/EmNoteSimple.vue';
+import EmInstanceTicker from '@/components/EmInstanceTicker.vue';
import EmReactionsViewer from '@/components/EmReactionsViewer.vue';
import EmPoll from '@/components/EmPoll.vue';
import EmA from '@/components/EmA.vue';
diff --git a/packages/frontend-embed/src/components/EmNoteHeader.vue b/packages/frontend-embed/src/components/EmNoteHeader.vue
index e4add9501f..7d0b9bacad 100644
--- a/packages/frontend-embed/src/components/EmNoteHeader.vue
+++ b/packages/frontend-embed/src/components/EmNoteHeader.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend-embed/src/pages/note.vue b/packages/frontend-embed/src/pages/note.vue
index 918583ecc7..6f6c8c0f63 100644
--- a/packages/frontend-embed/src/pages/note.vue
+++ b/packages/frontend-embed/src/pages/note.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
(null);
+const prohibited = ref(false);
+
if (assertServerContext(serverContext, 'note')) {
note.value = serverContext.note;
} else {
@@ -36,6 +38,11 @@ if (assertServerContext(serverContext, 'note')) {
return null;
});
}
+
+if (note.value?.url != null || note.value?.uri != null) {
+ // リモートサーバーのノートは弾く
+ prohibited.value = true;
+}
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 91e90ec99d..0c5c8fd9de 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
bot
- ![]()
+ ![]()
-
@@ -27,6 +27,8 @@ const serverContext = inject(DI.serverContext)!;
const note = ref
+
import { watch, ref, computed } from 'vue';
import * as Misskey from 'misskey-js';
+import type { MenuItem } from '@/types/menu.js';
import { getStaticImageUrl } from '@/scripts/media-proxy.js';
import bytes from '@/filters/bytes.js';
import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
@@ -60,7 +61,6 @@ import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { $i, iAmModerator } from '@/account.js';
-import type { MenuItem } from '@/types/menu.js';
const props = withDefaults(defineProps<{
image: Misskey.entities.DriveFile;
@@ -75,7 +75,6 @@ const props = withDefaults(defineProps<{
});
const hide = ref(true);
-const darkMode = ref(defaultStore.state.darkMode);
const url = computed(() => (props.raw || defaultStore.state.loadRawImages)
? props.image.url
@@ -209,10 +208,19 @@ function showMenu(ev: MouseEvent) {
position: relative;
//box-shadow: 0 0 0 1px var(--divider) inset;
background: var(--bg);
- background-image: linear-gradient(45deg, var(--c) 16.67%, var(--bg) 16.67%, var(--bg) 50%, var(--c) 50%, var(--c) 66.67%, var(--bg) 66.67%, var(--bg) 100%);
background-size: 16px 16px;
}
+html[data-color-scheme=dark] .visible {
+ --c: rgb(255 255 255 / 2%);
+ background-image: linear-gradient(45deg, var(--c) 16.67%, var(--bg) 16.67%, var(--bg) 50%, var(--c) 50%, var(--c) 66.67%, var(--bg) 66.67%, var(--bg) 100%);
+}
+
+html[data-color-scheme=light] .visible {
+ --c: rgb(0 0 0 / 2%);
+ background-image: linear-gradient(45deg, var(--c) 16.67%, var(--bg) 16.67%, var(--bg) 50%, var(--c) 50%, var(--c) 66.67%, var(--bg) 66.67%, var(--bg) 100%);
+}
+
.menu {
display: block;
position: absolute;
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index c0728d56fa..890b99fcc2 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -4,17 +4,22 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
@@ -66,13 +72,15 @@ import { defineAsyncComponent, ref } from 'vue';
import { toUnicode } from 'punycode/';
import * as Misskey from 'misskey-js';
import { supported as webAuthnSupported, get as webAuthnRequest, parseRequestOptionsFromJSON } from '@github/webauthn-json/browser-ponyfill';
+import { SigninWithPasskeyResponse } from 'misskey-js/entities.js';
import { query, extractDomain } from '@@/js/url.js';
+import { host as configHost } from '@@/js/config.js';
+import MkDivider from './MkDivider.vue';
import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
import { showSuspendedDialog } from '@/scripts/show-suspended-dialog.js';
import MkButton from '@/components/MkButton.vue';
import MkInput from '@/components/MkInput.vue';
import MkInfo from '@/components/MkInfo.vue';
-import { host as configHost } from '@@/js/config.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { login } from '@/account.js';
@@ -80,6 +88,7 @@ import { i18n } from '@/i18n.js';
const signing = ref(false);
const user = ref(null);
+const usePasswordLessLogin = ref(true);
const username = ref('');
const password = ref('');
const token = ref('');
@@ -88,6 +97,7 @@ const totpLogin = ref(false);
const isBackupCode = ref(false);
const queryingKey = ref(false);
let credentialRequest: CredentialRequestOptions | null = null;
+const passkey_context = ref('');
const emit = defineEmits<{
(ev: 'login', v: any): void;
@@ -110,8 +120,10 @@ function onUsernameChange(): void {
username: username.value,
}).then(userResponse => {
user.value = userResponse;
+ usePasswordLessLogin.value = userResponse.usePasswordLessLogin;
}, () => {
user.value = null;
+ usePasswordLessLogin.value = true;
});
}
@@ -121,7 +133,7 @@ function onLogin(res: any): Promise | void {
}
}
-async function queryKey(): Promise {
+async function query2FaKey(): Promise {
if (credentialRequest == null) return;
queryingKey.value = true;
await webAuthnRequest(credentialRequest)
@@ -150,6 +162,47 @@ async function queryKey(): Promise {
});
}
+function onPasskeyLogin(): void {
+ signing.value = true;
+ if (webAuthnSupported()) {
+ misskeyApi('signin-with-passkey', {})
+ .then((res: SigninWithPasskeyResponse) => {
+ totpLogin.value = false;
+ signing.value = false;
+ queryingKey.value = true;
+ passkey_context.value = res.context ?? '';
+ credentialRequest = parseRequestOptionsFromJSON({
+ publicKey: res.option,
+ });
+ })
+ .then(() => queryPasskey())
+ .catch(loginFailed);
+ }
+}
+
+async function queryPasskey(): Promise {
+ if (credentialRequest == null) return;
+ queryingKey.value = true;
+ console.log('Waiting passkey auth...');
+ await webAuthnRequest(credentialRequest)
+ .catch((err) => {
+ console.warn('Passkey Auth fail!: ', err);
+ queryingKey.value = false;
+ return Promise.reject(null);
+ }).then(credential => {
+ credentialRequest = null;
+ queryingKey.value = false;
+ signing.value = true;
+ return misskeyApi('signin-with-passkey', {
+ credential: credential.toJSON(),
+ context: passkey_context.value,
+ });
+ }).then((res: SigninWithPasskeyResponse) => {
+ emit('login', res.signinResponse);
+ return onLogin(res.signinResponse);
+ });
+}
+
function onSubmit(): void {
signing.value = true;
if (!totpLogin.value && user.value && user.value.twoFactorEnabled) {
@@ -164,7 +217,7 @@ function onSubmit(): void {
publicKey: res,
});
})
- .then(() => queryKey())
+ .then(() => query2FaKey())
.catch(loginFailed);
} else {
totpLogin.value = true;
@@ -212,6 +265,30 @@ function loginFailed(err: any): void {
});
break;
}
+ case '36b96a7d-b547-412d-aeed-2d611cdc8cdc': {
+ os.alert({
+ type: 'error',
+ title: i18n.ts.loginFailed,
+ text: i18n.ts.unknownWebAuthnKey,
+ });
+ break;
+ }
+ case 'b18c89a7-5b5e-4cec-bb5b-0419f332d430': {
+ os.alert({
+ type: 'error',
+ title: i18n.ts.loginFailed,
+ text: i18n.ts.passkeyVerificationFailed,
+ });
+ break;
+ }
+ case '2d84773e-f7b7-4d0b-8f72-bb69b584c912': {
+ os.alert({
+ type: 'error',
+ title: i18n.ts.loginFailed,
+ text: i18n.ts.passkeyVerificationSucceededButPasswordlessLoginDisabled,
+ });
+ break;
+ }
default: {
console.error(err);
os.alert({
diff --git a/packages/frontend/src/components/MkSigninDialog.vue b/packages/frontend/src/components/MkSigninDialog.vue
index 524c62b4d3..d48780e9de 100644
--- a/packages/frontend/src/components/MkSigninDialog.vue
+++ b/packages/frontend/src/components/MkSigninDialog.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/form/link.vue b/packages/frontend/src/components/form/link.vue
index e76ed9a849..d6585bf4a5 100644
--- a/packages/frontend/src/components/form/link.vue
+++ b/packages/frontend/src/components/form/link.vue
@@ -51,18 +51,18 @@ const props = defineProps<{
width: 100%;
box-sizing: border-box;
padding: 10px 14px;
- background: var(--buttonBg);
+ background: var(--folderHeaderBg);
border-radius: 6px;
font-size: 0.9em;
&:hover {
text-decoration: none;
- background: var(--buttonHoverBg);
+ background: var(--folderHeaderHoverBg);
}
&.active {
color: var(--accent);
- background: var(--buttonHoverBg);
+ background: var(--folderHeaderHoverBg);
}
}
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 960df59485..b481fd590c 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -371,6 +371,7 @@ const patrons = [
'塩キャベツ',
'はとぽぷさん',
'100の人 (エスパー・イーシア)',
+ 'ケモナーのケシン',
];
const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index bd442ccc69..6c8901b10b 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -65,18 +65,18 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.memo }}
-
-
+
{{ i18n.ts.more }}
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index b9e09c8d03..fd37311b21 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -29,8 +29,16 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ announcement.text }}
+
+
+
-
.root {
+ &.center {
+ > .menu {
+ > .item {
+ text-align: center;
+ }
+ }
+ }
+
+ &.big:not(.asDrawer) {
+ > .menu {
+ > .item {
+ padding: 6px 20px;
+ font-size: 1em;
+ line-height: 24px;
+ }
+ }
+ }
+
+ &.asDrawer {
+ max-width: 600px;
+ margin: auto;
+
+ > .menu {
+ padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0;
+ width: 100%;
+ border-radius: 24px;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+
+ > .item {
+ font-size: 1em;
+ padding: 12px 24px;
+
+ &::before {
+ width: calc(100% - 24px);
+ border-radius: 12px;
+ }
+
+ > .icon {
+ margin-right: 14px;
+ width: 24px;
+ }
+ }
+
+ > .divider {
+ margin: 12px 0;
+ }
+ }
+ }
+}
+
+.menu {
padding: 8px 0;
box-sizing: border-box;
max-width: 100vw;
@@ -428,39 +489,6 @@ onBeforeUnmount(() => {
&:focus-visible {
outline: none;
}
-
- &.center {
- > .item {
- text-align: center;
- }
- }
-
- &.asDrawer {
- padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0;
- width: 100%;
- border-radius: 24px;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-
- > .item {
- font-size: 1em;
- padding: 12px 24px;
-
- &::before {
- width: calc(100% - 24px);
- border-radius: 12px;
- }
-
- > .icon {
- margin-right: 14px;
- width: 24px;
- }
- }
-
- > .divider {
- margin: 12px 0;
- }
- }
}
.item {
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index f8032f9b43..c766a33823 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -106,7 +106,7 @@ const zIndex = os.claimZIndex(props.zPriority);
const useSendAnime = ref(false);
const type = computed(() => {
if (props.preferType === 'auto') {
- if (!defaultStore.state.disableDrawer && isTouchUsing && deviceKind === 'smartphone') {
+ if ((defaultStore.state.menuStyle === 'drawer') || (defaultStore.state.menuStyle === 'auto' && isTouchUsing && deviceKind === 'smartphone')) {
return 'drawer';
} else {
return props.src != null ? 'popup' : 'dialog';
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 039393887d..471ffdd896 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -105,11 +105,11 @@ import * as mfm from 'mfm-js';
import * as Misskey from 'misskey-js';
import insertTextAtCursor from 'insert-text-at-cursor';
import { toASCII } from 'punycode/';
+import { host, url } from '@@/js/config.js';
import MkNoteSimple from '@/components/MkNoteSimple.vue';
import MkNotePreview from '@/components/MkNotePreview.vue';
import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
import MkPollEditor, { type PollEditorModelValue } from '@/components/MkPollEditor.vue';
-import { host, url } from '@@/js/config.js';
import { erase, unique } from '@/scripts/array.js';
import { extractMentions } from '@/scripts/extract-mentions.js';
import { formatTimeString } from '@/scripts/format-time-string.js';
@@ -1201,6 +1201,15 @@ defineExpose({
min-height: 75px;
max-height: 150px;
overflow: auto;
+ background-size: auto auto;
+}
+
+html[data-color-scheme=dark] .preview {
+ background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, #0004 5px, #0004 10px);
+}
+
+html[data-color-scheme=light] .preview {
+ background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, #00000005 5px, #00000005 10px);
}
.targetNote {
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 231a6dfcf5..7942a84d66 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@
@{{ host }}
-
+
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
{{ i18n.ts.retry }}
@@ -45,10 +45,6 @@ SPDX-License-Identifier: AGPL-3.0-only
+ {{ i18n.ts.useSecurityKey }}
-{{ i18n.ts.or }}
-
- {{ i18n.ts.password }}
-
-
{{ i18n.ts.token }} ({{ i18n.ts['2fa'] }})
@@ -57,6 +53,16 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}
+
+ {{ i18n.ts.or }}
+
+
+
+ {{ signing ? i18n.ts.loggingIn : i18n.ts.signinWithPasskey }}
+
+
{{ i18n.ts.useSecurityKey }}
+
+
{{ i18n.ts.title }}
@@ -64,16 +72,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._announcement.needConfirmationToRead }}
+
{{ i18n.ts.more }}
@@ -170,7 +172,7 @@ function more() {
loadingMore.value = true;
misskeyApi('admin/announcements/list', {
status: announcementsStatus.value,
- untilId: announcements.value.reduce((acc, announcement) => announcement.id != null ? announcement : acc).id
+ untilId: announcements.value.reduce((acc, announcement) => announcement.id != null ? announcement : acc).id,
}).then(announcementResponse => {
announcements.value = announcements.value.concat(announcementResponse);
loadingMore.value = false;
diff --git a/packages/frontend/src/pages/admin/performance.vue b/packages/frontend/src/pages/admin/performance.vue
index 57f68a2a26..7e0a932f82 100644
--- a/packages/frontend/src/pages/admin/performance.vue
+++ b/packages/frontend/src/pages/admin/performance.vue
@@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.tsx.nUsersRead({ n: announcement.reads }) }}
-
+
{{ i18n.ts.enable }}{{ i18n.ts.modified }}
@@ -54,26 +54,28 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}{{ i18n.ts.modified }}
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}
-
+
+
+ {{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}{{ i18n.ts.modified }}
+ {{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}
+
-
- perLocalUserUserTimelineCacheMax{{ i18n.ts.modified }}
-
+
+ perLocalUserUserTimelineCacheMax{{ i18n.ts.modified }}
+
-
- perRemoteUserUserTimelineCacheMax{{ i18n.ts.modified }}
-
+
+ perRemoteUserUserTimelineCacheMax{{ i18n.ts.modified }}
+
-
- perUserHomeTimelineCacheMax{{ i18n.ts.modified }}
-
+
+ perUserHomeTimelineCacheMax{{ i18n.ts.modified }}
+
-
- perUserListTimelineCacheMax{{ i18n.ts.modified }}
-
+
+ perUserListTimelineCacheMax{{ i18n.ts.modified }}
+
+
@@ -110,7 +112,6 @@ import MkSwitch from '@/components/MkSwitch.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkInput from '@/components/MkInput.vue';
import MkLink from '@/components/MkLink.vue';
-import MkButton from '@/components/MkButton.vue';
import { useForm } from '@/scripts/use-form.js';
import MkFormFooter from '@/components/MkFormFooter.vue';
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 537c86cb14..5207f0e38e 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -169,42 +169,44 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._urlPreviewSetting.enable }}{{ i18n.ts.modified }}
-
- {{ i18n.ts._urlPreviewSetting.requireContentLength }}{{ i18n.ts.modified }}
- {{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}
-
+
+
+ {{ i18n.ts._urlPreviewSetting.requireContentLength }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}
+
-
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }}{{ i18n.ts.modified }}
- {{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}
-
-
-
- {{ i18n.ts._urlPreviewSetting.timeout }}{{ i18n.ts.modified }}
- {{ i18n.ts._urlPreviewSetting.timeoutDescription }}
-
-
-
- {{ i18n.ts._urlPreviewSetting.userAgent }}{{ i18n.ts.modified }}
- {{ i18n.ts._urlPreviewSetting.userAgentDescription }}
-
-
-
-
- {{ i18n.ts._urlPreviewSetting.summaryProxy }}{{ i18n.ts.modified }}
- [{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}
+
+ {{ i18n.ts._urlPreviewSetting.maximumContentLength }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}
-
@@ -230,7 +232,6 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
-
+ {{ i18n.ts._urlPreviewSetting.timeout }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.timeoutDescription }}
+
+
+
+ {{ i18n.ts._urlPreviewSetting.userAgent }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.userAgentDescription }}
+
+
+
+
-
-
- {{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout -
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit -
- {{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired -
- {{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent -
+
+ {{ i18n.ts._urlPreviewSetting.summaryProxy }}{{ i18n.ts.modified }}
+ [{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}
+
+
+
-
+ {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
+
-
+
- {{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout +
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit +
- {{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired +
- {{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent +