Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into multiple-reactions

Browse source
This commit is contained in:
syuilo 2024-08-18 13:22:22 +09:00
commit 0ddd4bc545
12 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkPreview.vue
View file

@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div :class="$style.preview">
<div :class="$style.preview__content1">
<div>
<MkInput v-model="text">
<template #label>Text</template>
</MkInput>

2
packages/frontend/src/components/MkRolePreview.vue
View file

@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<span :class="$style.bodyName">{{ role.name }}</span>
<template v-if="detailed">
<span v-if="role.target === 'manual'" :class="$style.bodyUsers">{{ role.usersCount }} users</span>
<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">({{ i18n.ts._role.conditional }})</span>
<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">? users</span>
</template>
</div>
<div :class="$style.bodyDescription">{{ role.description }}</div>

4
packages/frontend/src/pages/about-misskey.vue
View file

@ -72,10 +72,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@syuilo</span>
</a>
<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@tamaina</span>
</a>
<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@acid-chicken</span>

6
packages/frontend/src/pages/flash/flash.vue
View file

@ -236,10 +236,12 @@ function reportAbuse() {
const pageUrl = `${url}/play/${flash.value.id}`;
os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
user: flash.value.user,
initialComment: `Play: ${pageUrl}\n-----\n`,
}, {}, 'closed');
}, {
closed: () => dispose(),
});
}
function showMenu(ev: MouseEvent) {

6
packages/frontend/src/pages/gallery/post.vue
View file

@ -160,10 +160,12 @@ function reportAbuse() {
const pageUrl = `${url}/gallery/${post.value.id}`;
os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
user: post.value.user,
initialComment: `Post: ${pageUrl}\n-----\n`,
}, {}, 'closed');
}, {
closed: () => dispose(),
});
}
function showMenu(ev: MouseEvent) {

6
packages/frontend/src/pages/page.vue
View file

@ -245,10 +245,12 @@ function reportAbuse() {
const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
user: page.value.user,
initialComment: `Page: ${pageUrl}\n-----\n`,
}, {}, 'closed');
}, {
closed: () => dispose(),
});
}
function showMenu(ev: MouseEvent) {