{{ item.text }}
-
+ {{ item.indicateValue }}
+
{{ code }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 66d4b542b..e5bdd3781 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -42,6 +42,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;
@@ -121,6 +122,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 a83c18c0b..33757ccc8 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -160,6 +160,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 96704996f..b46b25eba 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 648e4c4e3..71bb4ecfe 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.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 7eff63748..5b420c499 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
-
+
diff --git a/packages/frontend/src/components/MkFoldableSection.vue b/packages/frontend/src/components/MkFoldableSection.vue
index ed3cb0868..1ffc95d94 100644
--- a/packages/frontend/src/components/MkFoldableSection.vue
+++ b/packages/frontend/src/components/MkFoldableSection.vue
@@ -84,6 +84,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 b899656e4..efbd775f5 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 37490887e..19402a44c 100644
--- a/packages/frontend/src/components/MkInfo.vue
+++ b/packages/frontend/src/components/MkInfo.vue
@@ -7,7 +7,8 @@ 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 d0db51521..2b850016c 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -17,7 +17,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 000000000..b395f6485
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -0,0 +1,135 @@
+
+
+
+
-
@@ -16,11 +17,23 @@ import { } from 'vue';
const props = defineProps<{
warn?: boolean;
+ closable?: boolean;
}>();
+
+const emit = defineEmits<{
+ (ev: 'close'): void;
+}>();
+
+function close() {
+ // こいつの中では非表示動作は行わない
+ emit('close');
+}
diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue
index 5cfd7eb53..72babfac7 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 321acc0fb..87f15a110 100644
--- a/packages/frontend/src/components/MkLaunchPad.vue
+++ b/packages/frontend/src/components/MkLaunchPad.vue
@@ -7,16 +7,18 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -27,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 2cfc27cee..04390c6f0 100644
--- a/packages/frontend/src/components/MkRange.vue
+++ b/packages/frontend/src/components/MkRange.vue
@@ -34,6 +34,7 @@ const props = withDefaults(defineProps<{
textConverter?: (value: number) => string,
showTicks?: boolean;
easing?: boolean;
+ continuousUpdate?: boolean;
}>(), {
step: 1,
textConverter: (v) => v.toString(),
@@ -123,6 +124,10 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
const pointerX = ev.touches && ev.touches.length > 0 ? ev.touches[0].clientX : ev.clientX;
const pointerPositionOnContainer = pointerX - (containerRect.left + (thumbWidth / 2));
rawValue.value = Math.min(1, Math.max(0, pointerPositionOnContainer / (containerEl.value!.offsetWidth - thumbWidth)));
+
+ if (props.continuousUpdate) {
+ emit('update:modelValue', finalValue.value);
+ }
};
let beforeValue = finalValue.value;
diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue
index 55c812cbc..fdc3bfd23 100644
--- a/packages/frontend/src/components/MkReactionIcon.vue
+++ b/packages/frontend/src/components/MkReactionIcon.vue
@@ -4,16 +4,31 @@ 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 000000000..896db5eb3
--- /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 000000000..75b917f33
--- /dev/null
+++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
@@ -0,0 +1,87 @@
+
+
+
+{{ 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 000000000..e28838425
--- /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 746781d71..4fbaf7545 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 }}
-
-
@@ -294,6 +307,7 @@ const patrons = [
'美少女JKぐーちゃん',
'てば',
'たっくん',
+ 'SHO SEKIGUCHI',
];
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
index c8f56f167..c9bb6f897 100644
--- a/packages/frontend/src/pages/about.emojis.vue
+++ b/packages/frontend/src/pages/about.emojis.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ instance.name ?? host }}
-
- {{ i18n.ts.help }}
-
-
-
@@ -123,7 +128,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -214,10 +234,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 982a69925..bbb3d3dbf 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 }}
-
-
+
diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
index 333af93ef..47fe9c427 100644
--- a/packages/frontend/src/pages/about.federation.vue
+++ b/packages/frontend/src/pages/about.federation.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index ee4043f9a..4fa409ff4 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.impressum }}
-
+
{{ i18n.ts.serverRules }}
@@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
Well-known resources
-
+
host-meta
host-meta.json
nodeinfo
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index 6aa0cf042..6e07585fd 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
@@ -14,11 +14,11 @@ SPDX-License-Identifier: AGPL-3.0-only
+ {{ i18n.ts._role._options.canManageAvatarDecorations }}
+
+ {{ i18n.ts._role.useBaseValue }}
+ {{ role.policies.canManageAvatarDecorations.value ? i18n.ts.yes : i18n.ts.no }}
+
+
+
+
{{ i18n.ts._role._options.canSearchNotes }}
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index 74de9f739..d3f377356 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -79,6 +79,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._role._options.canManageAvatarDecorations }}
+ {{ policies.canManageAvatarDecorations ? i18n.ts.yes : i18n.ts.no }}
+
+ {{ i18n.ts.enable }}
+
+
+
{{ i18n.ts._role._options.canManageCustomEmojis }}
{{ policies.canManageCustomEmojis ? i18n.ts.yes : i18n.ts.no }}
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 0072d666c..a15be2562 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.impressumUrl }}
{{ i18n.ts.impressumDescription }}
@@ -87,9 +87,14 @@ SPDX-License-Identifier: AGPL-3.0-only
- Timeline caching
+ Misskey® Fan-out Timeline Technology™ (FTT)
-
URL
-
+
{{ i18n.ts.imageUrl }}
@@ -51,8 +51,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._ad.timezoneinfo }}
@@ -115,6 +121,7 @@ const onChangePublishing = (v) => {
publishing = v;
refresh();
};
+
// 選択された曜日(index)のビットフラグを操作する
function toggleDayOfWeek(ad, index) {
ad.dayOfWeek ^= 1 << index;
@@ -187,6 +194,7 @@ function save(ad) {
});
}
}
+
function more() {
os.api('admin/ad/list', { untilId: ads.reduce((acc, ad) => ad.id != null ? ad : acc).id, publishing: publishing }).then(adsResponse => {
ads = ads.concat(adsResponse.map(r => {
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index f12c068a1..5785fb118 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -8,6 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -61,9 +63,13 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.memo }}
+ {{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}
{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}
@@ -27,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.text }}
-
+
{{ i18n.ts.imageUrl }}
@@ -43,9 +44,13 @@ SPDX-License-Identifier: AGPL-3.0-only
+ {{ i18n.ts._announcement.dialogAnnouncementUxWarn }}
{{ i18n.ts._announcement.forExistingUsers }}
+
+ {{ i18n.ts._announcement.silence }}
+
{{ i18n.ts._announcement.needConfirmationToRead }}
@@ -95,6 +100,7 @@ function add() {
icon: 'info',
display: 'normal',
forExistingUsers: false,
+ silence: false,
needConfirmationToRead: false,
});
}
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index d064dbd0a..c6c71d46c 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -10,12 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.useObjectStorage }}
-
+
{{ i18n.ts.objectStorageBaseUrl }}
{{ i18n.ts.objectStorageBaseUrlDesc }}
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index ead2250af..1db99e61f 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.color }}
-
+
{{ i18n.ts._role.iconUrl }}
@@ -259,6 +259,26 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
+
{{ i18n.ts._serverSettings.iconUrl }}
-
+
{{ i18n.ts._serverSettings.iconUrl }} (App/192px)
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts._serverSettings.iconUrl }} (App/512px)
@@ -37,27 +37,27 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.bannerUrl }}
-
+
{{ i18n.ts.backgroundImageUrl }}
-
+
{{ i18n.ts.notFoundDescription }}
-
+
{{ i18n.ts.nothing }}
-
+
{{ i18n.ts.somethingHappened }}
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index a508c20cf..b304edbf5 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -115,6 +115,11 @@ const menuDef = $computed(() => [{
text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: currentPage?.route.name === 'emojis',
+ }, {
+ icon: 'ti ti-sparkles',
+ text: i18n.ts.avatarDecorations,
+ to: '/admin/avatar-decorations',
+ active: currentPage?.route.name === 'avatarDecorations',
}, {
icon: 'ti ti-whirl',
text: i18n.ts.federation,
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 8b160635f..59ee04138 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -20,12 +20,12 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.serverRules }}
-
+
{{ i18n.ts.tosUrl }}
-
+
{{ i18n.ts.privacyPolicyUrl }}
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 0af226f02..bceefcf6c 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._moderationLogTypes[log.type] }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
@@ -37,6 +37,9 @@ SPDX-License-Identifier: AGPL-3.0-only
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
: @{{ log.info.noteUserUsername }}{{ log.info.noteUserHost ? '@' + log.info.noteUserHost : '' }}
: @{{ log.info.fileUserUsername }}{{ log.info.fileUserHost ? '@' + log.info.fileUserHost : '' }}
+ : {{ log.info.avatarDecoration.name }}
+ : {{ log.info.before.name }}
+ : {{ log.info.avatarDecoration.name }}
+
+
+
+
raw
diff --git a/packages/frontend/src/pages/admin/object-storage.vue b/packages/frontend/src/pages/admin/object-storage.vue index dbcf135c8..8d27c3106 100644 --- a/packages/frontend/src/pages/admin/object-storage.vue +++ b/packages/frontend/src/pages/admin/object-storage.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+ {{ i18n.ts.enable }}
+ {{ i18n.ts._serverSettings.fanoutTimelineDescription }}
+
+
perLocalUserUserTimelineCacheMax
@@ -165,6 +170,7 @@ let cacheRemoteSensitiveFiles: boolean = $ref(false);
let enableServiceWorker: boolean = $ref(false);
let swPublicKey: any = $ref(null);
let swPrivateKey: any = $ref(null);
+let enableFanoutTimeline: boolean = $ref(false);
let perLocalUserUserTimelineCacheMax: number = $ref(0);
let perRemoteUserUserTimelineCacheMax: number = $ref(0);
let perUserHomeTimelineCacheMax: number = $ref(0);
@@ -185,6 +191,7 @@ async function init(): Promise {
enableServiceWorker = meta.enableServiceWorker;
swPublicKey = meta.swPublickey;
swPrivateKey = meta.swPrivateKey;
+ enableFanoutTimeline = meta.enableFanoutTimeline;
perLocalUserUserTimelineCacheMax = meta.perLocalUserUserTimelineCacheMax;
perRemoteUserUserTimelineCacheMax = meta.perRemoteUserUserTimelineCacheMax;
perUserHomeTimelineCacheMax = meta.perUserHomeTimelineCacheMax;
@@ -206,6 +213,7 @@ async function save(): void {
enableServiceWorker,
swPublicKey,
swPrivateKey,
+ enableFanoutTimeline,
perLocalUserUserTimelineCacheMax,
perRemoteUserUserTimelineCacheMax,
perUserHomeTimelineCacheMax,
diff --git a/packages/frontend/src/pages/announcements.vue b/packages/frontend/src/pages/announcements.vue
index babac9d80..afc6a9828 100644
--- a/packages/frontend/src/pages/announcements.vue
+++ b/packages/frontend/src/pages/announcements.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.forYou }}
- 🆕
+ 🆕
@@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
{{ i18n.ts.gotIt }}
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
new file mode 100644
index 000000000..715f23449
--- /dev/null
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 39ce093cf..5256ea4f1 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 80b94acb6..4573bbb81 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 bee73045b..7450cf97c 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 32a835831..ebf117ffb 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 }}
-
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index fb93637e0..1ed25c9a4 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -36,8 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.stopActivityDelivery }}
{{ i18n.ts.blockThisInstance }}
- {{ i18n.ts.silenceThisInstance }}
- Refresh metadata
+ {{ i18n.ts.silenceThisInstance }}
+ Refresh metadata
@@ -171,8 +171,8 @@ async function fetch(): Promise {
});
suspended = instance.isSuspended;
isBlocked = instance.isBlocked;
- isSilenced = instance.isSilenced;
- faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview');
+ isSilenced = instance.isSilenced;
+ faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview');
}
async function toggleBlock(): Promise {
@@ -183,14 +183,16 @@ async function toggleBlock(): Promise {
blockedHosts: isBlocked ? meta.blockedHosts.concat([host]) : meta.blockedHosts.filter(x => x !== host),
});
}
+
async function toggleSilenced(): Promise {
- if (!meta) throw new Error('No meta?');
- if (!instance) throw new Error('No instance?');
- const { host } = instance;
- await os.api('admin/update-meta', {
- silencedHosts: isSilenced ? meta.silencedHosts.concat([host]) : meta.silencedHosts.filter(x => x !== host),
- });
+ if (!meta) throw new Error('No meta?');
+ if (!instance) throw new Error('No instance?');
+ const { host } = instance;
+ await os.api('admin/update-meta', {
+ silencedHosts: isSilenced ? meta.silencedHosts.concat([host]) : meta.silencedHosts.filter(x => x !== host),
+ });
}
+
async function toggleSuspend(): Promise {
if (!instance) throw new Error('No instance?');
await os.api('admin/federation/update-instance', {
diff --git a/packages/frontend/src/pages/registry.keys.vue b/packages/frontend/src/pages/registry.keys.vue
index a1a5fd0cf..387cb2f1f 100644
--- a/packages/frontend/src/pages/registry.keys.vue
+++ b/packages/frontend/src/pages/registry.keys.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._registry.domain }}
- {{ i18n.ts.system }}
+ {{ props.domain === '@' ? i18n.ts.system : props.domain.toUpperCase() }}
{{ i18n.ts._registry.scope }}
@@ -23,8 +23,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.keys }}
-
{{ i18n.ts._registry.domain }}
- {{ i18n.ts.system }}
+ {{ props.domain === '@' ? i18n.ts.system : props.domain.toUpperCase() }}
{{ i18n.ts._registry.scope }}
@@ -58,6 +58,7 @@ import FormInfo from '@/components/MkInfo.vue';
const props = defineProps<{
path: string;
+ domain: string;
}>();
const scope = $computed(() => props.path.split('/').slice(0, -1));
@@ -70,6 +71,7 @@ function fetchValue() {
os.api('i/registry/get-detail', {
scope,
key,
+ domain: props.domain === '@' ? null : props.domain,
}).then(res => {
value = res;
valueForEditor = JSON5.stringify(res.value, null, '\t');
@@ -95,6 +97,7 @@ async function save() {
scope,
key,
value: JSON5.parse(valueForEditor),
+ domain: props.domain === '@' ? null : props.domain,
});
});
}
@@ -108,6 +111,7 @@ function del() {
os.apiWithDialog('i/registry/remove', {
scope,
key,
+ domain: props.domain === '@' ? null : props.domain,
});
});
}
diff --git a/packages/frontend/src/pages/registry.vue b/packages/frontend/src/pages/registry.vue
index 37a0b5251..d0a3df5de 100644
--- a/packages/frontend/src/pages/registry.vue
+++ b/packages/frontend/src/pages/registry.vue
@@ -9,12 +9,14 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._registry.createKey }}
-
- {{ i18n.ts.system }}
-
+
@@ -28,11 +30,11 @@ import FormLink from '@/components/form/link.vue';
import FormSection from '@/components/form/section.vue';
import MkButton from '@/components/MkButton.vue';
-let scopes = $ref(null);
+let scopesWithDomain = $ref(null);
function fetchScopes() {
- os.api('i/registry/scopes').then(res => {
- scopes = res.slice().sort((a, b) => a.join('/').localeCompare(b.join('/')));
+ os.api('i/registry/scopes-with-domain').then(res => {
+ scopesWithDomain = res;
});
}
diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue
index 3dfd2d661..f8d3187bd 100644
--- a/packages/frontend/src/pages/scratchpad.vue
+++ b/packages/frontend/src/pages/scratchpad.vue
@@ -4,46 +4,46 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
-
+
+ {{ avatarDecoration.name }}
+ {{ avatarDecoration.description }}
+
+
+
+
+
+ {{ i18n.ts.name }}
+
+
+ {{ i18n.ts.description }}
+
+
+ {{ i18n.ts.imageUrl }}
+
+
+
+
@@ -76,7 +80,7 @@ import { useRouter } from '@/router.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { i18n } from '@/i18n.js';
import MkFolder from '@/components/MkFolder.vue';
-import MkSwitch from "@/components/MkSwitch.vue";
+import MkSwitch from '@/components/MkSwitch.vue';
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
@@ -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 911f4e95d..1d41fe752 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 ae9256b8e..1a2fc197f 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 2e6050490..5bce74aa9 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._plugin.installWarn }}
+
+ {{ i18n.ts._externalResourceInstaller[`_${data.type}`].metaTitle }}
+
+
+ {{ i18n.ts._externalResourceInstaller._vendorInfo.title }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts._externalResourceInstaller[`_${data.type}`].title }}
+{{ i18n.ts._externalResourceInstaller.checkVendorBeforeInstall }}
+
+
+
+ {{ i18n.ts.name }}
+ {{ data.meta?.name }}
+
+
+ {{ i18n.ts.author }}
+ {{ data.meta?.author }}
+
+
+
+ {{ i18n.ts.description }}
+ {{ data.meta?.description }}
+
+
+ {{ i18n.ts.version }}
+ {{ data.meta?.version }}
+
+
+ {{ i18n.ts.permission }}
+
+
+
+ {{ i18n.ts._externalResourceInstaller._meta.base }}
+ {{ i18n.ts[data.meta.base] }}
+
+
+
+ {{ i18n.ts._plugin.viewSource }}
+
+
+
+ -
+
- {{ i18n.ts._permissions[permission] }} +
+
+ {{ i18n.ts._externalResourceInstaller._vendorInfo.endpoint }}
+
+
+ {{ i18n.ts._externalResourceInstaller._vendorInfo.hashVerify }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ errorKV?.title }}
+{{ errorKV?.description }}
+
+
- {{ key[0] }}{{ key[1].toUpperCase() }}
+
@@ -46,15 +46,17 @@ import FormSplit from '@/components/form/split.vue';
const props = defineProps<{
path: string;
+ domain: string;
}>();
-const scope = $computed(() => props.path.split('/'));
+const scope = $computed(() => props.path ? props.path.split('/') : []);
let keys = $ref(null);
function fetchKeys() {
os.api('i/registry/keys-with-type', {
scope: scope,
+ domain: props.domain === '@' ? null : props.domain,
}).then(res => {
keys = Object.entries(res).sort((a, b) => a[0].localeCompare(b[0]));
});
diff --git a/packages/frontend/src/pages/registry.value.vue b/packages/frontend/src/pages/registry.value.vue
index ebcb04e9f..68d6c8c1a 100644
--- a/packages/frontend/src/pages/registry.value.vue
+++ b/packages/frontend/src/pages/registry.value.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+ {{ key[0] }}{{ key[1].toUpperCase() }}
- {{ scope.join('/') }}
-
-
+
+ {{ domain.domain ? domain.domain.toUpperCase() : i18n.ts.system }}
+
+
+ {{ scope.length === 0 ? '(root)' : scope.join('/') }}
+
+
-
+
- UI
-
-
+
-
+
+
- {{ i18n.ts.output }}
-
{{ 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 }}
@@ -126,6 +144,7 @@ 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 +165,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(),
@@ -244,6 +267,12 @@ function changeBanner(ev) {
});
}
+function openDecoration(avatarDecoration) {
+ os.popup(defineAsyncComponent(() => import('./profile.avatar-decoration-dialog.vue')), {
+ decoration: avatarDecoration,
+ }, {}, 'closed');
+}
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
@@ -338,4 +367,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.vue b/packages/frontend/src/pages/settings/sounds.vue
index 819e7ffe5..cd1707a59 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -32,20 +32,20 @@ import MkRange from '@/components/MkRange.vue';
import MkButton from '@/components/MkButton.vue';
import FormSection from '@/components/form/section.vue';
import MkFolder from '@/components/MkFolder.vue';
-import { soundConfigStore } from '@/scripts/sound.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { defaultStore } from '@/store.js';
-const masterVolume = computed(soundConfigStore.makeGetterSetter('sound_masterVolume'));
+const masterVolume = computed(defaultStore.makeGetterSetter('sound_masterVolume'));
const soundsKeys = ['note', 'noteMy', 'notification', 'antenna', 'channel'] as const;
const sounds = ref>>({
- note: soundConfigStore.reactiveState.sound_note,
- noteMy: soundConfigStore.reactiveState.sound_noteMy,
- notification: soundConfigStore.reactiveState.sound_notification,
- antenna: soundConfigStore.reactiveState.sound_antenna,
- channel: soundConfigStore.reactiveState.sound_channel,
+ note: defaultStore.reactiveState.sound_note,
+ noteMy: defaultStore.reactiveState.sound_noteMy,
+ notification: defaultStore.reactiveState.sound_notification,
+ antenna: defaultStore.reactiveState.sound_antenna,
+ channel: defaultStore.reactiveState.sound_channel,
});
async function updated(type: keyof typeof sounds.value, sound) {
@@ -54,14 +54,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/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 155ce9d9d..7fa7b23e4 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -18,60 +18,41 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 8cc540779..cfe270aef 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -8,7 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
-
+
+
-
+ UI
+
+
+
+ {{ i18n.ts.output }}
+
+
+
-
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 5e4889f61..f6e387da5 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ log.text }}
+
+
+
+
+ {{ log.text }}
+
+ {{ i18n.ts.scratchpadDescription }}
-
-
-
- {{ i18n.ts.scratchpadDescription }}
-
- {{ i18n.ts._profile.changeAvatar }}
+
+
+ {{ avatarDecoration.name }}
+
+
-
+ {{ i18n.ts._timelineDescription[src] }}
+