{{ code }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index f8184317cd..bed00859c4 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -47,6 +47,7 @@ export default defineComponent({
setup(props, { slots, expose }) {
const $style = useCssModule(); // カスタムレンダラなので使っても大丈夫
+
function getDateText(time: string) {
const date = new Date(time).getDate();
const month = new Date(time).getMonth() + 1;
@@ -128,6 +129,7 @@ export default defineComponent({
el.style.top = `${el.offsetTop}px`;
el.style.left = `${el.offsetLeft}px`;
}
+
function onLeaveCanceled(el: HTMLElement) {
el.style.top = '';
el.style.left = '';
diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 09efe161b9..7173a1392d 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -162,6 +162,7 @@ async function ok() {
function cancel() {
done(true);
}
+
/*
function onBgClick() {
if (props.cancelableByBgClick) cancel();
diff --git a/packages/frontend/src/components/MkDrive.file.vue b/packages/frontend/src/components/MkDrive.file.vue
index 4ac66261b8..34f908df1d 100644
--- a/packages/frontend/src/components/MkDrive.file.vue
+++ b/packages/frontend/src/components/MkDrive.file.vue
@@ -47,6 +47,7 @@ import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
import { useRouter } from '@/router.js';
import { getDriveFileMenu } from '@/scripts/get-drive-file-menu.js';
+import { deviceKind } from '@/scripts/device-kind.js';
const router = useRouter();
@@ -74,7 +75,11 @@ function onClick(ev: MouseEvent) {
if (props.selectMode) {
emit('chosen', props.file);
} else {
- router.push(`/my/drive/file/${props.file.id}`);
+ if (deviceKind === 'desktop') {
+ router.push(`/my/drive/file/${props.file.id}`);
+ } else {
+ os.popupMenu(getDriveFileMenu(props.file, props.folder), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
+ }
}
}
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index cbd7bb79c8..510888d58d 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -505,6 +505,7 @@ function appendFile(file: Misskey.entities.DriveFile) {
function appendFolder(folderToAppend: Misskey.entities.DriveFolder) {
addFolder(folderToAppend);
}
+
/*
function prependFile(file: Misskey.entities.DriveFile) {
addFile(file, true);
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 006b0662e6..42253a4f1c 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -5,9 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
+
+ {{ child.value || i18n.ts.other }}
+
+
+
+
+
+
-
+
@@ -74,18 +74,20 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.customEmojis }}
- {{ category || i18n.ts.other }}
+ {{ child.value || i18n.ts.other }}
{{ i18n.ts.emoji }}
- {{ category }}
+ {{ category }}
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
index 1ec0efac51..8da1503fe6 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -49,24 +49,32 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -101,7 +103,14 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref, shallowRef, computed, watch, onMounted } from 'vue';
import * as Misskey from 'cherrypick-js';
import XSection from '@/components/MkEmojiPicker.section.vue';
-import { emojilist, emojiCharByCategory, UnicodeEmojiDef, unicodeEmojiCategories as categories, getEmojiName } from '@/scripts/emojilist.js';
+import {
+ emojilist,
+ emojiCharByCategory,
+ UnicodeEmojiDef,
+ unicodeEmojiCategories as categories,
+ getEmojiName,
+ CustomEmojiFolderTree,
+} from '@/scripts/emojilist.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import * as os from '@/os.js';
import { isTouchUsing } from '@/scripts/touch.js';
@@ -145,6 +154,35 @@ const searchResultCustom = ref([]);
const searchResultUnicode = ref([]);
const tab = ref<'index' | 'custom' | 'unicode' | 'tags'>('index');
+const customEmojiFolderRoot: CustomEmojiFolderTree = { value: '', category: '', children: [] };
+
+function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): CustomEmojiFolderTree {
+ const parts = input.split('/').map(p => p.trim());
+ let currentNode: CustomEmojiFolderTree = root;
+
+ for (const part of parts) {
+ let existingNode = currentNode.children.find((node) => node.value === part);
+
+ if (!existingNode) {
+ const newNode: CustomEmojiFolderTree = { value: part, category: input, children: [] };
+ currentNode.children.push(newNode);
+ existingNode = newNode;
+ }
+
+ currentNode = existingNode;
+ }
+
+ return currentNode;
+}
+
+customEmojiCategories.value.forEach(ec => {
+ if (ec !== null) {
+ parseAndMergeCategories(ec, customEmojiFolderRoot);
+ }
+});
+
+parseAndMergeCategories('', customEmojiFolderRoot);
+
watch(q, () => {
if (emojisEl.value) emojisEl.value.scrollTop = 0;
@@ -573,8 +611,7 @@ defineExpose({
position: sticky;
top: 0;
left: 0;
- height: 32px;
- line-height: 32px;
+ line-height: 28px;
z-index: 1;
padding: 0 8px;
font-size: 12px;
diff --git a/packages/frontend/src/components/MkFoldableSection.vue b/packages/frontend/src/components/MkFoldableSection.vue
index 8230acbc57..7301877731 100644
--- a/packages/frontend/src/components/MkFoldableSection.vue
+++ b/packages/frontend/src/components/MkFoldableSection.vue
@@ -96,6 +96,7 @@ onMounted(() => {
return getParentBg(el.parentElement);
}
}
+
const rawBg = getParentBg(el.value);
const _bg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
_bg.setAlpha(0.85);
diff --git a/packages/frontend/src/components/MkGoogle.vue b/packages/frontend/src/components/MkGoogle.vue
index d0e52e9a04..04afbdbab2 100644
--- a/packages/frontend/src/components/MkGoogle.vue
+++ b/packages/frontend/src/components/MkGoogle.vue
@@ -21,7 +21,9 @@ const props = defineProps<{
const query = ref(props.q);
const search = () => {
- window.open(`https://www.google.com/search?q=${query.value}`, '_blank');
+ const sp = new URLSearchParams();
+ sp.append('q', query.value);
+ window.open(`https://www.google.com/search?${sp.toString()}`, '_blank');
};
diff --git a/packages/frontend/src/components/MkInfo.vue b/packages/frontend/src/components/MkInfo.vue
index 6d8ee78a21..0f0c1fa9e2 100644
--- a/packages/frontend/src/components/MkInfo.vue
+++ b/packages/frontend/src/components/MkInfo.vue
@@ -4,47 +4,42 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+ {{ i18n.ts._initialTutorial._note.title }}
+ {{ i18n.ts._initialTutorial._reaction.title }}
+ {{ i18n.ts._initialTutorial._timeline.title }}
+ {{ i18n.ts._initialTutorial._postNote.title }}
+ {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title }}
+ {{ i18n.ts._initialTutorial.title }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue
index 48a5e3f941..55d5032dcc 100644
--- a/packages/frontend/src/components/MkUserInfo.vue
+++ b/packages/frontend/src/components/MkUserInfo.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.followsYou }}
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue
index a32fc3671a..3bd09a8162 100644
--- a/packages/frontend/src/components/MkUserPopup.vue
+++ b/packages/frontend/src/components/MkUserPopup.vue
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 857d4a6b6d..9df15c95e2 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
new file mode 100644
index 0000000000..d3e3620c39
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -0,0 +1,135 @@
+
+
+
+
-
diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue
index d17286724a..cac400ea6f 100644
--- a/packages/frontend/src/components/MkInput.vue
+++ b/packages/frontend/src/components/MkInput.vue
@@ -20,6 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:placeholder="placeholder"
:pattern="pattern"
:autocomplete="autocomplete"
+ :autocapitalize="autocapitalize"
:spellcheck="spellcheck"
:step="step"
:list="id"
@@ -58,6 +59,7 @@ const props = defineProps<{
placeholder?: string;
autofocus?: boolean;
autocomplete?: string;
+ autocapitalize?: string;
spellcheck?: boolean;
step?: any;
datalist?: string[];
diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue
index e034274c1b..7e840fb840 100644
--- a/packages/frontend/src/components/MkLaunchPad.vue
+++ b/packages/frontend/src/components/MkLaunchPad.vue
@@ -7,17 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- +{{ count - 10 }}
+ +{{ count - 10 }}
+
+ {{ i18n.ts.visibility }}
+
+
+ {{ i18n.ts._initialTutorial._postNote._cw.title }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
new file mode 100644
index 0000000000..c9f901963a
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
@@ -0,0 +1,145 @@
+
+
+
+{{ i18n.ts._initialTutorial._postNote.description1 }}
+
+
+ {{ i18n.ts._initialTutorial._postNote._visibility.description }}
+ {{ i18n.ts._visibility.public }} … {{ i18n.ts._initialTutorial._postNote._visibility.public }}
+ {{ i18n.ts._visibility.home }} … {{ i18n.ts._initialTutorial._postNote._visibility.home }}
+ {{ i18n.ts._visibility.followers }} … {{ i18n.ts._initialTutorial._postNote._visibility.followers }}
+
+
+ {{ i18n.ts._initialTutorial._postNote._visibility.doNotSendConfidencialOnDirect1 }} {{ i18n.ts._initialTutorial._postNote._visibility.doNotSendConfidencialOnDirect2 }}
+
+
+ {{ i18n.ts._visibility.specified }} … {{ i18n.ts._initialTutorial._postNote._visibility.direct }}
+ {{ i18n.ts._visibility.disableFederation }} … {{ i18n.ts._initialTutorial._postNote._visibility.localOnly }}
+
+
+ {{ i18n.ts._initialTutorial._postNote._cw.description }}
+ {{ i18n.ts._initialTutorial._postNote._cw.useCases }}
+
+ {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.method }}
+
+ {{ i18n.ts.previewNoteText }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
new file mode 100644
index 0000000000..fa689ac445
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
@@ -0,0 +1,86 @@
+
+
+
+{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.description }}
+ {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.tryThisFile }}
+ {{ i18n.ts._initialTutorial.wellDone }} {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.sensitiveSucceeded }}
+
+
+
+ {{ i18n.ts.help }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkTutorialDialog.vue b/packages/frontend/src/components/MkTutorialDialog.vue
new file mode 100644
index 0000000000..88533deadc
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.vue
@@ -0,0 +1,260 @@
+
+
+
+{{ i18n.ts._initialTutorial._timeline.description1 }}
+
+
+ {{ i18n.ts._timelines.home }} … {{ i18n.ts._initialTutorial._timeline.home }}
+ {{ i18n.ts._timelines.local }} … {{ i18n.ts._initialTutorial._timeline.local }}
+ {{ i18n.ts._timelines.social }} … {{ i18n.ts._initialTutorial._timeline.social }}
+ {{ i18n.ts._timelines.global }} … {{ i18n.ts._initialTutorial._timeline.global }}
+
+ 
+
+
+ {{ i18n.ts._initialTutorial._timeline.description2 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._initialTutorial.launchTutorial }}
+ {{ i18n.ts.close }}
+
+ {{ i18n.ts._initialTutorial._landing.title }}
+ {{ i18n.ts._initialTutorial._landing.description }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._initialTutorial._reaction.reactToContinue }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.doItToContinue }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.help }}
+
+
+
+ {{ i18n.ts._initialTutorial._done.title }}
+ {{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}
+
+
-
{{ i18n.ts.noAccountDescription }}
-
{{ i18n.ts.noAccountDescription }}
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.vue b/packages/frontend/src/components/MkUserSetupDialog.User.vue
index 0f9e60b5a6..58d739122e 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.User.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
{{ i18n.ts.noAccountDescription }}
-
-
-
-
- {{ instance.name ?? host }}
-
- {{ i18n.ts.help }}
-
-
-
@@ -159,7 +164,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -256,10 +276,21 @@ async function later(later: boolean) {
box-sizing: border-box;
}
+.pageRoot {
+ display: flex;
+ flex-direction: column;
+ min-height: 100%;
+}
+
+.pageMain {
+ flex-grow: 1;
+}
+
.pageFooter {
position: sticky;
bottom: 0;
left: 0;
+ flex-shrink: 0;
padding: 12px;
border-top: solid 0.5px var(--divider);
-webkit-backdrop-filter: blur(15px);
diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue
index bf9ed0087f..81cda75da5 100644
--- a/packages/frontend/src/components/MkVisibilityPicker.vue
+++ b/packages/frontend/src/components/MkVisibilityPicker.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+ {{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}
- {{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}
+ {{ i18n.t('_initialAccountSetting.youCanContinueTutorial', { name: instance.name ?? host }) }}
+
{{ i18n.ts.visibility }}
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -33,15 +45,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
@@ -51,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 89c781e050..796cfb0f8c 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -24,6 +24,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.sensitive }}
+
+ {{ i18n.ts._channel.allowRenoteToExternal }}
+
+
{{ i18n.ts._channel.setBanner }}
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index 2944a4f3b4..a3533e5ff2 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ clip.favoritedCount }}
{{ clip.favoritedCount }}
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index e768b59349..4e8a1d563c 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.selectFile }}
-
+
{{ i18n.ts.name }}
{{ i18n.ts.category }}
-
+
{{ i18n.ts.tags }}
{{ i18n.ts.setMultipleBySeparatingWithSpace }}
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 53e129a3ed..c9601ec085 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._play.viewSource }}
- {{ i18n.ts._profile.changeBanner }}
@@ -83,6 +83,24 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._profile.metadataDescription }}
+
+
+ {{ i18n.ts.avatarDecorations }}
+
+
+
{{ i18n.ts.advancedSettings }}
@@ -121,11 +139,13 @@ import { langmap } from '@/scripts/langmap.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { claimAchievement } from '@/scripts/achievements.js';
import { defaultStore } from '@/store.js';
+import { unisonReload } from '@/scripts/unison-reload.js';
import MkInfo from '@/components/MkInfo.vue';
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
const reactionAcceptance = computed(defaultStore.makeGetterSetter('reactionAcceptance'));
+let avatarDecorations: any[] = $ref([]);
const profile = reactive({
name: $i.name,
@@ -146,6 +166,10 @@ watch(() => profile, () => {
const fields = ref($i?.fields.map(field => ({ id: Math.random().toString(), name: field.name, value: field.value })) ?? []);
const fieldEditMode = ref(false);
+os.api('get-avatar-decorations').then(_avatarDecorations => {
+ avatarDecorations = _avatarDecorations;
+});
+
function addField() {
fields.value.push({
id: Math.random().toString(),
@@ -188,8 +212,16 @@ function save() {
if (profile.name === 'syuilo' || profile.name === 'しゅいろ') {
claimAchievement('setNameToSyuilo');
}
- if (profile.isCat) {
+ if (profile.isCat && defaultStore.state.renameTheButtonInPostFormToNya) {
claimAchievement('markedAsCat');
+ } else if (profile.isCat && !defaultStore.state.renameTheButtonInPostFormToNya) {
+ claimAchievement('markedAsCat');
+ defaultStore.set('renameTheButtonInPostFormToNya', true);
+ defaultStore.set('renameTheButtonInPostFormToNyaManualSet', false);
+ reloadAsk();
+ } else if (!profile.isCat && !defaultStore.state.renameTheButtonInPostFormToNyaManualSet) {
+ defaultStore.set('renameTheButtonInPostFormToNya', false);
+ reloadAsk();
}
}
@@ -244,6 +276,22 @@ function changeBanner(ev) {
});
}
+function openDecoration(avatarDecoration) {
+ os.popup(defineAsyncComponent(() => import('./profile.avatar-decoration-dialog.vue')), {
+ decoration: avatarDecoration,
+ }, {}, 'closed');
+}
+
+async function reloadAsk() {
+ const { canceled } = await os.confirm({
+ type: 'info',
+ text: i18n.ts.reloadToApplySetting,
+ });
+ if (canceled) return;
+
+ unisonReload();
+}
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
@@ -338,4 +386,33 @@ definePageMetadata({
.dragItemForm {
flex-grow: 1;
}
+
+.avatarDecoration {
+ cursor: pointer;
+ padding: 16px 16px 28px 16px;
+ border: solid 2px var(--divider);
+ border-radius: 8px;
+ text-align: center;
+ font-size: 90%;
+ overflow: clip;
+ contain: content;
+}
+
+.avatarDecorationActive {
+ background-color: var(--accentedBg);
+ border-color: var(--accent);
+}
+
+.avatarDecorationName {
+ position: relative;
+ z-index: 10;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+
+.avatarDecorationLock {
+ position: absolute;
+ bottom: 12px;
+ right: 12px;
+}
diff --git a/packages/frontend/src/pages/settings/sounds-and-vibrations.vue b/packages/frontend/src/pages/settings/sounds-and-vibrations.vue
index c64740aea9..f25486abd8 100644
--- a/packages/frontend/src/pages/settings/sounds-and-vibrations.vue
+++ b/packages/frontend/src/pages/settings/sounds-and-vibrations.vue
@@ -46,25 +46,24 @@ import MkButton from '@/components/MkButton.vue';
import FormSection from '@/components/form/section.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkSwitch from '@/components/MkSwitch.vue';
-import { soundConfigStore } from '@/scripts/sound.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { ColdDeviceStorage } from '@/store.js';
+import { ColdDeviceStorage, defaultStore } from '@/store.js';
import { unisonReload } from '@/scripts/unison-reload.js';
-const masterVolume = computed(soundConfigStore.makeGetterSetter('sound_masterVolume'));
+const masterVolume = computed(defaultStore.makeGetterSetter('sound_masterVolume'));
const soundsKeys = ['note', 'noteMy', 'noteEdited', 'notification', 'chat', 'chatBg', 'antenna', 'channel'] as const;
const sounds = ref>>({
- note: soundConfigStore.reactiveState.sound_note,
- noteMy: soundConfigStore.reactiveState.sound_noteMy,
- noteEdited: soundConfigStore.reactiveState.sound_noteEdited,
- notification: soundConfigStore.reactiveState.sound_notification,
- chat: soundConfigStore.reactiveState.sound_chat,
- chatBg: soundConfigStore.reactiveState.sound_chatBg,
- antenna: soundConfigStore.reactiveState.sound_antenna,
- channel: soundConfigStore.reactiveState.sound_channel,
+ note: defaultStore.reactiveState.sound_note,
+ noteMy: defaultStore.reactiveState.sound_noteMy,
+ noteEdited: defaultStore.reactiveState.sound_noteEdited,
+ notification: defaultStore.reactiveState.sound_notification,
+ chat: defaultStore.reactiveState.sound_chat,
+ chatBg: defaultStore.reactiveState.sound_chatBg,
+ antenna: defaultStore.reactiveState.sound_antenna,
+ channel: defaultStore.reactiveState.sound_channel,
});
const vibrate = computed(ColdDeviceStorage.makeGetterSetter('vibrate'));
@@ -90,14 +89,14 @@ async function updated(type: keyof typeof sounds.value, sound) {
volume: sound.volume,
};
- soundConfigStore.set(`sound_${type}`, v);
+ defaultStore.set(`sound_${type}`, v);
sounds.value[type] = v;
}
function reset() {
for (const sound of Object.keys(sounds.value) as Array) {
- const v = soundConfigStore.def[`sound_${sound}`].default;
- soundConfigStore.set(`sound_${sound}`, v);
+ const v = defaultStore.def[`sound_${sound}`].default;
+ defaultStore.set(`sound_${sound}`, v);
sounds.value[sound] = v;
}
}
diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue
index 05117896c5..0ee2865e72 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.vue
+++ b/packages/frontend/src/pages/settings/webhook.edit.vue
@@ -108,6 +108,7 @@ async function del(): Promise {
router.push('/settings/webhook');
}
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/pages/signup-complete.vue b/packages/frontend/src/pages/signup-complete.vue
index 86c000c8b5..7e85ac2673 100644
--- a/packages/frontend/src/pages/signup-complete.vue
+++ b/packages/frontend/src/pages/signup-complete.vue
@@ -51,7 +51,8 @@ function submit() {
os.alert({
type: 'error',
- text: i18n.ts.somethingHappened,
+ title: i18n.ts.somethingHappened,
+ text: i18n.ts.signupPendingError,
});
});
}
diff --git a/packages/frontend/src/pages/timeline.tutorial.vue b/packages/frontend/src/pages/timeline.tutorial.vue
deleted file mode 100644
index d17ad9cd38..0000000000
--- a/packages/frontend/src/pages/timeline.tutorial.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
@@ -93,6 +97,7 @@ let bannerUrl = $ref(null);
let bannerId = $ref(null);
let color = $ref('#000');
let isSensitive = $ref(false);
+let allowRenoteToExternal = $ref(true);
const pinnedNotes = ref([]);
watch(() => bannerId, async () => {
@@ -121,6 +126,7 @@ async function fetchChannel() {
id,
}));
color = channel.color;
+ allowRenoteToExternal = channel.allowRenoteToExternal;
}
fetchChannel();
@@ -150,16 +156,14 @@ function save() {
pinnedNoteIds: pinnedNotes.value.map(x => x.id),
color: color,
isSensitive: isSensitive,
+ allowRenoteToExternal: allowRenoteToExternal,
};
if (props.channelId) {
params.channelId = props.channelId;
- os.api('channels/update', params).then(() => {
- os.success();
- });
+ os.apiWithDialog('channels/update', params);
} else {
- os.api('channels/create', params).then(created => {
- os.success();
+ os.apiWithDialog('channels/create', params).then(created => {
router.push(`/channels/${created.id}`);
});
}
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 2d8ef02217..62fe69f380 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
+
{{ i18n.ts.search }}
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.search }}
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index ac8527e43c..053bf0b2a1 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -56,6 +56,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._fileViewer.size }}
{{ bytes(file.size) }}
+
+ URL
+ {{ file.url }}
+
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index c83f99313d..e82ba48a6d 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -31,13 +31,13 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts._profile.changeAvatar }}
+
+
+ {{ avatarDecoration.name }}
+
+
-
-
-
-
-
-
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 18320e4575..bf394640f7 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -11,7 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ i18n.ts._timelineTutorial.title }}
-
-
- {{ tutorial + 1 }} / {{ tutorialsNumber }}
-
-
-
-
- {{ i18n.t('_timelineTutorial.step1_1', { name: instance.name ?? host }) }}
- {{ i18n.t('_timelineTutorial.step1_2', { name: instance.name ?? host }) }}
-
-
- {{ i18n.ts._timelineTutorial.step2_1 }}
- {{ i18n.t('_timelineTutorial.step2_2', { name: instance.name ?? host }) }}
-
-
- {{ i18n.ts._timelineTutorial.step3_1 }}
- {{ i18n.ts._timelineTutorial.step3_2 }}
-
-
-
- {{ i18n.ts._timelineTutorial.step4_1 }}
- {{ i18n.ts._timelineTutorial.step4_2 }}
-
-
- {{ i18n.ts.done }}
-
-
- {{ i18n.ts.next }}
-
-
-
-
+ {{ i18n.ts._timelineDescription[src] }}
+
diff --git a/packages/frontend/src/ui/_common_/stream-indicator.vue b/packages/frontend/src/ui/_common_/stream-indicator.vue
index 4943432cff..d94709d1f6 100644
--- a/packages/frontend/src/ui/_common_/stream-indicator.vue
+++ b/packages/frontend/src/ui/_common_/stream-indicator.vue
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only