summaryrefslogtreecommitdiff
path: root/packages/frontend
diff options
context:
space:
mode:
authorzyoshoka <107108195+zyoshoka@users.noreply.github.com>2024-08-17 15:01:08 +0900
committerGitHub <noreply@github.com>2024-08-17 15:01:08 +0900
commitfd744f44c1ee7aff71d9dba6096cc9ffcb934271 (patch)
tree10edf1a76a915182a87e260bc7c2ba60d337e825 /packages/frontend
parent:art: (diff)
downloadmisskey-fd744f44c1ee7aff71d9dba6096cc9ffcb934271.tar.gz
misskey-fd744f44c1ee7aff71d9dba6096cc9ffcb934271.tar.bz2
misskey-fd744f44c1ee7aff71d9dba6096cc9ffcb934271.zip
enhance(backend): ページ、ギャラリー、Playのモデレーション強化 (#13523)
* enhance(backend): Page、ギャラリー、Playのモデレーション強化 * Update CHANGELOG.md * fix: update misskey-js * refactor(frontend): use `MkA` * Update CHANGELOG.md * fix(i18n): Page -> ページ
Diffstat (limited to 'packages/frontend')
-rw-r--r--packages/frontend/src/components/MkAbuseReportWindow.vue2
-rw-r--r--packages/frontend/src/components/global/MkAcct.vue2
-rw-r--r--packages/frontend/src/pages/admin/modlog.ModLog.vue6
-rw-r--r--packages/frontend/src/pages/flash/flash.vue49
-rw-r--r--packages/frontend/src/pages/gallery/post.vue55
-rw-r--r--packages/frontend/src/pages/page.vue77
6 files changed, 173 insertions, 18 deletions
diff --git a/packages/frontend/src/components/MkAbuseReportWindow.vue b/packages/frontend/src/components/MkAbuseReportWindow.vue
index b09c7bb3fb..a634a748e9 100644
--- a/packages/frontend/src/components/MkAbuseReportWindow.vue
+++ b/packages/frontend/src/components/MkAbuseReportWindow.vue
@@ -39,7 +39,7 @@ import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
const props = defineProps<{
- user: Misskey.entities.UserDetailed;
+ user: Misskey.entities.UserLite;
initialComment?: string;
}>();
diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue
index 8cb082585b..bbcb070803 100644
--- a/packages/frontend/src/components/global/MkAcct.vue
+++ b/packages/frontend/src/components/global/MkAcct.vue
@@ -21,7 +21,7 @@ import { host as hostRaw } from '@/config.js';
import { defaultStore } from '@/store.js';
defineProps<{
- user: Misskey.entities.User;
+ user: Misskey.entities.UserLite;
detail?: boolean;
}>();
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index eb50d068d9..64d7f25845 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -37,6 +37,9 @@ SPDX-License-Identifier: AGPL-3.0-only
'deleteSystemWebhook',
'deleteAbuseReportNotificationRecipient',
'deleteAccount',
+ 'deletePage',
+ 'deleteFlash',
+ 'deleteGalleryPost',
].includes(log.type)
}"
>{{ i18n.ts._moderationLogTypes[log.type] }}</b>
@@ -74,6 +77,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-else-if="log.type === 'updateAbuseReportNotificationRecipient'">: {{ log.info.before.name }}</span>
<span v-else-if="log.type === 'deleteAbuseReportNotificationRecipient'">: {{ log.info.recipient.name }}</span>
<span v-else-if="log.type === 'deleteAccount'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
+ <span v-else-if="log.type === 'deletePage'">: @{{ log.info.pageUserUsername }}</span>
+ <span v-else-if="log.type === 'deleteFlash'">: @{{ log.info.flashUserUsername }}</span>
+ <span v-else-if="log.type === 'deleteGalleryPost'">: @{{ log.info.postUserUsername }}</span>
</template>
<template #icon>
<MkAvatar :user="log.user" :class="$style.avatar"/>
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 020463a133..7b7f8bb5f2 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -23,6 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkButton v-else v-tooltip="i18n.ts.like" asLike class="button" rounded @click="like()"><i class="ti ti-heart"></i><span v-if="flash?.likedCount && flash.likedCount > 0" style="margin-left: 6px;">{{ flash.likedCount }}</span></MkButton>
<MkButton v-tooltip="i18n.ts.copyLink" class="button" rounded @click="copyLink"><i class="ti ti-link ti-fw"></i></MkButton>
<MkButton v-tooltip="i18n.ts.share" class="button" rounded @click="share"><i class="ti ti-share ti-fw"></i></MkButton>
+ <MkButton v-if="$i && $i.id !== flash.user.id" class="button" rounded @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></MkButton>
</div>
</div>
</div>
@@ -61,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { computed, onDeactivated, onUnmounted, Ref, ref, watch, shallowRef } from 'vue';
+import { computed, onDeactivated, onUnmounted, Ref, ref, watch, shallowRef, defineAsyncComponent } from 'vue';
import * as Misskey from 'misskey-js';
import { Interpreter, Parser, values } from '@syuilo/aiscript';
import MkButton from '@/components/MkButton.vue';
@@ -79,6 +80,7 @@ import { defaultStore } from '@/store.js';
import { $i } from '@/account.js';
import { isSupportShare } from '@/scripts/navigator.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
+import { MenuItem } from '@/types/menu';
import { pleaseLogin } from '@/scripts/please-login.js';
const props = defineProps<{
@@ -229,6 +231,51 @@ async function run() {
}
}
+function reportAbuse() {
+ if (!flash.value) return;
+
+ const pageUrl = `${url}/play/${flash.value.id}`;
+
+ os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+ user: flash.value.user,
+ initialComment: `Play: ${pageUrl}\n-----\n`,
+ }, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+ if (!flash.value) return;
+
+ const menu: MenuItem[] = [
+ ...($i && $i.id !== flash.value.userId ? [
+ {
+ icon: 'ti ti-exclamation-circle',
+ text: i18n.ts.reportAbuse,
+ action: reportAbuse,
+ },
+ ...($i.isModerator || $i.isAdmin ? [
+ {
+ type: 'divider' as const,
+ },
+ {
+ icon: 'ti ti-trash',
+ text: i18n.ts.delete,
+ danger: true,
+ action: () => os.confirm({
+ type: 'warning',
+ text: i18n.ts.deleteConfirm,
+ }).then(({ canceled }) => {
+ if (canceled || !flash.value) return;
+
+ os.apiWithDialog('flash/delete', { flashId: flash.value.id });
+ }),
+ },
+ ] : []),
+ ] : []),
+ ];
+
+ os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
function reset() {
if (aiscript.value) aiscript.value.abort();
started.value = false;
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index fc2b5f810c..f7f6251702 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -31,6 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ti ti-repeat ti-fw"></i></button>
<button v-tooltip="i18n.ts.copyLink" v-click-anime class="_button" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
<button v-if="isSupportShare()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ti ti-share ti-fw"></i></button>
+ <button v-if="$i && $i.id !== post.user.id" v-click-anime class="_button" @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></button>
</div>
</div>
<div class="user">
@@ -62,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { computed, watch, ref } from 'vue';
+import { computed, watch, ref, defineAsyncComponent } from 'vue';
import * as Misskey from 'misskey-js';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
@@ -79,6 +80,7 @@ import { $i } from '@/account.js';
import { isSupportShare } from '@/scripts/navigator.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import { useRouter } from '@/router/supplier.js';
+import { MenuItem } from '@/types/menu';
const router = useRouter();
@@ -153,13 +155,54 @@ function edit() {
router.push(`/gallery/${post.value.id}/edit`);
}
+function reportAbuse() {
+ if (!post.value) return;
+
+ const pageUrl = `${url}/gallery/${post.value.id}`;
+
+ os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+ user: post.value.user,
+ initialComment: `Post: ${pageUrl}\n-----\n`,
+ }, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+ if (!post.value) return;
+
+ const menu: MenuItem[] = [
+ ...($i && $i.id !== post.value.userId ? [
+ {
+ icon: 'ti ti-exclamation-circle',
+ text: i18n.ts.reportAbuse,
+ action: reportAbuse,
+ },
+ ...($i.isModerator || $i.isAdmin ? [
+ {
+ type: 'divider' as const,
+ },
+ {
+ icon: 'ti ti-trash',
+ text: i18n.ts.delete,
+ danger: true,
+ action: () => os.confirm({
+ type: 'warning',
+ text: i18n.ts.deleteConfirm,
+ }).then(({ canceled }) => {
+ if (canceled || !post.value) return;
+
+ os.apiWithDialog('gallery/posts/delete', { postId: post.value.id });
+ }),
+ },
+ ] : []),
+ ] : []),
+ ];
+
+ os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
watch(() => props.postId, fetchPost, { immediate: true });
-const headerActions = computed(() => [{
- icon: 'ti ti-pencil',
- text: i18n.ts.edit,
- handler: edit,
-}]);
+const headerActions = computed(() => []);
const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 20b776aaa2..40d76f86ed 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -62,8 +62,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" asLike @click="like()"><i class="ti ti-heart"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
</div>
<div :class="$style.other">
+ <MkA v-if="page.userId === $i?.id" v-tooltip="i18n.ts._pages.editThisPage" :to="`/pages/edit/${page.id}`" class="_button" :class="$style.generalActionButton"><i class="ti ti-pencil ti-fw"></i></MkA>
<button v-tooltip="i18n.ts.copyLink" class="_button" :class="$style.generalActionButton" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
<button v-tooltip="i18n.ts.share" class="_button" :class="$style.generalActionButton" @click="share"><i class="ti ti-share ti-fw"></i></button>
+ <button v-if="$i" v-click-anime class="_button" :class="$style.generalActionButton" @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></button>
</div>
</div>
<div :class="$style.pageUser">
@@ -78,14 +80,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<div><i class="ti ti-clock"></i> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
<div v-if="page.createdAt != page.updatedAt"><i class="ti ti-clock-edit"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
</div>
- <div :class="$style.pageLinks">
- <MkA v-if="!$i || $i.id !== page.userId" :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
- <template v-if="$i && $i.id === page.userId">
- <MkA :to="`/pages/edit/${page.id}`" class="link">{{ i18n.ts._pages.editThisPage }}</MkA>
- <button v-if="$i.pinnedPageId === page.id" class="link _textButton" @click="pin(false)">{{ i18n.ts.unpin }}</button>
- <button v-else class="link _textButton" @click="pin(true)">{{ i18n.ts.pin }}</button>
- </template>
- </div>
</div>
<MkAd :prefer="['horizontal', 'horizontal-big']"/>
<MkContainer :max-height="300" :foldable="true" class="other">
@@ -104,7 +98,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { computed, watch, ref } from 'vue';
+import { computed, watch, ref, defineAsyncComponent } from 'vue';
import * as Misskey from 'misskey-js';
import XPage from '@/components/page/page.vue';
import MkButton from '@/components/MkButton.vue';
@@ -126,6 +120,10 @@ import { isSupportShare } from '@/scripts/navigator.js';
import { instance } from '@/instance.js';
import { getStaticImageUrl } from '@/scripts/media-proxy.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
+import { useRouter } from '@/router/supplier.js';
+import { MenuItem } from '@/types/menu';
+
+const router = useRouter();
const props = defineProps<{
pageName: string;
@@ -242,6 +240,67 @@ function pin(pin) {
});
}
+function reportAbuse() {
+ if (!page.value) return;
+
+ const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
+
+ os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+ user: page.value.user,
+ initialComment: `Page: ${pageUrl}\n-----\n`,
+ }, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+ if (!page.value) return;
+
+ const menu: MenuItem[] = [
+ ...($i && $i.id === page.value.userId ? [
+ {
+ icon: 'ti ti-code',
+ text: i18n.ts._pages.viewSource,
+ action: () => router.push(`/@${props.username}/pages/${props.pageName}/view-source`),
+ },
+ ...($i.pinnedPageId === page.value.id ? [{
+ icon: 'ti ti-pinned-off',
+ text: i18n.ts.unpin,
+ action: () => pin(false),
+ }] : [{
+ icon: 'ti ti-pin',
+ text: i18n.ts.pin,
+ action: () => pin(true),
+ }]),
+ ] : []),
+ ...($i && $i.id !== page.value.userId ? [
+ {
+ icon: 'ti ti-exclamation-circle',
+ text: i18n.ts.reportAbuse,
+ action: reportAbuse,
+ },
+ ...($i.isModerator || $i.isAdmin ? [
+ {
+ type: 'divider' as const,
+ },
+ {
+ icon: 'ti ti-trash',
+ text: i18n.ts.delete,
+ danger: true,
+ action: () => os.confirm({
+ type: 'warning',
+ text: i18n.ts.deleteConfirm,
+ }).then(({ canceled }) => {
+ if (canceled || !page.value) return;
+
+ os.apiWithDialog('pages/delete', { pageId: page.value.id });
+ }),
+ },
+ ] : []),
+ ] : []),
+ ];
+
+ os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
watch(() => path.value, fetchPage, { immediate: true });
const headerActions = computed(() => []);