- {{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}
- {{ cancelText ?? i18n.ts.cancel }}
+ {{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}
+ {{ cancelText ?? i18n.ts.cancel }}
+
-
-
{{ i18n.ts.sensitive }}{{ defaultStore.state.enableDataSaverMode ? ` (${i18n.ts.image}${image.size ? ' ' + bytes(image.size) : ''})` : '' }}
@@ -20,8 +20,10 @@
+
@@ -33,6 +35,8 @@ import bytes from '@/filters/bytes';
import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
import { defaultStore } from '@/store';
import { i18n } from '@/i18n';
+import * as os from '@/os';
+import { iAmModerator } from '@/account';
const props = defineProps<{
image: misskey.entities.DriveFile;
@@ -46,7 +50,7 @@ const url = $computed(() => (props.raw || defaultStore.state.loadRawImages)
? props.image.url
: defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(props.image.url)
- : props.image.thumbnailUrl
+ : props.image.thumbnailUrl,
);
// Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
@@ -56,6 +60,17 @@ watch(() => props.image, () => {
deep: true,
immediate: true,
});
+
+function showMenu(ev: MouseEvent) {
+ os.popupMenu([...(iAmModerator ? [{
+ text: i18n.ts.markAsSensitive,
+ icon: 'ti ti-eye-off',
+ action: () => {
+ os.apiWithDialog('drive/files/update', { fileId: props.image.id, isSensitive: true });
+ },
+ }] : [])], ev.currentTarget ?? ev.target);
+}
+
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index d28c78fe5..e456ff3ee 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -7,7 +7,6 @@
:class="[
$style.medias,
count <= 4 ? $style['n' + count] : $style.nMany,
- $style[`n1${defaultStore.reactiveState.mediaListWithOneImageAppearance.value}`]
]"
>
@@ -44,37 +43,6 @@ const pswpZIndex = os.claimZIndex('middle');
document.documentElement.style.setProperty('--mk-pswp-root-z-index', pswpZIndex.toString());
const count = $computed(() => props.mediaList.filter(media => previewable(media)).length);
-function calcAspectRatio() {
- if (!gallery.value) return;
-
- let img = props.mediaList[0];
-
- if (props.mediaList.length !== 1 || !(img.properties.width && img.properties.height)) {
- gallery.value.style.aspectRatio = '';
- return;
- }
-
- // アスペクト比上限設定では、横長の場合は高さを縮小させる
- const ratioMax = (ratio: number) => `${Math.max(ratio, img.properties.width / img.properties.height).toString()} / 1`;
-
- switch (defaultStore.state.mediaListWithOneImageAppearance) {
- case '16_9':
- gallery.value.style.aspectRatio = ratioMax(16 / 9);
- break;
- case '1_1':
- gallery.value.style.aspectRatio = ratioMax(1);
- break;
- case '2_3':
- gallery.value.style.aspectRatio = ratioMax(2 / 3);
- break;
- default:
- gallery.value.style.aspectRatio = '';
- break;
- }
-}
-
-watch([defaultStore.reactiveState.mediaListWithOneImageAppearance, gallery], () => calcAspectRatio());
-
onMounted(() => {
const lightbox = new PhotoSwipeLightbox({
dataSource: props.mediaList
@@ -194,36 +162,12 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
display: grid;
grid-gap: 8px;
+ // for webkit
height: 100%;
&.n1 {
+ aspect-ratio: 16/9;
grid-template-rows: 1fr;
-
- // default (expand)
- min-height: 64px;
- max-height: clamp(
- 64px,
- calc(var(--containerHeight, 100svh) * 0.5), // but --containerHeight can broken (too big)
- min(334px, 50vh)
- );
-
- &.n116_9 {
- min-height: none;
- max-height: none;
- aspect-ratio: 16 / 9; // fallback
- }
-
- &.n11_1{
- min-height: none;
- max-height: none;
- aspect-ratio: 1 / 1; // fallback
- }
-
- &.n12_3 {
- min-height: none;
- max-height: none;
- aspect-ratio: 2 / 3; // fallback
- }
}
&.n2 {
diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index 2d2f8411f..63c55b904 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -1,15 +1,15 @@
GIF
ALT
+ NSFW
-
-
-
+
+ (null);
let bannerId = $ref(null);
-let color = $ref(null);
+let color = $ref('#000');
const pinnedNotes = ref([]);
watch(() => bannerId, async () => {
@@ -151,6 +152,23 @@ function save() {
}
}
+async function archive() {
+ const { canceled } = await os.confirm({
+ type: 'warning',
+ title: i18n.t('channelArchiveConfirmTitle', { name: name }),
+ text: i18n.ts.channelArchiveConfirmDescription,
+ });
+
+ if (canceled) return;
+
+ os.api('channels/update', {
+ channelId: props.channelId,
+ isArchived: true,
+ }).then(() => {
+ os.success();
+ });
+}
+
function setBannerImage(evt) {
selectFile(evt.currentTarget ?? evt.target, null).then(file => {
bannerId = file.id;
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 437c1fae3..af1b4d205 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -28,6 +28,8 @@
+
+
-
+
@@ -24,12 +24,12 @@ const props = withDefaults(defineProps<{
withOkButton: boolean;
okButtonDisabled: boolean;
width: number;
- height: number | null;
+ height: number;
}>(), {
withOkButton: false,
okButtonDisabled: false,
width: 400,
- height: null,
+ height: 500,
});
const emit = defineEmits<{
@@ -81,15 +81,13 @@ defineExpose({
});
-
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 4273af51e..d95f8de31 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -695,6 +695,7 @@ function showReactions(): void {
position: absolute;
bottom: 0;
left: 0;
+ z-index: 2;
width: 100%;
height: 64px;
background: linear-gradient(0deg, var(--panel), var(--X15));
diff --git a/packages/frontend/src/components/MkSample.vue b/packages/frontend/src/components/MkSample.vue
index 7a3bc2088..922b862b4 100644
--- a/packages/frontend/src/components/MkSample.vue
+++ b/packages/frontend/src/components/MkSample.vue
@@ -87,7 +87,7 @@ export default defineComponent({
},
async openDrive() {
- os.selectDriveFile();
+ os.selectDriveFile(false);
},
async selectUser() {
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 2de890186..4efb65c28 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -1,13 +1,13 @@
-
-
+ {{ i18n.ts._role._options.alwaysMarkNsfw }}
+
+ {{ i18n.ts._role.useBaseValue }}
+ {{ role.policies.alwaysMarkNsfw.value ? i18n.ts.yes : i18n.ts.no }}
+
+
+
+
{{ i18n.ts._role._options.pinMax }}
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index a1e467edb..e8dbe1c5f 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -75,6 +75,14 @@
+
+ {{ i18n.ts._role._options.alwaysMarkNsfw }}
+ {{ policies.alwaysMarkNsfw ? i18n.ts.yes : i18n.ts.no }}
+
+ {{ i18n.ts.enable }}
+
+
+
{{ i18n.ts._role._options.pinMax }}
{{ policies.pinLimit }}
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 488738f31..a74ab4047 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -46,8 +46,9 @@
-
-
{{ i18n.ts._role._options.driveCapacity }}
@@ -231,6 +231,26 @@
+
+ {{ i18n.ts.save }}
@@ -169,121 +169,116 @@ function show(ev: MouseEvent) {
}
-
-
diff --git a/packages/frontend/src/components/MkUserList.vue b/packages/frontend/src/components/MkUserList.vue
index 51eb426e9..3571ca84d 100644
--- a/packages/frontend/src/components/MkUserList.vue
+++ b/packages/frontend/src/components/MkUserList.vue
@@ -8,7 +8,7 @@
-
+
-
+
+
;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
new file mode 100644
index 000000000..adb8d4334
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
@@ -0,0 +1,101 @@
+
+;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.vue b/packages/frontend/src/components/MkUserSetupDialog.User.vue
new file mode 100644
index 000000000..d66f34f16
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.vue
@@ -0,0 +1,101 @@
+
+;
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
new file mode 100644
index 000000000..096b88c30
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -0,0 +1,145 @@
+
+
+ {{ i18n.ts.initialAccountSetting }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue
index d074fdd15..33e594acd 100644
--- a/packages/frontend/src/components/MkWidgets.vue
+++ b/packages/frontend/src/components/MkWidgets.vue
@@ -2,11 +2,11 @@
-
+
{{ i18n.ts.selectWidget }}
- {{ i18n.ts.add }}
+ {{ i18n.ts.add }}
{{ i18n.ts.close }}
- ;
+export const Long = {
+ ...Default,
+ args: {
+ ...Default.args,
+ user: {
+ ...userDetailed(),
+ username: 'the_quick_brown_fox_jumped_over_the_lazy_dog',
+ host: 'misskey.example',
+ },
+ },
+ decorators: [
+ () => ({
+ template: ';
+export const VeryLong = {
+ ...Default,
+ args: {
+ ...Default.args,
+ user: {
+ ...userDetailed(),
+ username: '2c7cc62a697ea3a7826521f3fd34f0cb273693cbe5e9310f35449f43622a5cdc',
+ host: 'the.quick.brown.fox.jumped.over.the.lazy.dog.very.long.hostname.nostr.example',
+ },
+ },
+ decorators: [
+ () => ({
+ template: ';
diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue
index 2b9f892fc..59358aef7 100644
--- a/packages/frontend/src/components/global/MkAcct.vue
+++ b/packages/frontend/src/components/global/MkAcct.vue
@@ -1,5 +1,9 @@
-
+
+ @{{ user.username }}
+ @{{ user.host || host }}
+
+
@{{ user.username }}
@{{ user.host || host }}
@@ -8,6 +12,7 @@
+
+
+
+
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index 710edd797..b91d378b1 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -156,7 +156,7 @@ onUnmounted(() => {
}
&.thin {
- --height: 42px;
+ --height: 40px;
> .buttons {
> .button {
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index 63e8fc225..4ef8111da 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -5,6 +5,7 @@ import MkA from './global/MkA.vue';
import MkAcct from './global/MkAcct.vue';
import MkAvatar from './global/MkAvatar.vue';
import MkEmoji from './global/MkEmoji.vue';
+import MkCondensedLine from './global/MkCondensedLine.vue';
import MkCustomEmoji from './global/MkCustomEmoji.vue';
import MkUserName from './global/MkUserName.vue';
import MkEllipsis from './global/MkEllipsis.vue';
@@ -33,6 +34,7 @@ export const components = {
MkAcct: MkAcct,
MkAvatar: MkAvatar,
MkEmoji: MkEmoji,
+ MkCondensedLine: MkCondensedLine,
MkCustomEmoji: MkCustomEmoji,
MkUserName: MkUserName,
MkEllipsis: MkEllipsis,
@@ -55,6 +57,7 @@ declare module '@vue/runtime-core' {
MkAcct: typeof MkAcct;
MkAvatar: typeof MkAvatar;
MkEmoji: typeof MkEmoji;
+ MkCondensedLine: typeof MkCondensedLine;
MkCustomEmoji: typeof MkCustomEmoji;
MkUserName: typeof MkUserName;
MkEllipsis: typeof MkEllipsis;
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index 38af9eac9..aaa3d1030 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -61,6 +61,7 @@ export const ROLE_POLICIES = [
'canSearchNotes',
'canHideAds',
'driveCapacityMb',
+ 'alwaysMarkNsfw',
'pinLimit',
'antennaLimit',
'wordMuteLimit',
diff --git a/packages/frontend/src/directives/container.ts b/packages/frontend/src/directives/container.ts
deleted file mode 100644
index a8a93eb9b..000000000
--- a/packages/frontend/src/directives/container.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Directive } from 'vue';
-
-const map = new WeakMap();
-
-export default {
- mounted(el: HTMLElement, binding, vn) {
- const ro = new ResizeObserver((entries, observer) => {
- el.style.setProperty('--containerHeight', el.offsetHeight + 'px');
- });
- ro.observe(el);
- map.set(el, ro);
- },
-
- unmounted(el, binding, vn) {
- const ro = map.get(el);
- if (ro) {
- ro.disconnect();
- map.delete(el);
- }
- },
-} as Directive;
diff --git a/packages/frontend/src/directives/index.ts b/packages/frontend/src/directives/index.ts
index 064ee4f64..7847d661d 100644
--- a/packages/frontend/src/directives/index.ts
+++ b/packages/frontend/src/directives/index.ts
@@ -11,7 +11,6 @@ import clickAnime from './click-anime';
import panel from './panel';
import adaptiveBorder from './adaptive-border';
import adaptiveBg from './adaptive-bg';
-import container from './container';
export default function(app: App) {
for (const [key, value] of Object.entries(directives)) {
@@ -32,5 +31,4 @@ export const directives = {
'panel': panel,
'adaptive-border': adaptiveBorder,
'adaptive-bg': adaptiveBg,
- 'container': container,
};
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index d40b76132..49e7bb400 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -343,6 +343,16 @@ if ($i) {
// only add post shortcuts if logged in
hotkeys['p|n'] = post;
+ if (defaultStore.state.accountSetupWizard !== -1) {
+ // このウィザードが実装される前に登録したユーザーには表示させないため
+ // TODO: そのうち消す
+ if (Date.now() - new Date($i.createdAt).getTime() < 1000 * 60 * 60 * 24) {
+ popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {}, 'closed');
+ } else {
+ defaultStore.set('accountSetupWizard', -1);
+ }
+ }
+
if ($i.isDeleted) {
alert({
type: 'warning',
@@ -449,7 +459,7 @@ if ($i) {
const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
- if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3)))) {
+ if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
}
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 67acee5ac..c4f9d47d7 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -19,6 +19,7 @@ import MkContextMenu from '@/components/MkContextMenu.vue';
import { MenuItem } from '@/types/menu';
import copyToClipboard from './scripts/copy-to-clipboard';
import { showMovedDialog } from './scripts/show-moved-dialog';
+import { DriveFile } from 'misskey-js/built/entities';
export const openingWindowsCount = ref(0);
@@ -420,7 +421,7 @@ export async function selectUser(opts: { includeSelf?: boolean } = {}) {
});
}
-export async function selectDriveFile(multiple: boolean) {
+export async function selectDriveFile(multiple: boolean): Promise {
return new Promise((resolve, reject) => {
popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
type: 'file',
@@ -428,7 +429,7 @@ export async function selectDriveFile(multiple: boolean) {
}, {
done: files => {
if (files) {
- resolve(multiple ? files : files[0]);
+ resolve(files);
}
},
}, 'closed');
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index dbbe4c468..e592c629c 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -141,6 +141,9 @@ const patronsWithIcon = [{
}, {
name: 'ぺんぎん',
icon: 'https://misskey-hub.net/patrons/6a652e0534ff4cb1836e7ce4968d76a7.jpg',
+}, {
+ name: 'かみらえっと',
+ icon: 'https://misskey-hub.net/patrons/be1326bda7d940a482f3758ffd9ffaf6.jpg',
}];
const patrons = [
@@ -234,6 +237,7 @@ const patrons = [
'けそ',
'ずも',
'binvinyl',
+ '渡志郎',
];
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 48f4917c3..49942c87c 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -210,7 +210,7 @@
-
+
+ {{ i18n.ts._initialAccountSetting.theseSettingsCanEditLater }}
+
+
+ {{ i18n.ts.avatar }}
+
+
+
+ {{ i18n.ts._profile.name }}
+
+
+
+ {{ i18n.ts._profile.description }}
+
+
+ {{ i18n.ts._initialAccountSetting.youCanEditMoreSettingsInSettingsPageLater }}
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts
new file mode 100644
index 000000000..7413f4884
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts
@@ -0,0 +1,32 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { StoryObj } from '@storybook/vue3';
+import { userDetailed } from '../../.storybook/fakes';
+import MkUserSetupDialog_User from './MkUserSetupDialog.User.vue';
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkUserSetupDialog_User,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+
+ {{ i18n.ts._profile.changeAvatar }}
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
new file mode 100644
index 000000000..55790602d
--- /dev/null
+++ b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
@@ -0,0 +1,51 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { StoryObj } from '@storybook/vue3';
+import { rest } from 'msw';
+import { commonHandlers } from '../../.storybook/mocks';
+import { userDetailed } from '../../.storybook/fakes';
+import MkUserSetupDialog from './MkUserSetupDialog.vue';
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkUserSetupDialog,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+
+
+
+
+ {{ i18n.ts.noAccountDescription }}
+
+ {{ i18n.ts.follow }}
+
+{{ i18n.ts.youFollowing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._initialAccountSetting.profileSetting }}
+
+ {{ i18n.ts._initialAccountSetting.accountCreated }}
+ {{ i18n.ts._initialAccountSetting.letsStartAccountSetup }}
+
+
+ {{ i18n.ts.continue }}
+
+
+
+
+
+
+ {{ i18n.ts.continue }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.continue }}
+
+ {{ i18n.ts.pushNotification }}
+ {{ i18n.t('_initialAccountSetting.pushNotificationDescription', { name: instance.name ?? host }) }}
+
+
+
+
+
+
+
+
+ {{ instance.name ?? host }}
+
+ {{ i18n.ts.help }}
+
+
+ {{ i18n.ts.close }}
+
+ {{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}
+ {{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}
+
+
@@ -541,7 +541,7 @@ defineExpose({
flex: 1;
overflow: auto;
background: var(--panel);
- container-type: inline-size;
+ container-type: size;
}
$handleSize: 8px;
diff --git a/packages/frontend/src/components/global/MkAcct.stories.impl.ts b/packages/frontend/src/components/global/MkAcct.stories.impl.ts
index d5e3fc356..9d5fd3947 100644
--- a/packages/frontend/src/components/global/MkAcct.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkAcct.stories.impl.ts
@@ -41,3 +41,35 @@ export const Detail = {
detail: true,
},
} satisfies StoryObj
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
@@ -80,7 +81,7 @@ let name = $ref(null);
let description = $ref(null);
let bannerUrl = $ref
+ {{ i18n.ts.thisChannelArchived }}
+
+
+
+
+
+
+
+ {{ i18n.ts.search }}
+
+
@@ -63,8 +76,10 @@ import { deviceKind } from '@/scripts/device-kind';
import MkNotes from '@/components/MkNotes.vue';
import { url } from '@/config';
import MkButton from '@/components/MkButton.vue';
+import MkInput from '@/components/MkInput.vue';
import { defaultStore } from '@/store';
import MkNote from '@/components/MkNote.vue';
+import MkInfo from '@/components/MkInfo.vue';
import MkFoldableSection from '@/components/MkFoldableSection.vue';
const router = useRouter();
@@ -76,6 +91,8 @@ const props = defineProps<{
let tab = $ref('timeline');
let channel = $ref(null);
let favorited = $ref(false);
+let searchQuery = $ref('');
+let searchPagination = $ref();
const featuredPagination = $computed(() => ({
endpoint: 'notes/featured' as const,
limit: 10,
@@ -123,6 +140,21 @@ async function unfavorite() {
});
}
+async function search() {
+ const query = searchQuery.toString().trim();
+
+ if (query == null) return;
+
+ searchPagination = {
+ endpoint: 'notes/search',
+ limit: 10,
+ params: {
+ query: searchQuery,
+ channelId: channel.id,
+ },
+ };
+}
+
const headerActions = $computed(() => {
if (channel && channel.userId) {
const share = {
@@ -160,6 +192,10 @@ const headerTabs = $computed(() => [{
key: 'featured',
title: i18n.ts.featured,
icon: 'ti ti-bolt',
+}, {
+ key: 'search',
+ title: i18n.ts.search,
+ icon: 'ti ti-search',
}]);
definePageMetadata(computed(() => channel ? {
@@ -170,7 +206,7 @@ definePageMetadata(computed(() => channel ? {
+
diff --git a/packages/frontend/src/pages/timeline.tutorial.vue b/packages/frontend/src/pages/timeline.tutorial.vue
index 0d0c932a5..32228d28f 100644
--- a/packages/frontend/src/pages/timeline.tutorial.vue
+++ b/packages/frontend/src/pages/timeline.tutorial.vue
@@ -1,7 +1,7 @@
@@ -80,15 +44,16 @@
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 9f13f7a1d..1bf4cdc99 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -3,7 +3,7 @@
-
+
{{ i18n.ts._tutorial.title }}
+ {{ i18n.ts._timelineTutorial.title }}
-
{{ i18n.ts._tutorial.step1_1 }}
- {{ i18n.ts._tutorial.step1_2 }}
- {{ i18n.ts._tutorial.step1_3 }}
+ {{ i18n.t('_timelineTutorial.step1_1', { name: instance.name ?? host }) }}
+ {{ i18n.t('_timelineTutorial.step1_2', { name: instance.name ?? host }) }}
- {{ i18n.ts.editProfile }}
+
{{ i18n.ts._tutorial.step2_1 }}
- {{ i18n.ts._tutorial.step2_2 }}
- {{ i18n.ts._timelineTutorial.step2_1 }}
+ {{ i18n.t('_timelineTutorial.step2_2', { name: instance.name ?? host }) }}
-
{{ i18n.ts._tutorial.step3_1 }}
- {{ i18n.ts._tutorial.step3_2 }}
- {{ i18n.ts._tutorial.step3_3 }}
- {{ i18n.ts._tutorial.step3_4 }}
+ {{ i18n.ts._timelineTutorial.step3_1 }}
+ {{ i18n.ts._timelineTutorial.step3_2 }}
-
- {{ i18n.ts._tutorial.step4_1 }}
- {{ i18n.ts._tutorial.step4_2 }}
-
-
-
- {{ i18n.ts.featured }}
-
-
- {{ i18n.ts.explore }}
-
-
-
- {{ i18n.ts._tutorial.step5_1 }}
- {{ i18n.ts._tutorial.step5_3 }}
- {{ i18n.ts._tutorial.step5_4 }}
-
-
-
- {{ i18n.ts._tutorial.step6_1 }}
- {{ i18n.ts._tutorial.step6_2 }}
- {{ i18n.ts._tutorial.step6_3 }}
-
-
{{ i18n.ts._tutorial.step8_1 }}
- {{ i18n.ts._tutorial.step8_2 }}
- {{ i18n.ts._tutorial.step8_3 }}
+ {{ i18n.ts._timelineTutorial.step4_1 }}
+ {{ i18n.ts._timelineTutorial.step4_2 }}
- {{ i18n.ts.noThankYou }}
+ {{ i18n.ts.done }}
- {{ i18n.ts.next }}
+ {{ i18n.ts.next }}
-
(null);
let bannerEl = $ref(null);
let memoTextareaEl = $ref(null);
let memoDraft = $ref(props.user.memo);
-
let isEditingMemo = $ref(false);
+let moderationNote = $ref(props.user.moderationNote);
+let editModerationNote = $ref(false);
+
+watch($$(moderationNote), async () => {
+ await os.api('admin/update-user-note', { userId: props.user.id, text: moderationNote });
+});
const pagination = {
endpoint: 'users/notes' as const,
@@ -426,6 +441,10 @@ onUnmounted(() => {
}
}
+ > .moderationNote {
+ margin: 12px 24px 0 154px;
+ }
+
> .memo {
margin: 12px 24px 0 154px;
background: transparent;
@@ -439,6 +458,7 @@ onUnmounted(() => {
text-align: left;
color: var(--fgTransparent);
line-height: 1.5;
+ font-size: 85%;
}
textarea {
@@ -593,6 +613,10 @@ onUnmounted(() => {
justify-content: center;
}
+ > .moderationNote {
+ margin: 16px 16px 0 16px;
+ }
+
> .memo {
margin: 16px 16px 0 16px;
}
diff --git a/packages/frontend/src/pages/welcome.setup.vue b/packages/frontend/src/pages/welcome.setup.vue
index 212d156a8..7728d97a6 100644
--- a/packages/frontend/src/pages/welcome.setup.vue
+++ b/packages/frontend/src/pages/welcome.setup.vue
@@ -1,8 +1,11 @@
-
-
+
@@ -42,6 +42,20 @@
+
+ ![]()
+ {{ role.name }}
+
+
+
+
+ Moderation note
+
+
+ Add moderation note
+
+
-
- ![]()
- {{ role.name }}
-
-