+
{
await misskeyApi('i/read-announcement', { announcementId: props.announcement.id });
if ($i) {
- updateAccount({
+ updateAccountPartial({
unreadAnnouncements: $i.unreadAnnouncements.filter((a: { id: string; }) => a.id !== props.announcement.id),
});
}
diff --git a/packages/frontend/src/components/MkAntennaEditor.vue b/packages/frontend/src/components/MkAntennaEditor.vue
index ca8533378b..991935ca4c 100644
--- a/packages/frontend/src/components/MkAntennaEditor.vue
+++ b/packages/frontend/src/components/MkAntennaEditor.vue
@@ -183,7 +183,7 @@ async function deleteAntenna() {
function addUser() {
os.selectUser({ includeSelf: true }).then(user => {
users.value = users.value.trim();
- users.value += '\n@' + Misskey.acct.toString(user as any);
+ users.value += '\n@' + Misskey.acct.toString(user);
users.value = users.value.trim();
});
}
diff --git a/packages/frontend/src/components/MkAuthConfirm.stories.impl.ts b/packages/frontend/src/components/MkAuthConfirm.stories.impl.ts
new file mode 100644
index 0000000000..0adc44e204
--- /dev/null
+++ b/packages/frontend/src/components/MkAuthConfirm.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkAuthConfirm from './MkAuthConfirm.vue';
+void MkAuthConfirm;
diff --git a/packages/frontend/src/components/MkAuthConfirm.vue b/packages/frontend/src/components/MkAuthConfirm.vue
new file mode 100644
index 0000000000..6054ca2fb8
--- /dev/null
+++ b/packages/frontend/src/components/MkAuthConfirm.vue
@@ -0,0 +1,450 @@
+
+
+
+
@@ -117,8 +117,8 @@ async function requestRender() {
sitekey: props.sitekey,
theme: defaultStore.state.darkMode ? 'dark' : 'light',
callback: callback,
- 'expired-callback': callback,
- 'error-callback': callback,
+ 'expired-callback': () => callback(undefined),
+ 'error-callback': () => callback(undefined),
});
} else if (props.provider === 'mcaptcha' && props.instanceUrl && props.sitekey) {
const { default: Widget } = await import('@mcaptcha/vanilla-glue');
diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue
index 99580df5e2..43d7f2c6fc 100644
--- a/packages/frontend/src/components/MkChannelPreview.vue
+++ b/packages/frontend/src/components/MkChannelPreview.vue
@@ -47,11 +47,12 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 31c4afc32a..8b0f44dac2 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -410,7 +410,7 @@ function computeButtonTitle(ev: MouseEvent): void {
elm.title = getEmojiName(emoji);
}
-function chosen(emoji: any, ev?: MouseEvent) {
+function chosen(emoji: string | Misskey.entities.EmojiSimple | UnicodeEmojiDef, ev?: MouseEvent) {
const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
if (el) {
const rect = el.getBoundingClientRect();
@@ -427,7 +427,7 @@ function chosen(emoji: any, ev?: MouseEvent) {
// 最近使った絵文字更新
if (!pinned.value?.includes(key)) {
let recents = defaultStore.state.recentlyUsedEmojis;
- recents = recents.filter((emoji: any) => emoji !== key);
+ recents = recents.filter((emoji) => emoji !== key);
recents.unshift(key);
defaultStore.set('recentlyUsedEmojis', recents.splice(0, 32));
}
diff --git a/packages/frontend/src/components/MkExtensionInstaller.vue b/packages/frontend/src/components/MkExtensionInstaller.vue
index b41604b2c3..d59b20435e 100644
--- a/packages/frontend/src/components/MkExtensionInstaller.vue
+++ b/packages/frontend/src/components/MkExtensionInstaller.vue
@@ -73,7 +73,7 @@ export type Extension = {
author: string;
description?: string;
permissions?: string[];
- config?: Record
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkCaptcha.vue b/packages/frontend/src/components/MkCaptcha.vue
index 82fc89e51c..febbc19f9b 100644
--- a/packages/frontend/src/components/MkCaptcha.vue
+++ b/packages/frontend/src/components/MkCaptcha.vue
@@ -17,7 +17,7 @@ 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 }}
+
+
+Type "ai-chan-kawaii" to pass captcha
-
+
-
+
-
+
@@ -113,6 +113,7 @@ import { toASCII } from 'punycode/';
import { host, url } from '@@/js/config.js';
import { erase, unique } from '@@/js/array.js';
import type { MenuItem } from '@/types/menu.js';
+import type { PostFormProps } from '@/types/post-form.js';
import MkNoteSimple from '@/components/MkNoteSimple.vue';
import MkNotePreview from '@/components/MkNotePreview.vue';
import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
@@ -146,27 +147,11 @@ const $i = signinRequired();
const modal = inject('modal');
-const props = withDefaults(defineProps<{
- reply?: Misskey.entities.Note;
- renote?: Misskey.entities.Note;
- channel?: Misskey.entities.Channel; // TODO
- mention?: Misskey.entities.User;
- specified?: Misskey.entities.UserDetailed;
- initialText?: string;
- initialCw?: string;
- initialVisibility?: (typeof Misskey.noteVisibilities)[number];
- initialFiles?: Misskey.entities.DriveFile[];
- initialLocalOnly?: boolean;
- initialVisibleUsers?: Misskey.entities.UserDetailed[];
- initialNote?: Misskey.entities.Note & {
- isSchedule?: boolean,
- };
- instant?: boolean;
+const props = withDefaults(defineProps{{ maxTextLength - textLength }}
import('vuedraggable').then(x => x.default));
const props = defineProps<{
- modelValue: any[];
+ modelValue: Misskey.entities.DriveFile[];
detachMediaFn?: (id: string) => void;
}>();
const mock = inject('mock', false);
const emit = defineEmits<{
- (ev: 'update:modelValue', value: any[]): void;
+ (ev: 'update:modelValue', value: Misskey.entities.DriveFile[]): void;
(ev: 'detach', id: string): void;
(ev: 'changeSensitive', file: Misskey.entities.DriveFile, isSensitive: boolean): void;
(ev: 'changeName', file: Misskey.entities.DriveFile, newName: string): void;
@@ -113,7 +113,7 @@ async function rename(file) {
});
}
-async function describe(file) {
+async function describe(file: Misskey.entities.DriveFile) {
if (mock) return;
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
index bc5295b0d4..9181b06372 100644
--- a/packages/frontend/src/components/MkPostFormDialog.vue
+++ b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -12,22 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
+
@@ -160,7 +190,7 @@ defineProps<{
}
> span {
- display: initial;
+ display: contents;
> .icon {
display: grid;
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index c0df8e144a..2e096d9639 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -40,11 +40,13 @@ const props = withDefaults(defineProps<{
sound?: boolean;
withRenotes?: boolean;
withReplies?: boolean;
+ withSensitive?: boolean;
onlyFiles?: boolean;
onlyCats?: boolean;
}>(), {
withRenotes: true,
withReplies: false,
+ withSensitive: true,
onlyFiles: false,
onlyCats: false,
});
@@ -55,6 +57,7 @@ const emit = defineEmits<{
}>();
provide('inTimeline', true);
+provide('tl_withSensitive', computed(() => props.withSensitive));
provide('inChannel', computed(() => props.src === 'channel'));
type TimelineQueryType = {
@@ -132,6 +135,12 @@ function connectChannel() {
withFiles: props.onlyFiles ? true : undefined,
withCats: props.onlyCats,
});
+ } else if (props.src === 'bubble') {
+ connection = stream.useChannel('bubbleTimeline', {
+ withRenotes: props.withRenotes,
+ withFiles: props.onlyFiles ? true : undefined,
+ withCats: props.onlyCats,
+ });
} else if (props.src === 'mentions') {
connection = stream.useChannel('main');
connection.on('mention', prepend);
@@ -209,6 +218,13 @@ function updatePaginationQuery() {
withFiles: props.onlyFiles ? true : undefined,
withCats: props.onlyCats,
};
+ } else if (props.src === 'bubble') {
+ endpoint = 'notes/bubble-timeline';
+ query = {
+ withRenotes: props.withRenotes,
+ withFiles: props.onlyFiles ? true : undefined,
+ withCats: props.onlyCats,
+ };
} else if (props.src === 'mentions') {
endpoint = 'notes/mentions';
query = null;
@@ -264,6 +280,9 @@ function refreshEndpointAndChannel() {
// IDが切り替わったら切り替え先のTLを表示させたい
watch(() => [props.list, props.antenna, props.channel, props.role, props.withRenotes], refreshEndpointAndChannel);
+// withSensitiveはクライアントで完結する処理のため、単にリロードするだけでOK
+watch(() => props.withSensitive, reloadTimeline);
+
// 初回表示用
refreshEndpointAndChannel();
diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue
index e229e3643b..bf30772e2d 100644
--- a/packages/frontend/src/components/MkTokenGenerateWindow.vue
+++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:okButtonDisabled="false"
:canClose="false"
@close="dialog?.close()"
- @closed="$emit('closed')"
+ @closed="emit('closed')"
@ok="ok()"
>
{{ title || i18n.ts.generateAccessToken }}
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index f229dc4a17..fd855b0879 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -26,19 +26,32 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
+
+
+
-
-
-
-
-
-
-
+
@@ -21,11 +15,30 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index c6c71d4e28..72255171e3 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -22,7 +22,12 @@ SPDX-License-Identifier: AGPL-3.0-only
}}
-
@@ -60,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts.close }}
+
+
+
+
+
-
+
{{ i18n.ts.close }}
@@ -66,8 +79,13 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.expandTweet }}
+
+ {{ i18n.ts.expandPost }}
+
+
+
+
+ {{ i18n.ts.expandPost }}
@@ -127,10 +145,17 @@ const player = ref({
height: null,
} as SummalyResult['player']);
const playerEnabled = ref(false);
-const tweetId = ref(null);
-const tweetExpanded = ref(props.detail);
const embedId = `embed${Math.random().toString().replace(/\D/, '')}`;
-const tweetHeight = ref(150);
+
+const postExpanded = ref(props.detail);
+const postHeight = ref(150);
+
+const tweetId = ref(null);
+
+const bskyHandleOrDid = ref(null);
+const bskyDid = ref(null);
+const bskyPostRecordKey = ref(null);
+
const unknownUrl = ref(false);
onDeactivated(() => {
@@ -145,6 +170,17 @@ if (requestUrl.hostname === 'twitter.com' || requestUrl.hostname === 'mobile.twi
if (m) tweetId.value = m[1];
}
+if (requestUrl.hostname === 'bsky.app') {
+ const bskyPostPageUrl = requestUrl.pathname.slice(1).split('/');
+ if (bskyPostPageUrl[0] === 'profile' && bskyPostPageUrl[1] && bskyPostPageUrl[2] === 'post' && bskyPostPageUrl[3]) {
+ bskyHandleOrDid.value = bskyPostPageUrl[1];
+ bskyPostRecordKey.value = bskyPostPageUrl[3];
+ if (postExpanded.value) {
+ openBskyEmbed();
+ }
+ }
+}
+
if (requestUrl.hostname === 'music.youtube.com' && requestUrl.pathname.match('^/(?:watch|channel)')) {
requestUrl.hostname = 'www.youtube.com';
}
@@ -181,27 +217,52 @@ window.fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${versatileLa
sensitive.value = info.sensitive ?? false;
});
-function adjustTweetHeight(message: any) {
- if (message.origin !== 'https://platform.twitter.com') return;
- const embed = message.data?.['twttr.embed'];
- if (embed?.method !== 'twttr.private.resize') return;
- if (embed?.id !== embedId) return;
- const height = embed?.params[0]?.height;
- if (height) tweetHeight.value = height;
+async function openBskyEmbed() {
+ if (bskyHandleOrDid.value == null || bskyPostRecordKey.value == null) return;
+ if (bskyDid.value == null) {
+ if (bskyHandleOrDid.value.startsWith('did:')) {
+ bskyDid.value = bskyHandleOrDid.value;
+ } else {
+ // handleで来ている場合はdidに変換
+ const bskyApiRes = await window.fetch(`https://public.api.bsky.app/xrpc/com.atproto.identity.resolveHandle?handle=${bskyHandleOrDid.value}`);
+ if (bskyApiRes.ok) {
+ const bskyApiData = await bskyApiRes.json() as { did: string };
+ bskyDid.value = bskyApiData.did;
+ }
+ }
+ }
+ postExpanded.value = true;
}
function openPlayer(): void {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkYouTubePlayer.vue')), {
url: requestUrl.href,
}, {
- // TODO
+ closed: () => {
+ dispose();
+ },
});
}
-(window as any).addEventListener('message', adjustTweetHeight);
+function adjustSocialsEmbedHeight(message: MessageEvent) {
+ if (message.origin === 'https://platform.twitter.com') {
+ const embed = message.data?.['twttr.embed'];
+ if (embed?.method === 'twttr.private.resize' && embed?.id === embedId) {
+ const height = embed?.params[0]?.height;
+ if (height) postHeight.value = height;
+ }
+ } else if (message.origin === 'https://embed.bsky.app') {
+ if (message.data?.id === embedId) {
+ const height = message.data?.height;
+ if (height) postHeight.value = height;
+ }
+ }
+}
+
+window.addEventListener('message', adjustSocialsEmbedHeight);
onUnmounted(() => {
- (window as any).removeEventListener('message', adjustTweetHeight);
+ window.removeEventListener('message', adjustSocialsEmbedHeight);
});
diff --git a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
index 5e04821ce0..f450fd3291 100644
--- a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
+++ b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
ref="dialog"
:width="400"
@close="dialog?.close()"
- @closed="$emit('closed')"
+ @closed="emit('closed')"
>
:{{ announcement.title }}:
New announcement
@@ -62,9 +62,16 @@ import MkTextarea from '@/components/MkTextarea.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import MkRadios from '@/components/MkRadios.vue';
+type AdminAnnouncementType = Misskey.entities.AdminAnnouncementsCreateRequest & { id: string; }
+
const props = defineProps<{
user: Misskey.entities.User,
- announcement?: Misskey.entities.Announcement,
+ announcement?: Required,
+}>();
+
+const emit = defineEmits<{
+ (ev: 'done', v: { deleted?: boolean; updated?: AdminAnnouncementType; created?: AdminAnnouncementType; }): void,
+ (ev: 'closed'): void
}>();
const dialog = ref | null>(null);
@@ -74,11 +81,6 @@ const icon = ref(props.announcement ? props.announcement.icon : 'info');
const display = ref(props.announcement ? props.announcement.display : 'dialog');
const needConfirmationToRead = ref(props.announcement ? props.announcement.needConfirmationToRead : false);
-const emit = defineEmits<{
- (ev: 'done', v: { deleted?: boolean; updated?: any; created?: any }): void,
- (ev: 'closed'): void
-}>();
-
async function done() {
const params = {
title: title.value,
@@ -88,7 +90,7 @@ async function done() {
display: display.value,
needConfirmationToRead: needConfirmationToRead.value,
userId: props.user.id,
- };
+ } satisfies Misskey.entities.AdminAnnouncementsCreateRequest;
if (props.announcement) {
await os.apiWithDialog('admin/announcements/update', {
diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue
index b9d5c57d2b..8337c8b11d 100644
--- a/packages/frontend/src/components/MkUserSelectDialog.vue
+++ b/packages/frontend/src/components/MkUserSelectDialog.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@click="cancel()"
@close="cancel()"
@ok="ok()"
- @closed="$emit('closed')"
+ @closed="emit('closed')"
>
{{ i18n.ts.selectUser }}
+ {{ i18n.ts._externalNavigationWarning.externalNavigationWarning }}
+
+
@@ -161,6 +181,7 @@ import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/form/link.vue';
import MkLink from '@/components/MkLink.vue';
import MkInfo from '@/components/MkInfo.vue';
+import MkTextarea from '@/components/MkTextarea.vue';
import { defaultStore } from '@/store.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -173,6 +194,7 @@ import { $i } from '@/account.js';
const lang = ref(miLocalStorage.getItem('lang'));
const dataSaver = ref(defaultStore.state.dataSaver);
+const trustedDomains = ref(defaultStore.state.trustedDomains.join('\n'));
function reloadTimeline() {
globalEvents.emit('reloadTimeline');
@@ -200,6 +222,7 @@ const autoLoadMoreConversation = computed(defaultStore.makeGetterSetter('autoLoa
const useAutoTranslate = computed(defaultStore.makeGetterSetter('useAutoTranslate'));
const welcomeBackToast = computed(defaultStore.makeGetterSetter('welcomeBackToast'));
const disableNyaize = computed(defaultStore.makeGetterSetter('disableNyaize'));
+const externalNavigationWarning = computed(defaultStore.makeGetterSetter('externalNavigationWarning'));
watch(lang, () => {
miLocalStorage.setItem('lang', lang.value as string);
@@ -321,12 +344,47 @@ function learnMoreCantUseAutoTranslate() {
});
}
+function removeTrustedDomains() {
+ async function main() {
+ await defaultStore.set('trustedDomains', []);
+
+ // Refresh filtered list to signal to the user how they've been saved
+ trustedDomains.value = '';
+ }
+
+ os.promiseDialog(main());
+}
+
+const trustedDomainsChanged = ref(false);
+
+async function trustedDomainsSave() {
+ async function main() {
+ let domains = trustedDomains.value
+ .trim().split('\n')
+ .map(el => el.trim())
+ .filter(el => el);
+
+ await defaultStore.set('trustedDomains', domains);
+
+ trustedDomainsChanged.value = false;
+
+ // Refresh filtered list to signal to the user how they've been saved
+ trustedDomains.value = domains.join('\n');
+ }
+
+ await os.promiseDialog(main());
+}
+
watch(dataSaver, (to) => {
defaultStore.set('dataSaver', to);
}, {
deep: true,
});
+watch(trustedDomains, () => {
+ trustedDomainsChanged.value = true;
+});
+
const headerActions = computed(() => []);
const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/navbar.vue b/packages/frontend/src/pages/settings/navbar.vue
index dc7fd0439b..8eb9dbef83 100644
--- a/packages/frontend/src/pages/settings/navbar.vue
+++ b/packages/frontend/src/pages/settings/navbar.vue
@@ -178,10 +178,6 @@ function learnMoreBottomNavbar() {
});
}
-watch([menuDisplay, bannerDisplay], async () => {
- await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
-});
-
const headerActions = computed(() => []);
const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/notifications.notification-config.vue b/packages/frontend/src/pages/settings/notifications.notification-config.vue
index c74b325ba5..1116039b37 100644
--- a/packages/frontend/src/pages/settings/notifications.notification-config.vue
+++ b/packages/frontend/src/pages/settings/notifications.notification-config.vue
@@ -6,13 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkUsersTooltip.vue b/packages/frontend/src/components/MkUsersTooltip.vue
index 0c7a78ffa5..d6ec637f81 100644
--- a/packages/frontend/src/components/MkUsersTooltip.vue
+++ b/packages/frontend/src/components/MkUsersTooltip.vue
@@ -16,12 +16,12 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
index 1f24d2996e..33f34a5ffc 100644
--- a/packages/frontend/src/pages/avatar-decorations.vue
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -5,117 +5,78 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
-
- {{ avatarDecoration.name }}
- {{ avatarDecoration.description }}
-
- (null);
+const clip = ref(CTX_CLIP);
const favorited = ref(false);
const pagination = {
endpoint: 'clips/notes' as const,
@@ -64,6 +67,11 @@ const pagination = {
const isOwned = computed(() => $i && clip.value && ($i.id === clip.value.userId));
watch(() => props.clipId, async () => {
+ if (CTX_CLIP && CTX_CLIP.id === props.clipId) {
+ clip.value = CTX_CLIP;
+ return;
+ }
+
clip.value = await misskeyApi('clips/show', {
clipId: props.clipId,
});
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index c701c9b0c1..b437fdfdf7 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -116,7 +116,7 @@ const selectAll = () => {
if (selectedEmojis.value.length > 0) {
selectedEmojis.value = [];
} else {
- selectedEmojis.value = Array.from(emojisPaginationComponent.value.items.values(), item => item.id);
+ selectedEmojis.value = Array.from(emojisPaginationComponent.value?.items.values(), item => item.id);
}
};
@@ -133,7 +133,7 @@ const add = async (ev: MouseEvent) => {
}, {
done: result => {
if (result.created) {
- emojisPaginationComponent.value.prepend(result.created);
+ emojisPaginationComponent.value?.prepend(result.created);
}
},
closed: () => dispose(),
@@ -146,12 +146,12 @@ const edit = (emoji) => {
}, {
done: result => {
if (result.updated) {
- emojisPaginationComponent.value.updateItem(result.updated.id, (oldEmoji: any) => ({
+ emojisPaginationComponent.value?.updateItem(result.updated.id, (oldEmoji) => ({
...oldEmoji,
...result.updated,
}));
} else if (result.deleted) {
- emojisPaginationComponent.value.removeItem(emoji.id);
+ emojisPaginationComponent.value?.removeItem(emoji.id);
}
},
closed: () => dispose(),
@@ -248,7 +248,7 @@ const setCategoryBulk = async () => {
ids: selectedEmojis.value,
category: result,
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const setLicenseBulk = async () => {
@@ -260,43 +260,43 @@ const setLicenseBulk = async () => {
ids: selectedEmojis.value,
license: result,
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const addTagBulk = async () => {
const { canceled, result } = await os.inputText({
title: 'Tag',
});
- if (canceled) return;
+ if (canceled || result == null) return;
await os.apiWithDialog('admin/emoji/add-aliases-bulk', {
ids: selectedEmojis.value,
aliases: result.split(' '),
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const removeTagBulk = async () => {
const { canceled, result } = await os.inputText({
title: 'Tag',
});
- if (canceled) return;
+ if (canceled || result == null) return;
await os.apiWithDialog('admin/emoji/remove-aliases-bulk', {
ids: selectedEmojis.value,
aliases: result.split(' '),
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const setTagBulk = async () => {
const { canceled, result } = await os.inputText({
title: 'Tag',
});
- if (canceled) return;
+ if (canceled || result == null) return;
await os.apiWithDialog('admin/emoji/set-aliases-bulk', {
ids: selectedEmojis.value,
aliases: result.split(' '),
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const delBulk = async () => {
@@ -308,7 +308,7 @@ const delBulk = async () => {
await os.apiWithDialog('admin/emoji/delete-bulk', {
ids: selectedEmojis.value,
});
- emojisPaginationComponent.value.reload();
+ emojisPaginationComponent.value?.reload();
};
const headerActions = computed(() => [{
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 2ea9ba4e6c..786781a43c 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only
ref="windowEl"
:initialWidth="400"
:initialHeight="500"
- :canResize="false"
+ :canResize="true"
@close="windowEl?.close()"
- @closed="$emit('closed')"
+ @closed="emit('closed')"
>
:{{ emoji.name }}:
New emoji
@@ -96,14 +96,19 @@ import { selectFile } from '@/scripts/select-file.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
const props = defineProps<{
- emoji?: any,
+ emoji?: Misskey.entities.EmojiDetailed,
+}>();
+
+const emit = defineEmits<{
+ (ev: 'done', v: { deleted?: boolean; updated?: Misskey.entities.AdminEmojiUpdateRequest; created?: Misskey.entities.AdminEmojiUpdateRequest }): void,
+ (ev: 'closed'): void
}>();
const windowEl = ref | null>(null);
const name = ref(props.emoji ? props.emoji.name : '');
-const category = ref(props.emoji ? props.emoji.category : '');
+const category = ref(props.emoji?.category ? props.emoji.category : '');
const aliases = ref(props.emoji ? props.emoji.aliases.join(' ') : '');
-const license = ref(props.emoji ? (props.emoji.license ?? '') : '');
+const license = ref(props.emoji?.license ? props.emoji.license : '');
const isSensitive = ref(props.emoji ? props.emoji.isSensitive : false);
const localOnly = ref(props.emoji ? props.emoji.localOnly : false);
const roleIdsThatCanBeUsedThisEmojiAsReaction = ref(props.emoji ? props.emoji.roleIdsThatCanBeUsedThisEmojiAsReaction : []);
@@ -116,12 +121,7 @@ watch(roleIdsThatCanBeUsedThisEmojiAsReaction, async () => {
const imgUrl = computed(() => file.value ? file.value.url : props.emoji ? `/emoji/${props.emoji.name}.webp` : null);
-const emit = defineEmits<{
- (ev: 'done', v: { deleted?: boolean; updated?: any; created?: any }): void,
- (ev: 'closed'): void
-}>();
-
-async function changeImage(ev) {
+async function changeImage(ev: Event) {
file.value = await selectFile(ev.currentTarget ?? ev.target, null);
const candidate = file.value.name.replace(/\.(.+)$/, '');
if (candidate.match(/^[a-z0-9_]+$/)) {
@@ -141,7 +141,7 @@ async function addRole() {
rolesThatCanBeUsedThisEmojiAsReaction.value.push(role);
}
-async function removeRole(role, ev) {
+async function removeRole(role: Misskey.entities.RoleLite, ev: Event) {
rolesThatCanBeUsedThisEmojiAsReaction.value = rolesThatCanBeUsedThisEmojiAsReaction.value.filter(x => x.id !== role.id);
}
@@ -186,6 +186,7 @@ async function done() {
}
async function del() {
+ if (!props.emoji) return;
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.tsx.removeAreYouSure({ x: name.value }),
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index d6aa7c1b28..697c257eb7 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -15,18 +15,22 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue
index ede438d5c3..25c409569c 100644
--- a/packages/frontend/src/pages/my-clips/index.vue
+++ b/packages/frontend/src/pages/my-clips/index.vue
@@ -74,15 +74,15 @@ async function create() {
clipsCache.delete();
- pagingComponent.value.reload();
+ pagingComponent.value?.reload();
}
function onClipCreated() {
- pagingComponent.value.reload();
+ pagingComponent.value?.reload();
}
function onClipDeleted() {
- pagingComponent.value.reload();
+ pagingComponent.value?.reload();
}
const headerActions = computed(() => [{
diff --git a/packages/frontend/src/pages/my-lists/list.vue b/packages/frontend/src/pages/my-lists/list.vue
index 5a1de49374..aa10576abe 100644
--- a/packages/frontend/src/pages/my-lists/list.vue
+++ b/packages/frontend/src/pages/my-lists/list.vue
@@ -110,7 +110,7 @@ function addUser() {
listId: list.value.id,
userId: user.id,
}).then(() => {
- paginationEl.value.reload();
+ paginationEl.value?.reload();
});
});
}
@@ -126,7 +126,7 @@ async function removeUser(item, ev) {
listId: list.value.id,
userId: item.userId,
}).then(() => {
- paginationEl.value.removeItem(item.id);
+ paginationEl.value?.removeItem(item.id);
});
},
}], ev.currentTarget ?? ev.target);
diff --git a/packages/frontend/src/pages/not-found.vue b/packages/frontend/src/pages/not-found.vue
index 93a792c42f..6a2d01b6fa 100644
--- a/packages/frontend/src/pages/not-found.vue
+++ b/packages/frontend/src/pages/not-found.vue
@@ -24,7 +24,7 @@ const props = defineProps<{
}>();
if (props.showLoginPopup) {
- pleaseLogin('/');
+ pleaseLogin({ path: '/' });
}
const headerActions = computed(() => []);
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 9b685c3250..59a82f2a76 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -61,13 +61,17 @@ import { i18n } from '@/i18n.js';
import { dateString } from '@/filters/date.js';
import MkClipPreview from '@/components/MkClipPreview.vue';
import { defaultStore } from '@/store.js';
+import { pleaseLogin } from '@/scripts/please-login.js';
+import { getServerContext } from '@/server-context.js';
+
+const CTX_NOTE = getServerContext('note');
const props = defineProps<{
noteId: string;
initialTab?: string;
}>();
-const note = ref();
+const note = ref(CTX_NOTE);
const clips = ref();
const showPrev = ref<'user' | 'channel' | false>(false);
const showNext = ref<'user' | 'channel' | false>(false);
@@ -115,6 +119,12 @@ function fetchNote() {
showPrev.value = false;
showNext.value = false;
note.value = null;
+
+ if (CTX_NOTE && CTX_NOTE.id === props.noteId) {
+ note.value = CTX_NOTE;
+ return;
+ }
+
misskeyApi('notes/show', {
noteId: props.noteId,
}).then(res => {
@@ -128,6 +138,11 @@ function fetchNote() {
});
}
}).catch(err => {
+ if (err.id === '8e75455b-738c-471d-9f80-62693f33372e') {
+ pleaseLogin({
+ message: i18n.ts.thisContentsAreMarkedAsSigninRequiredByAuthor,
+ });
+ }
error.value = err;
});
}
diff --git a/packages/frontend/src/pages/oauth.vue b/packages/frontend/src/pages/oauth.vue
index 733e34eb2c..693f246758 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
-->
-
-
- >();
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/general.vue b/packages/frontend/src/pages/settings/general.vue
index 4a69cfce8f..e041ce1f09 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -119,6 +119,26 @@ SPDX-License-Identifier: AGPL-3.0-only
-
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index bb9dd06faa..94f2d7a4e2 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -46,12 +46,15 @@ import { clipsCache } from '@/cache.js';
import { isSupportShare } from '@/scripts/navigator.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import { genEmbedCode } from '@/scripts/get-embed-code.js';
+import { getServerContext } from '@/server-context.js';
+
+const CTX_CLIP = getServerContext('clip');
const props = defineProps<{
clipId: string,
}>();
-const clip = ref
-
+
-
-
-
-
-
-
-
- {{ i18n.ts.name }}
-
-
- {{ i18n.ts.description }}
-
-
- {{ i18n.ts.imageUrl }}
-
-
-
- {{ i18n.ts.selectFile }}
-
- {{ i18n.ts.image }}
-
- 
- ![]()
-
-
-
-
+
+ {{ avatarDecoration.name }}
+
-
+
-
+
{{ i18n.ts._pages.blocks.image }}
@@ -67,6 +67,7 @@ const props = defineProps<{
id: string;
url: string;
name: string;
+ roleIdsThatCanBeUsedThisDecoration: string[];
};
}>();
@@ -93,6 +94,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/page-editor/els/page-editor.el.image.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.image.vue
index 8e15ec38f3..f735ddcfec 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.image.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.image.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
-
-
-
-
+ {{ i18n.ts._auth.pleaseLogin }}
-
+
+
+
+ {{ i18n.ts._externalNavigationWarning.enableExternalNavigationWarning }}
+
+
+ {{ i18n.ts._externalNavigationWarning.trustedDomainList }}
+ {{ i18n.ts._externalNavigationWarning.trustedDomainListDescription }}
{{ i18n.ts._externalNavigationWarning.trustedDomainListDescription2 }} +
+
+
+ {{ i18n.ts._externalNavigationWarning.trustedDomainListDescription2 }} +