oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

enhance(sensitive-flag):センシティブフラグの機能の強化 (MisskeyIO#936)

Browse source
This commit is contained in:
まっちゃてぃー。 2025-03-18 03:22:08 +09:00 • committed by GitHub
parent 7a94724098
commit abdaa18666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 197 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
locales/index.d.ts vendored
View file

@ -5362,6 +5362,15 @@ export interface Locale extends ILocale {
* {x}に投稿されます
*/
"willBePostedAt": ParameterizedString<"x">;
/**
* 管理者によって、ドライブのファイルがセンシティブとして設定されました。
* 詳細については、[NSFWガイドライン](https://go.misskey.io/media-guideline)を確認してください。
*/
"sensitiveByModerator": string;
/**
* この情報は他のユーザーには公開されません。
*/
"thisInfoIsNotVisibleOtherUser": string;
"_bubbleGame": {
/**
* 遊び方
@ -9747,6 +9756,10 @@ export interface Locale extends ILocale {
* 通知の履歴をリセットする
*/
"flushNotification": string;
/**
* ドライブのファイルがセンシティブとして設定されました
*/
"sensitiveFlagAssigned": string;
"_types": {
/**
* すべて

3
locales/ja-JP.yml
View file

@ -1334,6 +1334,8 @@ scheduled: "予約済み"
unschedule: "予約を解除"
setScheduledTime: "予約日時を設定"
willBePostedAt: "{x}に投稿されます"
sensitiveByModerator: "管理者によって、ドライブのファイルがセンシティブとして設定されました。\n詳細については、[NSFWガイドライン](https://go.misskey.io/media-guideline)を確認してください。"
thisInfoIsNotVisibleOtherUser: "この情報は他のユーザーには公開されません。"
_bubbleGame:
howToPlay: "遊び方"
@ -2562,6 +2564,7 @@ _notification:
renotedBySomeUsers: "{n}人がリノートしました"
followedBySomeUsers: "{n}人にフォローされました"
flushNotification: "通知の履歴をリセットする"
sensitiveFlagAssigned: "ドライブのファイルがセンシティブとして設定されました"
_types:
all: "すべて"

13
packages/backend/migration/1739335129758-sensitiveFlag.js Normal file
View file

@ -0,0 +1,13 @@
export class SensitiveFlag1739335129758 {
name = 'SensitiveFlag1739335129758'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "drive_file" ADD "isSensitiveByModerator" boolean NOT NULL DEFAULT false`);
await queryRunner.query(`CREATE INDEX "IDX_e779d1afdfa44dc3d64213cd2e" ON "drive_file" ("isSensitiveByModerator") `);
}
async down(queryRunner) {
await queryRunner.query(`DROP INDEX "public"."IDX_e779d1afdfa44dc3d64213cd2e"`);
await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "isSensitiveByModerator"`);
}
}

19
packages/backend/src/core/DriveService.ts
View file

@ -44,6 +44,7 @@ import { correctFilename } from '@/misc/correct-filename.js';
import { isMimeImage } from '@/misc/is-mime-image.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
import { LoggerService } from '@/core/LoggerService.js';
import { NotificationService } from '@/core/NotificationService.js';
type AddFileArgs = {
/** User who wish to add file */
@ -129,6 +130,7 @@ export class DriveService {
private driveChart: DriveChart,
private perUserDriveChart: PerUserDriveChart,
private instanceChart: InstanceChart,
private notificationService: NotificationService,
) {
const logger = this.loggerService.getLogger('drive', 'blue');
this.registerLogger = logger.createSubLogger('register', 'yellow');
@ -664,13 +666,15 @@ export class DriveService {
@bindThis
public async updateFile(file: MiDriveFile, values: Partial<MiDriveFile>, updater: MiUser) {
const alwaysMarkNsfw = (await this.roleService.getUserPolicies(file.userId)).alwaysMarkNsfw;
const isModerator = await this.roleService.isModerator(updater);
if (values.name != null && !this.driveFileEntityService.validateFileName(values.name)) {
throw new DriveService.InvalidFileNameError();
}
if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive && alwaysMarkNsfw && !values.isSensitive) {
throw new DriveService.CannotUnmarkSensitiveError();
if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive && !values.isSensitive) {
if (alwaysMarkNsfw) throw new DriveService.CannotUnmarkSensitiveError();
if (file.isSensitiveByModerator && (file.userId === updater.id)) throw new DriveService.CannotUnmarkSensitiveError();
}
if (values.folderId != null) {
@ -684,6 +688,10 @@ export class DriveService {
}
}
if (isModerator && file.userId !== updater.id) {
values.isSensitiveByModerator = values.isSensitive;
}
await this.driveFilesRepository.update(file.id, values);
const fileObj = await this.driveFileEntityService.pack(file.id, updater, { self: true });
@ -693,7 +701,7 @@ export class DriveService {
this.globalEventService.publishDriveStream(file.userId, 'fileUpdated', fileObj);
}
if (await this.roleService.isModerator(updater) && (file.userId !== updater.id)) {
if (isModerator && (file.userId !== updater.id)) {
if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive) {
const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
if (values.isSensitive) {
@ -703,6 +711,11 @@ export class DriveService {
fileUserUsername: user?.username ?? null,
fileUserHost: user?.host ?? null,
});
if (file.userId) {
this.notificationService.createNotification(file.userId, 'sensitiveFlagAssigned', {
fileId: file.id,
});
}
} else {
this.moderationLogService.log(updater, 'unmarkSensitiveDriveFile', {
fileId: file.id,

6
packages/backend/src/core/entities/DriveFileEntityService.ts
View file

@ -210,6 +210,9 @@ export class DriveFileEntityService {
md5: file.md5,
size: file.size,
isSensitive: file.isSensitive,
...(opts.detail ? {
isSensitiveByModerator: file.isSensitiveByModerator,
} : {}),
blurhash: file.blurhash,
properties: opts.self ? file.properties : this.getPublicProperties(file),
url: opts.self ? file.url : this.getPublicUrl(file),
@ -246,6 +249,9 @@ export class DriveFileEntityService {
md5: file.md5,
size: file.size,
isSensitive: file.isSensitive,
...(opts.detail ? {
isSensitiveByModerator: file.isSensitiveByModerator,
} : {}),
blurhash: file.blurhash,
properties: opts.self ? file.properties : this.getPublicProperties(file),
url: opts.self ? file.url : this.getPublicUrl(file),

3
packages/backend/src/core/entities/NotificationEntityService.ts
View file

@ -183,6 +183,9 @@ export class NotificationEntityService implements OnModuleInit {
header: notification.customHeader,
icon: notification.customIcon,
} : {}),
...(notification.type === 'sensitiveFlagAssigned' ? {
fileId: notification.fileId,
} : {}),
});
}

6
packages/backend/src/models/DriveFile.ts
View file

@ -162,6 +162,12 @@ export class MiDriveFile {
})
public isSensitive: boolean;
@Index()
@Column('boolean', {
default: false,
})
public isSensitiveByModerator: boolean;
@Index()
@Column('boolean', {
default: false,

5
packages/backend/src/models/Notification.ts
View file

@ -93,6 +93,11 @@ export type MiNotification = {
id: string;
createdAt: string;
draftId: MiScheduledNote['id'];
} | {
type: 'sensitiveFlagAssigned'
id: string;
fileId: string;
createdAt: string;
} | {
type: 'app';
id: string;

4
packages/backend/src/models/json-schema/drive-file.ts
View file

@ -42,6 +42,10 @@ export const packedDriveFileSchema = {
type: 'boolean',
optional: false, nullable: false,
},
isSensitiveByModerator: {
type: 'boolean',
optional: true, nullable: true,
},
blurhash: {
type: 'string',
optional: false, nullable: true,

25
packages/backend/src/models/json-schema/notification.ts
View file

@ -309,8 +309,8 @@ export const packedNotificationSchema = {
type: 'object',
ref: 'NoteDraft',
optional: false, nullable: false,
}
}
},
},
}, {
type: 'object',
properties: {
@ -324,8 +324,8 @@ export const packedNotificationSchema = {
type: 'object',
ref: 'Note',
optional: false, nullable: false,
}
}
},
},
}, {
type: 'object',
properties: {
@ -339,8 +339,21 @@ export const packedNotificationSchema = {
type: 'object',
ref: 'NoteDraft',
optional: false, nullable: false,
}
}
},
},
}, {
type: 'object',
properties: {
...baseSchema.properties,
type: {
type: 'string',
optional: false, nullable: false,
enum: ['sensitiveFlagAssigned'],
},
fileId: {
optional: false, nullable: false,
},
},
}, {
type: 'object',
properties: {

12
packages/backend/src/server/api/endpoints/drive/files/update.ts
View file

@ -51,6 +51,12 @@ export const meta = {
code: 'RESTRICTED_BY_ROLE',
id: '7f59dccb-f465-75ab-5cf4-3ce44e3282f7',
},
restrictedByModerator: {
message: 'The isSensitive specified by the administrator cannot be changed.',
code: 'RESTRICTED_BY_ADMINISTRATOR',
id: '20e6c501-e579-400d-97e4-1c7efc286f35',
},
},
res: {
type: 'object',
@ -105,7 +111,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
} else if (e instanceof DriveService.NoSuchFolderError) {
throw new ApiError(meta.errors.noSuchFolder);
} else if (e instanceof DriveService.CannotUnmarkSensitiveError) {
throw new ApiError(meta.errors.restrictedByRole);
if (file.isSensitiveByModerator) {
throw new ApiError(meta.errors.restrictedByModerator);
} else {
throw new ApiError(meta.errors.restrictedByRole);
}
} else {
throw e;
}

2
packages/backend/src/types.ts
View file

@ -26,6 +26,7 @@ import type { MiNote } from '@/models/Note.js';
* noteScheduled - 予約投稿が予約された
* scheduledNotePosted - 予約投稿が投稿された
* scheduledNoteError - 予約投稿がエラーになった
* sensitiveFlagAssigned - センシティブフラグが付与された
* app - アプリ通知
* test - テスト通知（サーバー側）
*/
@ -45,6 +46,7 @@ export const notificationTypes = [
'noteScheduled',
'scheduledNotePosted',
'scheduledNoteError',
'sensitiveFlagAssigned',
'app',
'test',
] as const;

1
packages/backend/test/unit/NoteCreateService.ts
View file

@ -95,6 +95,7 @@ describe('NoteCreateService', () => {
folderId: null,
folder: null,
isSensitive: false,
isSensitiveByModerator: false,
maybeSensitive: false,
maybePorn: false,
isLink: false,

55
packages/frontend/src/components/MkNotification.vue
View file

@ -8,6 +8,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.head">
<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && notification.note" :class="$style.icon" :user="notification.note.user" link preview/>
<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'noteScheduled', 'scheduledNotePosted', 'scheduledNoteError'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
<div
v-else-if="notification.type === 'sensitiveFlagAssigned'"
:class="$style.iconFrame"
>
<div :class="[$style.iconInner]">
<img :class="$style.iconImg" src="/fluent-emoji/1f6a9.png">
</div>
</div>
<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
@ -71,6 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-else-if="notification.type === 'reaction:grouped'" :class="$style.headerName">{{ i18n.tsx._notification.reactedBySomeUsers({ n: getActualReactedUsersCount(notification) }) }}</span>
<span v-else-if="notification.type === 'renote:grouped'" :class="$style.headerName">{{ i18n.tsx._notification.renotedBySomeUsers({ n: notification.users.length }) }}</span>
<span v-else-if="notification.type === 'app'" :class="$style.headerName">{{ notification.header }}</span>
<MkA v-else-if="notification.type === 'sensitiveFlagAssigned'" :to="'/my/drive/file/'+notification.fileId" :class="$style.headerName">{{ i18n.ts._notification.sensitiveFlagAssigned }}</MkA>
<MkTime v-if="withTime" :time="notification.createdAt" :class="$style.headerTime"/>
</header>
<div>
@ -159,6 +168,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkAvatar :class="$style.reactionsItemAvatar" :user="user" link preview/>
</div>
</div>
<Mfm v-else-if="notification.type === 'sensitiveFlagAssigned'" :text="i18n.ts.sensitiveByModerator"/>
<span v-if="['sensitiveFlagAssigned'].includes(notification.type)" :class="$style.text" style="opacity: 0.6;">
{{ i18n.ts.thisInfoIsNotVisibleOtherUser }}
</span>
</div>
</div>
</div>
@ -341,6 +354,12 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
pointer-events: none;
}
.t_sensitiveFlagAssigned {
padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.tail {
flex: 1;
min-width: 0;
@ -430,6 +449,42 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
color: #fff;
}
.iconFrame {
position: relative;
width: 100%;
height: 100%;
padding: 4px;
border-radius: 100%;
box-sizing: border-box;
pointer-events: none;
user-select: none;
filter: drop-shadow(0px 2px 2px #00000044);
box-shadow: 0 1px 0px #ffffff88 inset;
overflow: clip;
background: linear-gradient(0deg, #703827, #d37566);
}
.iconImg {
width: calc(100% - 12px);
height: calc(100% - 12px);
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: auto;
filter: drop-shadow(0px 1px 2px #000000aa);
}
.iconInner {
position: relative;
width: 100%;
height: 100%;
border-radius: 100%;
box-shadow: 0 1px 0px #ffffff88 inset;
background: linear-gradient(0deg, #d37566, #703827);
}
@container (max-width: 600px) {
.root {
padding: 16px;

1
packages/frontend/src/const.ts
View file

@ -70,6 +70,7 @@ export const notificationTypes = [
'noteScheduled',
'scheduledNotePosted',
'scheduledNoteError',
'sensitiveFlagAssigned',
'app',
] as const;
export const obsoleteNotificationTypes = ['pollVote', 'groupInvited'] as const;

17
packages/frontend/src/pages/drive.file.info.vue
View file

@ -6,6 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div class="_gaps">
<MkInfo>{{ i18n.ts._fileViewer.thisPageCanBeSeenFromTheAuthor }}</MkInfo>
<MkInfo v-if="file && file.isSensitiveByModerator" :warn="true">
<Mfm :text="i18n.ts.sensitiveByModerator"/>
</MkInfo>
<MkLoading v-if="fetching"/>
<div v-else-if="file" class="_gaps">
<div :class="$style.filePreviewRoot">
@ -23,12 +26,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-if="isImage" v-tooltip="i18n.ts.cropImage" class="_button" :class="$style.fileQuickActionsOthersButton" @click="crop()">
<i class="ti ti-crop"></i>
</button>
<button v-if="file.isSensitive" v-tooltip="i18n.ts.unmarkAsSensitive" class="_button" :class="$style.fileQuickActionsOthersButton" @click="toggleSensitive()">
<i class="ti ti-eye"></i>
</button>
<button v-else v-tooltip="i18n.ts.markAsSensitive" class="_button" :class="$style.fileQuickActionsOthersButton" @click="toggleSensitive()">
<i class="ti ti-eye-exclamation"></i>
</button>
<span v-if="!file.isSensitiveByModerator">
<button v-if="file.isSensitive" v-tooltip="i18n.ts.unmarkAsSensitive" class="_button" :class="$style.fileQuickActionsOthersButton" @click="toggleSensitive()">
<i class="ti ti-eye"></i>
</button>
<button v-else v-tooltip="i18n.ts.markAsSensitive" class="_button" :class="$style.fileQuickActionsOthersButton" @click="toggleSensitive()">
<i class="ti ti-eye-exclamation"></i>
</button>
</span>
<a v-tooltip="i18n.ts.download" :href="file.url" :download="file.name" class="_button" :class="$style.fileQuickActionsOthersButton">
<i class="ti ti-download"></i>
</a>

15
packages/frontend/src/pages/note.vue
View file

@ -21,6 +21,9 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div class="_margin _gaps_s">
<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
<MkInfo v-if="hasSensitiveFiles" :warn="true">
<Mfm :text="i18n.ts.sensitiveByModerator"/>
</MkInfo>
<MkNoteDetailed :key="note.id" v-model:note="note" :initialTab="initialTab" :class="$style.note"/>
</div>
<div v-if="clips && clips.length > 0" class="_margin">
@ -61,6 +64,8 @@ import { i18n } from '@/i18n.js';
import { dateString } from '@/filters/date.js';
import MkClipPreview from '@/components/MkClipPreview.vue';
import { defaultStore } from '@/store.js';
import MkInfo from '@/components/MkInfo.vue';
import { $i } from '@/account.js';
const props = defineProps<{
noteId: string;
@ -69,6 +74,7 @@ const props = defineProps<{
const note = ref<null | Misskey.entities.Note>();
const clips = ref<Misskey.entities.Clip[]>();
const hasSensitiveFiles = ref(false);
const showPrev = ref<'user' | 'channel' | false>(false);
const showNext = ref<'user' | 'channel' | false>(false);
const error = ref();
@ -119,6 +125,15 @@ function fetchNote() {
noteId: props.noteId,
}).then(res => {
note.value = res;
if (note.value.userId === $i?.id && note.value.fileIds) {
Promise.all(note.value.fileIds.map(fileId =>
misskeyApi('drive/files/show', { fileId: fileId }),
)).then(files => {
hasSensitiveFiles.value = files.some(file => file.isSensitiveByModerator);
});
}
// 古いノートは被クリップ数をカウントしていないので、2023-10-01以前のものは強制的にnotes/clipsを叩く
if (note.value.clippedCount > 0 || new Date(note.value.createdAt).getTime() < new Date('2023-10-01').getTime()) {
misskeyApi('notes/clips', {

17
packages/misskey-js/src/autogen/types.ts
View file

@ -4513,6 +4513,14 @@ export type components = {
/** @enum {string} */
type: 'scheduledNoteError';
draft: components['schemas']['NoteDraft'];
} | {
/** Format: id */
id: string;
/** Format: date-time */
createdAt: string;
/** @enum {string} */
type: 'sensitiveFlagAssigned';
fileId: unknown;
} | {
/** Format: id */
id: string;
@ -4572,6 +4580,7 @@ export type components = {
/** @example 51469 */
size: number;
isSensitive: boolean;
isSensitiveByModerator?: boolean | null;
blurhash: string | null;
properties: {
/** @example 1280 */
@ -20467,8 +20476,8 @@ export type operations = {
untilId?: string;
/** @default true */
markAsRead?: boolean;
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'sensitiveFlagAssigned' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'sensitiveFlagAssigned' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
};
};
};
@ -20535,8 +20544,8 @@ export type operations = {
untilId?: string;
/** @default true */
markAsRead?: boolean;
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'sensitiveFlagAssigned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'sensitiveFlagAssigned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
};
};
};