-
{{ i18n.ts.startChat }}
+
{{ i18n.ts.startChat }}
-
{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}
+
{{ $i.policies.chatAvailability === 'readonly' ? i18n.ts._chat.chatIsReadOnlyForThisAccountOrServer : i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}
@@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index 8fe65217fb..a2fb02462e 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -150,7 +150,7 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
},
}, {
icon: 'ti ti-code',
- text: i18n.ts.genEmbedCode,
+ text: i18n.ts.embed,
action: () => {
genEmbedCode('clips', clip.value!.id);
},
diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue
index f89e2dd776..ac1a7c6e1e 100644
--- a/packages/frontend/src/pages/scratchpad.vue
+++ b/packages/frontend/src/pages/scratchpad.vue
@@ -247,7 +247,7 @@ definePage(() => ({
}
.uiInspectorUnShown {
- color: var(--MI_THEME-fgTransparent);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.5);
}
.uiInspectorType {
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 1dc55d002c..17cf272a36 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -333,7 +333,7 @@ async function search() {
width: 100%;
height: 100%;
padding: 12px;
- border: 2px dashed var(--MI_THEME-fgTransparent);
+ border: 2px dashed color(from var(--MI_THEME-fg) srgb r g b / 0.5);
}
.userSelectButtonInner {
diff --git a/packages/frontend/src/pages/settings/emoji-palette.palette.vue b/packages/frontend/src/pages/settings/emoji-palette.palette.vue
index 33d1d7c9fa..b624d424f3 100644
--- a/packages/frontend/src/pages/settings/emoji-palette.palette.vue
+++ b/packages/frontend/src/pages/settings/emoji-palette.palette.vue
@@ -161,6 +161,6 @@ function del(ev: MouseEvent) {
.editorCaption {
font-size: 0.85em;
padding: 8px 0 0 0;
- color: var(--MI_THEME-fgTransparentWeak);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.75);
}
diff --git a/packages/frontend/src/pages/settings/emoji-palette.vue b/packages/frontend/src/pages/settings/emoji-palette.vue
index f86c40412a..2fcecca2bd 100644
--- a/packages/frontend/src/pages/settings/emoji-palette.vue
+++ b/packages/frontend/src/pages/settings/emoji-palette.vue
@@ -246,6 +246,6 @@ definePage(() => ({
.editorCaption {
font-size: 0.85em;
padding: 8px 0 0 0;
- color: var(--MI_THEME-fgTransparentWeak);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.75);
}
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 4ed4cdc773..5921a8c812 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -42,7 +42,7 @@ import { instance } from '@/instance.js';
import { definePage, provideMetadataReceiver, provideReactiveMetadata } from '@/page.js';
import * as os from '@/os.js';
import { useRouter } from '@/router.js';
-import { searchIndexes } from '@/utility/autogen/settings-search-index.js';
+import { searchIndexes } from '@/utility/settings-search-index.js';
import { enableAutoBackup, getPreferencesProfileMenu } from '@/preferences/utility.js';
import { store } from '@/store.js';
import { signout } from '@/signout.js';
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 7b8355d475..fc9cd8f892 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -62,12 +62,11 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})
+ {{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})
@@ -308,7 +307,7 @@ definePage(() => ({
.userItemSub {
padding: 6px 12px;
font-size: 85%;
- color: var(--MI_THEME-fgTransparentWeak);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.75);
}
.userItemMainBody {
diff --git a/packages/frontend/src/pages/settings/other.vue b/packages/frontend/src/pages/settings/other.vue
index 6736572e0b..d97ea6e459 100644
--- a/packages/frontend/src/pages/settings/other.vue
+++ b/packages/frontend/src/pages/settings/other.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.accountInfo }}
@@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.rolesAssignedToMe }}
@@ -58,7 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.accountMigration }}
@@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.closeAccount }}
@@ -81,7 +81,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.experimentalFeatures }}
@@ -100,7 +100,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.developer }}
@@ -185,7 +185,6 @@ async function deleteAccount() {
}
function migrate() {
- os.waiting();
migrateOldSettings();
}
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 86ae8af213..42a7b486ed 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.general }}
-
+
@@ -111,7 +111,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._settings.timelineAndNote }}
-
+
@@ -279,7 +279,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.postForm }}
-
+
@@ -341,7 +341,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.notifications }}
-
+
@@ -379,49 +379,51 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ i18n.ts.chat }}
-
+
+
+
+ {{ i18n.ts.chat }}
+
-
-
-
-
- {{ i18n.ts._settings._chat.showSenderName }}
-
-
-
+
+
+
+
+ {{ i18n.ts._settings._chat.showSenderName }}
+
+
+
-
-
-
- {{ i18n.ts._settings._chat.sendOnEnter }}
-
-
-
-
{{ i18n.ts._settings.ifOn }}:
-
{{ i18n.ts._chat.send }}: Enter
-
{{ i18n.ts._chat.newline }}: Shift + Enter
+
+
+
+ {{ i18n.ts._settings._chat.sendOnEnter }}
+
+
+
+
{{ i18n.ts._settings.ifOn }}:
+
{{ i18n.ts._chat.send }}: Enter
+
{{ i18n.ts._chat.newline }}: Shift + Enter
+
+
+
{{ i18n.ts._settings.ifOff }}:
+
{{ i18n.ts._chat.send }}: Ctrl + Enter
+
{{ i18n.ts._chat.newline }}: Enter
+
-
{{ i18n.ts._settings.ifOff }}:
-
{{ i18n.ts._chat.send }}: Ctrl + Enter
-
{{ i18n.ts._chat.newline }}: Enter
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ i18n.ts.accessibility }}
-
+
@@ -531,7 +533,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.performance }}
-
+
@@ -567,7 +569,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.dataSaver }}
-
+
{{ i18n.ts.reloadRequiredToApplySettings }}
@@ -601,7 +603,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.other }}
-
+
@@ -732,6 +734,9 @@ import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
import { globalEvents } from '@/events.js';
import { claimAchievement } from '@/utility/achievements.js';
import { instance } from '@/instance.js';
+import { ensureSignin } from '@/i.js';
+
+const $i = ensureSignin();
const lang = ref(miLocalStorage.getItem('lang'));
const dataSaver = ref(prefer.s.dataSaver);
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 2f8a697d74..4e6425667e 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -78,19 +78,26 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
- {{ i18n.ts._chat.chatAllowedUsers }}
-
-
-
-
-
- {{ i18n.ts._chat.chatAllowedUsers_note }}
-
-
-
+
+
+ {{ i18n.ts.chat }}
+
+
+ {{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}
+
+
+ {{ i18n.ts._chat.chatAllowedUsers }}
+
+
+
+
+
+ {{ i18n.ts._chat.chatAllowedUsers_note }}
+
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue
index 6a6cec70ba..877d2deb90 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.vue
+++ b/packages/frontend/src/pages/settings/webhook.edit.vue
@@ -184,6 +184,6 @@ definePage(() => ({
.description {
font-size: 0.85em;
padding: 8px 0 0 0;
- color: var(--MI_THEME-fgTransparentWeak);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.75);
}
diff --git a/packages/frontend/src/pages/tag.vue b/packages/frontend/src/pages/tag.vue
index 4afef6f4d7..f67777be4e 100644
--- a/packages/frontend/src/pages/tag.vue
+++ b/packages/frontend/src/pages/tag.vue
@@ -56,7 +56,7 @@ const headerActions = computed(() => [{
label: i18n.ts.more,
handler: (ev: MouseEvent) => {
os.popupMenu([{
- text: i18n.ts.genEmbedCode,
+ text: i18n.ts.embed,
icon: 'ti ti-code',
action: () => {
genEmbedCode('tags', props.tag);
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index dfa43e1ef2..961b042873 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -520,7 +520,7 @@ onUnmounted(() => {
> .heading {
text-align: left;
- color: var(--MI_THEME-fgTransparent);
+ color: color(from var(--MI_THEME-fg) srgb r g b / 0.5);
line-height: 1.5;
font-size: 85%;
}
diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts
index 5d48508def..414bb9c5aa 100644
--- a/packages/frontend/src/pref-migrate.ts
+++ b/packages/frontend/src/pref-migrate.ts
@@ -10,14 +10,19 @@ import { prefer } from '@/preferences.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { deckStore } from '@/ui/deck/deck-store.js';
import { unisonReload } from '@/utility/unison-reload.js';
+import * as os from '@/os.js';
+import { i18n } from '@/i18n.js';
// TODO: そのうち消す
export function migrateOldSettings() {
+ os.waiting(i18n.ts.settingsMigrating);
+
store.loaded.then(async () => {
- const themes = await misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []);
- if (themes.length > 0) {
- prefer.commit('themes', themes);
- }
+ misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []).then((themes: any) => {
+ if (themes.length > 0) {
+ prefer.commit('themes', themes);
+ }
+ });
const plugins = ColdDeviceStorage.get('plugins');
prefer.commit('plugins', plugins.map(p => ({
@@ -66,7 +71,7 @@ export function migrateOldSettings() {
prefer.commit('collapseRenotes', store.s.collapseRenotes);
prefer.commit('rememberNoteVisibility', store.s.rememberNoteVisibility);
prefer.commit('uploadFolder', store.s.uploadFolder);
- prefer.commit('menu', store.s.menu);
+ prefer.commit('menu', [...store.s.menu, 'chat']);
prefer.commit('statusbars', store.s.statusbars);
prefer.commit('pinnedUserLists', store.s.pinnedUserLists);
prefer.commit('serverDisconnectedBehavior', store.s.serverDisconnectedBehavior);
@@ -136,6 +141,6 @@ export function migrateOldSettings() {
window.setTimeout(() => {
unisonReload();
- }, 5000);
+ }, 10000);
});
}
diff --git a/packages/frontend/src/router.definition.ts b/packages/frontend/src/router.definition.ts
index 23118160e2..d59b160b8b 100644
--- a/packages/frontend/src/router.definition.ts
+++ b/packages/frontend/src/router.definition.ts
@@ -16,6 +16,10 @@ export const page = (loader: AsyncComponentLoader) => defineAsyncComponent({
errorComponent: MkError,
});
+function chatPage(...args: Parameters) {
+ return $i?.policies.chatAvailability !== 'unavailable' ? page(...args) : page(() => import('@/pages/not-found.vue'));
+}
+
export const ROUTE_DEF = [{
path: '/@:username/pages/:pageName(*)',
component: page(() => import('@/pages/page.vue')),
@@ -42,19 +46,19 @@ export const ROUTE_DEF = [{
component: page(() => import('@/pages/clip.vue')),
}, {
path: '/chat',
- component: page(() => import('@/pages/chat/home.vue')),
+ component: chatPage(() => import('@/pages/chat/home.vue')),
loginRequired: true,
}, {
path: '/chat/user/:userId',
- component: page(() => import('@/pages/chat/room.vue')),
+ component: chatPage(() => import('@/pages/chat/room.vue')),
loginRequired: true,
}, {
path: '/chat/room/:roomId',
- component: page(() => import('@/pages/chat/room.vue')),
+ component: chatPage(() => import('@/pages/chat/room.vue')),
loginRequired: true,
}, {
path: '/chat/messages/:messageId',
- component: page(() => import('@/pages/chat/message.vue')),
+ component: chatPage(() => import('@/pages/chat/message.vue')),
loginRequired: true,
}, {
path: '/instance-info/:host',
diff --git a/packages/frontend/src/ui/_common_/mobile-footer-menu.vue b/packages/frontend/src/ui/_common_/mobile-footer-menu.vue
new file mode 100644
index 0000000000..37b70847ca
--- /dev/null
+++ b/packages/frontend/src/ui/_common_/mobile-footer-menu.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+