{{ code }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index e9236b38a..96687a336 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 118852d71..b62f4324e 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.vue b/packages/frontend/src/components/MkDrive.vue
index 3fbbd536e..528154192 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 d0f1d63e6..2af7a76a3 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 e889dd3cf..65afc48f0 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 be282bbfd..b245b1b7f 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/MkInput.vue b/packages/frontend/src/components/MkInput.vue
index 9918a3ff6..6979250c6 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/MkMention.vue b/packages/frontend/src/components/MkMention.vue
index e9cc9d5f4..2e8f9e26d 100644
--- a/packages/frontend/src/components/MkMention.vue
+++ b/packages/frontend/src/components/MkMention.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
+ ![]()
@{{ username }}
@{{ toUnicode(host) }}
@@ -15,11 +15,12 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 03d8da439..922c3a3a0 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/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index fa0438419..22424a64a 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -4,13 +4,16 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 2ae3fc89c..fa1c09d84 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -17,6 +17,7 @@ import MkSparkle from '@/components/MkSparkle.vue';
import MkA from '@/components/global/MkA.vue';
import { host } from '@/config.js';
import { defaultStore } from '@/store.js';
+import { nyaize as doNyaize } from '@/scripts/nyaize.js';
const QUOTE_STYLE = `
display: block;
@@ -27,21 +28,27 @@ border-left: solid 3px var(--fg);
opacity: 0.7;
`.split('\n').join(' ');
-export default function(props: {
+type MfmProps = {
text: string;
plain?: boolean;
nowrap?: boolean;
author?: Misskey.entities.UserLite;
- i?: Misskey.entities.UserLite;
+ i?: Misskey.entities.UserLite | null;
isNote?: boolean;
emojiUrls?: string[];
rootScale?: number;
-}) {
- const isNote = props.isNote !== undefined ? props.isNote : true;
+ nyaize: boolean | 'account';
+};
+// eslint-disable-next-line import/no-default-export
+export default function(props: MfmProps) {
+ const isNote = props.isNote ?? true;
+ const shouldNyaize = props.nyaize ? props.nyaize === 'account' ? props.author?.isCat ? props.author?.speakAsCat : false : false : false;
+
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (props.text == null || props.text === '') return;
- const ast = (props.plain ? mfm.parseSimple : mfm.parse)(props.text);
+ const rootAst = (props.plain ? mfm.parseSimple : mfm.parse)(props.text);
const validTime = (t: string | null | undefined) => {
if (t == null) return null;
@@ -54,11 +61,15 @@ export default function(props: {
* Gen Vue Elements from MFM AST
* @param ast MFM AST
* @param scale How times large the text is
+ * @param disableNyaize Whether nyaize is disabled or not
*/
- const genEl = (ast: mfm.MfmNode[], scale: number) => ast.map((token): VNode | string | (VNode | string)[] => {
+ const genEl = (ast: mfm.MfmNode[], scale: number, disableNyaize = false) => ast.map((token): VNode | string | (VNode | string)[] => {
switch (token.type) {
case 'text': {
- const text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
+ let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
+ if (!disableNyaize && shouldNyaize) {
+ text = doNyaize(text);
+ }
if (!props.plain) {
const res: (VNode | string)[] = [];
@@ -260,7 +271,7 @@ export default function(props: {
key: Math.random(),
url: token.props.url,
rel: 'nofollow noopener',
- }, genEl(token.children, scale))];
+ }, genEl(token.children, scale, true))];
}
case 'mention': {
@@ -299,11 +310,11 @@ export default function(props: {
if (!props.nowrap) {
return [h('div', {
style: QUOTE_STYLE,
- }, genEl(token.children, scale))];
+ }, genEl(token.children, scale, true))];
} else {
return [h('span', {
style: QUOTE_STYLE,
- }, genEl(token.children, scale))];
+ }, genEl(token.children, scale, true))];
}
}
@@ -358,7 +369,7 @@ export default function(props: {
}
case 'plain': {
- return [h('span', genEl(token.children, scale))];
+ return [h('span', genEl(token.children, scale, true))];
}
default: {
@@ -373,5 +384,5 @@ export default function(props: {
return h('span', {
// https://codeday.me/jp/qa/20190424/690106.html
style: props.nowrap ? 'white-space: pre; word-wrap: normal; overflow: hidden; text-overflow: ellipsis;' : 'white-space: pre-wrap;',
- }, genEl(ast, props.rootScale ?? 1));
+ }, genEl(rootAst, props.rootScale ?? 1));
}
diff --git a/packages/frontend/src/components/global/MkPageHeader.tabs.vue b/packages/frontend/src/components/global/MkPageHeader.tabs.vue
index 57e41ed06..b98750da4 100644
--- a/packages/frontend/src/components/global/MkPageHeader.tabs.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.tabs.vue
@@ -134,9 +134,11 @@ async function enter(el: HTMLElement) {
setTimeout(renderTab, 170);
}
+
function afterEnter(el: HTMLElement) {
//el.style.width = '';
}
+
async function leave(el: HTMLElement) {
const elementWidth = el.getBoundingClientRect().width;
el.style.width = elementWidth + 'px';
@@ -145,6 +147,7 @@ async function leave(el: HTMLElement) {
el.style.width = '0';
el.style.paddingLeft = '0';
}
+
function afterLeave(el: HTMLElement) {
el.style.width = '';
}
diff --git a/packages/frontend/src/components/global/MkTime.vue b/packages/frontend/src/components/global/MkTime.vue
index d06aa036e..5ba13ca3f 100644
--- a/packages/frontend/src/components/global/MkTime.vue
+++ b/packages/frontend/src/components/global/MkTime.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
- {{ i18n.ts._aboutMisskey.contributors }}
+ {{ i18n.ts._aboutMisskey.projectMembers }}
- Our lovely GitHub Sponsors
+ Our lovely Sponsors
@@ -70,22 +70,18 @@ SPDX-License-Identifier: AGPL-3.0-only
- 
+ 
- 
- 
+
{{ i18n.ts.manageCustomEmojis }}
-
+
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index 3fd8db30f..8da2b0ab6 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
@@ -113,6 +121,7 @@ const onChangePublishing = (v) => {
publishing = v;
refresh();
};
+
// 選択された曜日(index)のビットフラグを操作する
function toggleDayOfWeek(ad, index) {
ad.dayOfWeek ^= 1 << index;
@@ -185,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 816922b3a..23ba8f3a1 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.text }}
-
+
{{ i18n.ts.imageUrl }}
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index 034681c76..81077491c 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 595438b80..afaeebaee 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._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 ae536265d..e9ea6e8eb 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 eaeac971a..e29bd16e7 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -34,9 +34,9 @@ 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 }}
-
+
@@ -61,8 +63,14 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.memo }}
-
+
{{ 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 55fb1fc28..758e77797 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -129,6 +129,11 @@ const menuDef = $computed(() => [{
text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: currentPage?.route.name === 'emojis',
+ }, {
+ icon: 'ph-sparkle ph-bold ph-lg',
+ text: i18n.ts.avatarDecorations,
+ to: '/avatar-decorations',
+ active: currentPage?.route.name === 'avatarDecorations',
}, {
icon: 'ph-globe-hemisphere-west ph-bold ph-lg',
text: i18n.ts.federation,
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 193dd9f08..fff462976 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -24,13 +24,13 @@ 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 ffb03cfa2..d41834836 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 : '' }}
@@ -18,8 +18,8 @@ SPDX-License-Identifier: AGPL-3.0-only
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}
- : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} {{ log.info.roleName }}
- : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} {{ log.info.roleName }}
+ : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} {{ log.info.roleName }}
+ : @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} {{ log.info.roleName }}
: {{ log.info.role.name }}
: {{ log.info.before.name }}
: {{ log.info.role.name }}
@@ -38,6 +38,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 71900fd30..cd1f4ca60 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/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
new file mode 100644
index 000000000..47faeb594
--- /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 0417f2b0c..e6c7fc0b4 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -154,12 +154,9 @@ function save() {
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/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index d45e26408..3840d4058 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 8bb293eeb..daf678316 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 96b057d98..a3276dba6 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/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue
index 02bfa949d..6800481d5 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 }}
+
+
+
+
-
+
{{ 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 905086f04..83c61f74e 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index b9dd3e6e8..abba31f1f 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 }}
+
+
-
+
- UI
-
-
+
-
+
+
- {{ i18n.ts.output }}
-
{{ i18n.ts._profile.changeBackground }}
@@ -89,6 +89,24 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._profile.metadataDescription }}
+
+
+ {{ i18n.ts.avatarDecorations }}
+
+
+
{{ i18n.ts.advancedSettings }}
@@ -133,6 +151,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 now = new Date();
@@ -163,6 +182,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(),
@@ -295,6 +318,12 @@ function changeBackground(ev) {
});
}
+function openDecoration(avatarDecoration) {
+ os.popup(defineAsyncComponent(() => import('./profile.avatar-decoration-dialog.vue')), {
+ decoration: avatarDecoration,
+ }, {}, 'closed');
+}
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
@@ -394,4 +423,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/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 428dc16f6..9931bf8a7 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
+
-
-
+
+
-
+ UI
+
+
+
+ {{ i18n.ts.output }}
+
+
+
-
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 10705cfa0..c79e99cda 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 }}
+
+