From cb9bd6a0045c0c10beec8c5c6d65b617e128b376 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Wed, 18 Oct 2023 05:32:47 +0200 Subject: [PATCH] add: mark all media from user as NSFW Closes transfem-org/Sharkey#69 --- locales/en-US.yml | 3 ++ locales/index.d.ts | 3 ++ locales/ja-JP.yml | 3 ++ .../backend/src/server/api/EndpointsModule.ts | 8 ++++ packages/backend/src/server/api/endpoints.ts | 4 ++ .../server/api/endpoints/admin/nsfw-user.ts | 42 +++++++++++++++++++ .../server/api/endpoints/admin/unnsfw-user.ts | 42 +++++++++++++++++++ packages/frontend/src/pages/admin-user.vue | 16 +++++++ 8 files changed, 121 insertions(+) create mode 100644 packages/backend/src/server/api/endpoints/admin/nsfw-user.ts create mode 100644 packages/backend/src/server/api/endpoints/admin/unnsfw-user.ts diff --git a/locales/en-US.yml b/locales/en-US.yml index a231f22716..e77139036a 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -137,10 +137,13 @@ renoteMute: "Mute Renotes" renoteUnmute: "Unmute Renotes" block: "Block" unblock: "Unblock" +markAsNSFW: "Mark all media from user as NSFW" suspend: "Suspend" unsuspend: "Unsuspend" blockConfirm: "Are you sure that you want to block this account?" unblockConfirm: "Are you sure that you want to unblock this account?" +nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?" +unNsfwConfirm: "Are you sure that you want to unmark all media from this account as NSFW?" suspendConfirm: "Are you sure that you want to suspend this account?" unsuspendConfirm: "Are you sure that you want to unsuspend this account?" selectList: "Select a list" diff --git a/locales/index.d.ts b/locales/index.d.ts index fd9a2cb7e0..1d548979da 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -140,10 +140,13 @@ export interface Locale { "renoteUnmute": string; "block": string; "unblock": string; + "markAsNSFW": string; "suspend": string; "unsuspend": string; "blockConfirm": string; "unblockConfirm": string; + "nsfwConfirm": string; + "unNsfwConfirm": string; "suspendConfirm": string; "unsuspendConfirm": string; "selectList": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index deab375c1a..1195ed4357 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -137,10 +137,13 @@ renoteMute: "リノートをミュート" renoteUnmute: "リノートのミュートを解除" block: "ブロック" unblock: "ブロック解除" +markAsNSFW: "ユーザーのすべてのメディアをNSFWとしてマークする" suspend: "凍結" unsuspend: "解凍" blockConfirm: "ブロックしますか？" unblockConfirm: "ブロック解除しますか？" +nsfwConfirm: "このアカウントからのすべてのメディアをNSFWとしてマークしてもよろしいですか？" +unNsfwConfirm: "このアカウントのすべてのメディアをNSFWとしてマーク解除してもよろしいですか？" suspendConfirm: "凍結しますか？" unsuspendConfirm: "解凍しますか？" selectList: "リストを選択" diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts index 9aa75b0af8..4ffc1ba4b6 100644 --- a/packages/backend/src/server/api/EndpointsModule.ts +++ b/packages/backend/src/server/api/EndpointsModule.ts @@ -61,6 +61,8 @@ import * as ep___admin_serverInfo from './endpoints/admin/server-info.js'; import * as ep___admin_showModerationLogs from './endpoints/admin/show-moderation-logs.js'; import * as ep___admin_showUser from './endpoints/admin/show-user.js'; import * as ep___admin_showUsers from './endpoints/admin/show-users.js'; +import * as ep___admin_nsfwUser from './endpoints/admin/nsfw-user.js'; +import * as ep___admin_unnsfwUser from './endpoints/admin/unnsfw-user.js'; import * as ep___admin_suspendUser from './endpoints/admin/suspend-user.js'; import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js'; import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js'; @@ -414,6 +416,8 @@ const $admin_serverInfo: Provider = { provide: 'ep:admin/server-info', useClass: const $admin_showModerationLogs: Provider = { provide: 'ep:admin/show-moderation-logs', useClass: ep___admin_showModerationLogs.default }; const $admin_showUser: Provider = { provide: 'ep:admin/show-user', useClass: ep___admin_showUser.default }; const $admin_showUsers: Provider = { provide: 'ep:admin/show-users', useClass: ep___admin_showUsers.default }; +const $admin_nsfwUser: Provider = { provide: 'ep:admin/nsfw-user', useClass: ep___admin_nsfwUser.default }; +const $admin_unnsfwUser: Provider = { provide: 'ep:admin/unnsfw-user', useClass: ep___admin_unnsfwUser.default }; const $admin_suspendUser: Provider = { provide: 'ep:admin/suspend-user', useClass: ep___admin_suspendUser.default }; const $admin_unsuspendUser: Provider = { provide: 'ep:admin/unsuspend-user', useClass: ep___admin_unsuspendUser.default }; const $admin_updateMeta: Provider = { provide: 'ep:admin/update-meta', useClass: ep___admin_updateMeta.default }; @@ -771,6 +775,8 @@ const $sponsors: Provider = { provide: 'ep:sponsors', useClass: ep___sponsors.de $admin_showModerationLogs, $admin_showUser, $admin_showUsers, + $admin_nsfwUser, + $admin_unnsfwUser, $admin_suspendUser, $admin_unsuspendUser, $admin_updateMeta, @@ -1122,6 +1128,8 @@ const $sponsors: Provider = { provide: 'ep:sponsors', useClass: ep___sponsors.de $admin_showModerationLogs, $admin_showUser, $admin_showUsers, + $admin_nsfwUser, + $admin_unnsfwUser, $admin_suspendUser, $admin_unsuspendUser, $admin_updateMeta, diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index d7f5611f55..d602602e11 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -61,6 +61,8 @@ import * as ep___admin_serverInfo from './endpoints/admin/server-info.js'; import * as ep___admin_showModerationLogs from './endpoints/admin/show-moderation-logs.js'; import * as ep___admin_showUser from './endpoints/admin/show-user.js'; import * as ep___admin_showUsers from './endpoints/admin/show-users.js'; +import * as ep___admin_nsfwUser from './endpoints/admin/nsfw-user.js'; +import * as ep___admin_unnsfwUser from './endpoints/admin/unnsfw-user.js'; import * as ep___admin_suspendUser from './endpoints/admin/suspend-user.js'; import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js'; import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js'; @@ -412,6 +414,8 @@ const eps = [ ['admin/show-moderation-logs', ep___admin_showModerationLogs], ['admin/show-user', ep___admin_showUser], ['admin/show-users', ep___admin_showUsers], + ['admin/nsfw-user', ep___admin_nsfwUser], + ['admin/unnsfw-user', ep___admin_unnsfwUser], ['admin/suspend-user', ep___admin_suspendUser], ['admin/unsuspend-user', ep___admin_unsuspendUser], ['admin/update-meta', ep___admin_updateMeta], diff --git a/packages/backend/src/server/api/endpoints/admin/nsfw-user.ts b/packages/backend/src/server/api/endpoints/admin/nsfw-user.ts new file mode 100644 index 0000000000..2dff0e8d09 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/admin/nsfw-user.ts @@ -0,0 +1,42 @@ +import { Inject, Injectable } from '@nestjs/common'; +import { Endpoint } from '@/server/api/endpoint-base.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; +import { DI } from '@/di-symbols.js'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +} as const; + +export const paramDef = { + type: 'object', + properties: { + userId: { type: 'string', format: 'misskey:id' }, + }, + required: ['userId'], +} as const; + +@Injectable() +export default class extends Endpoint { // eslint-disable-line import/no-default-export + constructor( + @Inject(DI.usersRepository) + private usersRepository: UsersRepository, + + @Inject(DI.userProfilesRepository) + private userProfilesRepository: UserProfilesRepository, + ) { + super(meta, paramDef, async (ps, me) => { + const user = await this.usersRepository.findOneBy({ id: ps.userId }); + + if (user == null) { + throw new Error('user not found'); + } + + await this.userProfilesRepository.update(user.id, { + alwaysMarkNsfw: true, + }); + }); + } +} diff --git a/packages/backend/src/server/api/endpoints/admin/unnsfw-user.ts b/packages/backend/src/server/api/endpoints/admin/unnsfw-user.ts new file mode 100644 index 0000000000..9c414ed55c --- /dev/null +++ b/packages/backend/src/server/api/endpoints/admin/unnsfw-user.ts @@ -0,0 +1,42 @@ +import { Inject, Injectable } from '@nestjs/common'; +import { Endpoint } from '@/server/api/endpoint-base.js'; +import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; +import { DI } from '@/di-symbols.js'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +} as const; + +export const paramDef = { + type: 'object', + properties: { + userId: { type: 'string', format: 'misskey:id' }, + }, + required: ['userId'], +} as const; + +@Injectable() +export default class extends Endpoint { // eslint-disable-line import/no-default-export + constructor( + @Inject(DI.usersRepository) + private usersRepository: UsersRepository, + + @Inject(DI.userProfilesRepository) + private userProfilesRepository: UserProfilesRepository, + ) { + super(meta, paramDef, async (ps, me) => { + const user = await this.usersRepository.findOneBy({ id: ps.userId }); + + if (user == null) { + throw new Error('user not found'); + } + + await this.userProfilesRepository.update(user.id, { + alwaysMarkNsfw: false, + }); + }); + } +} diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index f639054a66..e7cdd34dba 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -77,6 +77,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.suspend }} + {{ i18n.ts.markAsNSFW }}
{{ i18n.ts.resetPassword }} @@ -223,6 +224,7 @@ let ap = $ref(null); let moderator = $ref(false); let silenced = $ref(false); let suspended = $ref(false); +let markedAsNSFW = $ref(false); let moderationNote = $ref(''); const filesPagination = { endpoint: 'admin/drive/files' as const, @@ -255,6 +257,7 @@ function createFetcher() { silenced = info.isSilenced; suspended = info.isSuspended; moderationNote = info.moderationNote; + markedAsNSFW = info.alwaysMarkNsfw; watch($$(moderationNote), async () => { await os.api('admin/update-user-note', { userId: user.id, text: moderationNote }); @@ -290,6 +293,19 @@ async function resetPassword() { } } +async function toggleNSFW(v) { + const confirm = await os.confirm({ + type: 'warning', + text: v ? i18n.ts.nsfwConfirm : i18n.ts.unNsfwConfirm, + }); + if (confirm.canceled) { + markedAsNSFW = !v; + } else { + await os.api(v ? 'admin/nsfw-user' : 'admin/unnsfw-user', { userId: user.id }); + await refreshUser(); + } +} + async function toggleSuspend(v) { const confirm = await os.confirm({ type: 'warning',