-
+
(null);
const name = ref(Date.now().toString());
const eyeCatchingImage = ref(null);
const eyeCatchingImageId = ref(null);
-const font = ref('sans-serif');
+const font = ref<'sans-serif' | 'serif'>('sans-serif');
const content = ref([]);
const alignCenter = ref(false);
const hideTitleWhenPinned = ref(false);
@@ -113,7 +113,7 @@ watch(eyeCatchingImageId, async () => {
}
});
-function getSaveOptions() {
+function getSaveOptions(): Misskey.entities.PagesCreateRequest {
return {
title: title.value.trim(),
name: name.value.trim(),
@@ -128,80 +128,69 @@ function getSaveOptions() {
};
}
-function save() {
+async function save() {
const options = getSaveOptions();
- const onError = err => {
- if (err.id === '3d81ceae-475f-4600-b2a8-2bc116157532') {
- if (err.info.param === 'name') {
- os.alert({
- type: 'error',
- title: i18n.ts._pages.invalidNameTitle,
- text: i18n.ts._pages.invalidNameText,
- });
- }
- } else if (err.code === 'NAME_ALREADY_EXISTS') {
- os.alert({
- type: 'error',
+ if (pageId.value) {
+ const updateOptions: Misskey.entities.PagesUpdateRequest = {
+ pageId: pageId.value,
+ ...options,
+ };
+
+ await os.apiWithDialog('pages/update', updateOptions, undefined, {
+ '2298a392-d4a1-44c5-9ebb-ac1aeaa5a9ab': {
+ title: i18n.ts.somethingHappened,
text: i18n.ts._pages.nameAlreadyExists,
- });
- }
- };
+ },
+ });
- if (pageId.value) {
- options.pageId = pageId.value;
- misskeyApi('pages/update', options)
- .then(page => {
- currentName.value = name.value.trim();
- os.alert({
- type: 'success',
- text: i18n.ts._pages.updated,
- });
- }).catch(onError);
+ currentName.value = name.value.trim();
} else {
- misskeyApi('pages/create', options)
- .then(created => {
- pageId.value = created.id;
- currentName.value = name.value.trim();
- os.alert({
- type: 'success',
- text: i18n.ts._pages.created,
- });
- mainRouter.push(`/pages/edit/${pageId.value}`);
- }).catch(onError);
+ const created = await os.apiWithDialog('pages/create', options, undefined, {
+ '4650348e-301c-499a-83c9-6aa988c66bc1': {
+ title: i18n.ts.somethingHappened,
+ text: i18n.ts._pages.nameAlreadyExists,
+ },
+ });
+
+ pageId.value = created.id;
+ currentName.value = name.value.trim();
+ mainRouter.replace(`/pages/edit/${pageId.value}`);
}
}
-function del() {
- os.confirm({
+async function del() {
+ if (!pageId.value) return;
+
+ const { canceled } = await os.confirm({
type: 'warning',
text: i18n.tsx.removeAreYouSure({ x: title.value.trim() }),
- }).then(({ canceled }) => {
- if (canceled) return;
- misskeyApi('pages/delete', {
- pageId: pageId.value,
- }).then(() => {
- os.alert({
- type: 'success',
- text: i18n.ts._pages.deleted,
- });
- mainRouter.push('/pages');
- });
});
+
+ if (canceled) return;
+
+ await os.apiWithDialog('pages/delete', {
+ pageId: pageId.value,
+ });
+
+ mainRouter.replace('/pages');
}
-function duplicate() {
+async function duplicate() {
title.value = title.value + ' - copy';
name.value = name.value + '-copy';
- misskeyApi('pages/create', getSaveOptions()).then(created => {
- pageId.value = created.id;
- currentName.value = name.value.trim();
- os.alert({
- type: 'success',
- text: i18n.ts._pages.created,
- });
- mainRouter.push(`/pages/edit/${pageId.value}`);
+
+ const created = await os.apiWithDialog('pages/create', getSaveOptions(), undefined, {
+ '4650348e-301c-499a-83c9-6aa988c66bc1': {
+ title: i18n.ts.somethingHappened,
+ text: i18n.ts._pages.nameAlreadyExists,
+ },
});
+
+ pageId.value = created.id;
+ currentName.value = name.value.trim();
+
+ mainRouter.push(`/pages/edit/${pageId.value}`);
}
async function add() {
@@ -216,7 +205,7 @@ async function add() {
content.value.push({ id, type });
}
-function setEyeCatchingImage(img) {
+function setEyeCatchingImage(img: Event) {
selectFile(img.currentTarget ?? img.target, null).then(file => {
eyeCatchingImageId.value = file.id;
});
--
cgit v1.2.3-freya
From 74407bc8ee43a8c7b4bc8b7e16bdfb8acd2c794c Mon Sep 17 00:00:00 2001
From: Hazelnoot
Date: Sat, 1 Feb 2025 17:07:34 -0500
Subject: add MiUserProfile.defaultCW property and API
---
locales/index.d.ts | 2 +-
.../1738446745738-add_user_profile_default_cw.js | 11 +++++++++++
packages/backend/src/core/entities/UserEntityService.ts | 1 +
packages/backend/src/models/UserProfile.ts | 10 ++++++++--
packages/backend/src/models/json-schema/user.ts | 4 ++++
packages/backend/src/server/api/endpoints/i/update.ts | 17 +++++++++++++++++
packages/misskey-js/src/autogen/types.ts | 5 +++++
7 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 packages/backend/migration/1738446745738-add_user_profile_default_cw.js
(limited to 'packages/backend/src/models')
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 70eba52ea0..af5faefe1a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11631,7 +11631,7 @@ export interface Locale extends ILocale {
*/
"robotsTxt": string;
/**
- * Adding entries here will override the default robots.txt packaged with Sharkey. Maximum 2048 characters.
+ * Adding entries here will override the default robots.txt packaged with Sharkey.
*/
"robotsTxtDescription": string;
}
diff --git a/packages/backend/migration/1738446745738-add_user_profile_default_cw.js b/packages/backend/migration/1738446745738-add_user_profile_default_cw.js
new file mode 100644
index 0000000000..205ca2087a
--- /dev/null
+++ b/packages/backend/migration/1738446745738-add_user_profile_default_cw.js
@@ -0,0 +1,11 @@
+export class AddUserProfileDefaultCw1738446745738 {
+ name = 'AddUserProfileDefaultCw1738446745738'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "default_cw" text`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "default_cw"`);
+ }
+}
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 6bfe865038..0ca784fa52 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -669,6 +669,7 @@ export class UserEntityService implements OnModuleInit {
achievements: profile!.achievements,
loggedInDays: profile!.loggedInDates.length,
policies: this.roleService.getUserPolicies(user.id),
+ defaultCW: profile?.defaultCW ?? null,
} : {}),
...(opts.includeSecrets ? {
diff --git a/packages/backend/src/models/UserProfile.ts b/packages/backend/src/models/UserProfile.ts
index 751b1aff08..3c2362227e 100644
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@@ -36,10 +36,10 @@ export class MiUserProfile {
})
public birthday: string | null;
- @Column("varchar", {
+ @Column('varchar', {
length: 128,
nullable: true,
- comment: "The ListenBrainz username of the User.",
+ comment: 'The ListenBrainz username of the User.',
})
public listenbrainz: string | null;
@@ -290,6 +290,12 @@ export class MiUserProfile {
unlockedAt: number;
}[];
+ @Column('text', {
+ name: 'default_cw',
+ nullable: true,
+ })
+ public defaultCW: string | null;
+
//#region Denormalized fields
@Index()
@Column('varchar', {
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index f953008b3f..f6c7bd2151 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -752,6 +752,10 @@ export const packedMeDetailedOnlySchema = {
},
},
//#endregion
+ defaultCW: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
},
} as const;
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 09c06a108d..e487562687 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -133,6 +133,12 @@ export const meta = {
id: '0b3f9f6a-2f4d-4b1f-9fb4-49d3a2fd7191',
httpStatusCode: 422,
},
+
+ maxCwLength: {
+ message: 'You tried setting a default content warning which is too long.',
+ code: 'MAX_CW_LENGTH',
+ id: '7004c478-bda3-4b4f-acb2-4316398c9d52',
+ },
},
res: {
@@ -243,6 +249,7 @@ export const paramDef = {
uniqueItems: true,
items: { type: 'string' },
},
+ defaultCW: { type: 'string', nullable: true },
},
} as const;
@@ -494,6 +501,16 @@ export default class extends Endpoint { // eslint-
updates.alsoKnownAs = newAlsoKnownAs.size > 0 ? Array.from(newAlsoKnownAs) : null;
}
+ let defaultCW = ps.defaultCW;
+ if (defaultCW !== undefined) {
+ if (defaultCW === '') defaultCW = null;
+ if (defaultCW && defaultCW.length > this.config.maxCwLength) {
+ throw new ApiError(meta.errors.maxCwLength);
+ }
+
+ profileUpdates.defaultCW = defaultCW;
+ }
+
//#region emojis/tags
let emojis = [] as string[];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 888e46e008..78dac5f08b 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4217,6 +4217,7 @@ export type components = {
/** Format: date-time */
lastUsed: string;
}[];
+ defaultCW: string | null;
};
UserDetailedNotMe: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'];
MeDetailed: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'] & components['schemas']['MeDetailedOnly'];
@@ -5224,6 +5225,7 @@ export type components = {
enableFC: boolean;
fcSiteKey: string | null;
enableAchievements: boolean | null;
+ robotsTxt: string | null;
enableTestcaptcha: boolean;
swPublickey: string | null;
/** @default /assets/ai.png */
@@ -5434,6 +5436,7 @@ export type operations = {
enableStatsForFederatedInstances: boolean;
enableServerMachineStats: boolean;
enableAchievements: boolean;
+ robotsTxt: string | null;
enableIdenticonGeneration: boolean;
manifestJsonOverride: string;
policies: Record;
@@ -10163,6 +10166,7 @@ export type operations = {
enableStatsForFederatedInstances?: boolean;
enableServerMachineStats?: boolean;
enableAchievements?: boolean;
+ robotsTxt?: string | null;
enableIdenticonGeneration?: boolean;
serverRules?: string[];
bannedEmailDomains?: string[];
@@ -21631,6 +21635,7 @@ export type operations = {
};
emailNotificationTypes?: string[];
alsoKnownAs?: string[];
+ defaultCW?: string | null;
};
};
};
--
cgit v1.2.3-freya
From c8f8a61a00d07802dc5056eae48144e49bce742c Mon Sep 17 00:00:00 2001
From: Hazelnoot
Date: Sat, 1 Feb 2025 23:15:02 -0500
Subject: add MiUserProfile.defaultCWPriority property and API
---
.../1738468079662-add_user_profile_default_cw_priority.js | 13 +++++++++++++
packages/backend/src/core/entities/UserEntityService.ts | 7 +++++--
packages/backend/src/models/UserProfile.ts | 9 ++++++++-
packages/backend/src/models/json-schema/user.ts | 5 +++++
packages/backend/src/server/api/endpoints/i/update.ts | 8 ++++++++
packages/backend/src/types.ts | 2 ++
packages/misskey-js/src/autogen/types.ts | 4 ++++
7 files changed, 45 insertions(+), 3 deletions(-)
create mode 100644 packages/backend/migration/1738468079662-add_user_profile_default_cw_priority.js
(limited to 'packages/backend/src/models')
diff --git a/packages/backend/migration/1738468079662-add_user_profile_default_cw_priority.js b/packages/backend/migration/1738468079662-add_user_profile_default_cw_priority.js
new file mode 100644
index 0000000000..90de25e06f
--- /dev/null
+++ b/packages/backend/migration/1738468079662-add_user_profile_default_cw_priority.js
@@ -0,0 +1,13 @@
+export class AddUserProfileDefaultCwPriority1738468079662 {
+ name = 'AddUserProfileDefaultCwPriority1738468079662'
+
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE TYPE "public"."user_profile_default_cw_priority_enum" AS ENUM ('default', 'parent', 'defaultParent', 'parentDefault')`);
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "default_cw_priority" "public"."user_profile_default_cw_priority_enum" NOT NULL DEFAULT 'parent'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "default_cw_priority"`);
+ await queryRunner.query(`DROP TYPE "public"."user_profile_default_cw_priority_enum"`);
+ }
+}
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 0ca784fa52..6ea2d6629a 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -49,11 +49,13 @@ import { IdService } from '@/core/IdService.js';
import type { AnnouncementService } from '@/core/AnnouncementService.js';
import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+import { isSystemAccount } from '@/misc/is-system-account.js';
import type { OnModuleInit } from '@nestjs/common';
import type { NoteEntityService } from './NoteEntityService.js';
import type { DriveFileEntityService } from './DriveFileEntityService.js';
import type { PageEntityService } from './PageEntityService.js';
-import { isSystemAccount } from '@/misc/is-system-account.js';
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
const Ajv = _Ajv.default;
const ajv = new Ajv();
@@ -669,7 +671,8 @@ export class UserEntityService implements OnModuleInit {
achievements: profile!.achievements,
loggedInDays: profile!.loggedInDates.length,
policies: this.roleService.getUserPolicies(user.id),
- defaultCW: profile?.defaultCW ?? null,
+ defaultCW: profile!.defaultCW,
+ defaultCWPriority: profile!.defaultCWPriority,
} : {}),
...(opts.includeSecrets ? {
diff --git a/packages/backend/src/models/UserProfile.ts b/packages/backend/src/models/UserProfile.ts
index 3c2362227e..449c2f370b 100644
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@@ -4,7 +4,7 @@
*/
import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { obsoleteNotificationTypes, followingVisibilities, followersVisibilities, notificationTypes } from '@/types.js';
+import { obsoleteNotificationTypes, followingVisibilities, followersVisibilities, notificationTypes, noteVisibilities, defaultCWPriorities } from '@/types.js';
import { id } from './util/id.js';
import { MiUser } from './User.js';
import { MiPage } from './Page.js';
@@ -296,6 +296,13 @@ export class MiUserProfile {
})
public defaultCW: string | null;
+ @Column('enum', {
+ name: 'default_cw_priority',
+ enum: defaultCWPriorities,
+ default: 'parent',
+ })
+ public defaultCWPriority: typeof defaultCWPriorities[number];
+
//#region Denormalized fields
@Index()
@Column('varchar', {
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index f6c7bd2151..93b031e9c5 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -756,6 +756,11 @@ export const packedMeDetailedOnlySchema = {
type: 'string',
nullable: true, optional: false,
},
+ defaultCWPriority: {
+ type: 'string',
+ enum: ['default', 'parent', 'defaultParent', 'parentDefault'],
+ nullable: false, optional: false,
+ },
},
} as const;
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index e487562687..e1552fed8a 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -250,6 +250,11 @@ export const paramDef = {
items: { type: 'string' },
},
defaultCW: { type: 'string', nullable: true },
+ defaultCWPriority: {
+ type: 'string',
+ enum: ['default', 'parent', 'defaultParent', 'parentDefault'],
+ nullable: false,
+ },
},
} as const;
@@ -510,6 +515,9 @@ export default class extends Endpoint { // eslint-
profileUpdates.defaultCW = defaultCW;
}
+ if (ps.defaultCWPriority !== undefined) {
+ profileUpdates.defaultCWPriority = ps.defaultCWPriority;
+ }
//#region emojis/tags
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 37bed27fb1..067481d9da 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -58,6 +58,8 @@ export const mutedNoteReasons = ['word', 'manual', 'spam', 'other'] as const;
export const followingVisibilities = ['public', 'followers', 'private'] as const;
export const followersVisibilities = ['public', 'followers', 'private'] as const;
+export const defaultCWPriorities = ['default', 'parent', 'defaultParent', 'parentDefault'] as const;
+
/**
* ユーザーがエクスポートできるものの種類
*
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 78dac5f08b..c7268ade6a 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4218,6 +4218,8 @@ export type components = {
lastUsed: string;
}[];
defaultCW: string | null;
+ /** @enum {string} */
+ defaultCWPriority: 'default' | 'parent' | 'defaultParent' | 'parentDefault';
};
UserDetailedNotMe: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'];
MeDetailed: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'] & components['schemas']['MeDetailedOnly'];
@@ -21636,6 +21638,8 @@ export type operations = {
emailNotificationTypes?: string[];
alsoKnownAs?: string[];
defaultCW?: string | null;
+ /** @enum {string} */
+ defaultCWPriority?: 'default' | 'parent' | 'defaultParent' | 'parentDefault';
};
};
};
--
cgit v1.2.3-freya
From ed981a6970df4cecedb3fa7553f5fa8d43665a51 Mon Sep 17 00:00:00 2001
From: Hazelnoot
Date: Thu, 13 Feb 2025 09:28:46 -0500
Subject: add new note search file types (module, flash) and optimize file type
query
---
locales/index.d.ts | 36 +++++++
.../1739451520729-index_note_attachedFileTypes.js | 12 +++
packages/backend/src/core/SearchService.ts | 107 +++++++++++----------
packages/backend/src/models/Note.ts | 1 +
.../src/server/api/endpoints/notes/search.ts | 8 +-
packages/frontend/src/pages/search.note.vue | 16 +--
packages/misskey-js/src/autogen/types.ts | 3 +-
sharkey-locales/en-US.yml | 11 +++
8 files changed, 135 insertions(+), 59 deletions(-)
create mode 100644 packages/backend/migration/1739451520729-index_note_attachedFileTypes.js
(limited to 'packages/backend/src/models')
diff --git a/locales/index.d.ts b/locales/index.d.ts
index a1bfc4a595..7e90a779dc 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11706,6 +11706,42 @@ export interface Locale extends ILocale {
*/
"title": string;
};
+ "_noteSearch": {
+ /**
+ * Sort by newest to oldest
+ */
+ "newestToOldest": string;
+ /**
+ * File Type
+ */
+ "fileType": string;
+ "_fileType": {
+ /**
+ * None
+ */
+ "none": string;
+ /**
+ * Images
+ */
+ "image": string;
+ /**
+ * Videos
+ */
+ "video": string;
+ /**
+ * Audio
+ */
+ "audio": string;
+ /**
+ * Module
+ */
+ "module": string;
+ /**
+ * Flash
+ */
+ "flash": string;
+ };
+ };
}
declare const locales: {
[lang: string]: Locale;
diff --git a/packages/backend/migration/1739451520729-index_note_attachedFileTypes.js b/packages/backend/migration/1739451520729-index_note_attachedFileTypes.js
new file mode 100644
index 0000000000..351908a68c
--- /dev/null
+++ b/packages/backend/migration/1739451520729-index_note_attachedFileTypes.js
@@ -0,0 +1,12 @@
+// https://stackoverflow.com/a/4059785
+export class IndexNoteAttachedFileTypes1739451520729 {
+ name = 'IndexNoteAttachedFileTypes1739451520729'
+
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE INDEX "IDX_NOTE_ATTACHED_FILE_TYPES" ON "note" USING GIN ("attachedFileTypes" array_ops)`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`DROP INDEX "IDX_NOTE_ATTACHED_FILE_TYPES"`);
+ }
+}
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 6dc3e85fc8..a8c6ac61f3 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -61,6 +61,60 @@ function compileQuery(q: Q): string {
}
}
+const fileTypes = {
+ image: [
+ 'image/webp',
+ 'image/png',
+ 'image/jpeg',
+ 'image/avif',
+ 'image/apng',
+ 'image/gif',
+ ],
+ video: [
+ 'video/mp4',
+ 'video/webm',
+ 'video/mpeg',
+ 'video/x-m4v',
+ ],
+ audio: [
+ 'audio/mpeg',
+ 'audio/flac',
+ 'audio/wav',
+ 'audio/aac',
+ 'audio/webm',
+ 'audio/opus',
+ 'audio/ogg',
+ 'audio/x-m4a',
+ 'audio/mod',
+ 'audio/s3m',
+ 'audio/xm',
+ 'audio/it',
+ 'audio/x-mod',
+ 'audio/x-s3m',
+ 'audio/x-xm',
+ 'audio/x-it',
+ ],
+ // Keep in sync with frontend-shared/js/const.ts
+ module: [
+ 'audio/mod',
+ 'audio/x-mod',
+ 'audio/s3m',
+ 'audio/x-s3m',
+ 'audio/xm',
+ 'audio/x-xm',
+ 'audio/it',
+ 'audio/x-it',
+ ],
+ flash: [
+ 'application/x-shockwave-flash',
+ 'application/vnd.adobe.flash.movie',
+ ],
+};
+
+// Make sure to regenerate misskey-js and check search.note.vue after changing these
+export const fileTypeCategories = ['image', 'video', 'audio', 'module', 'flash'] as const;
+export type FileTypeCategory = typeof fileTypeCategories[number];
+
@Injectable()
export class SearchService {
private readonly meilisearchIndexScope: 'local' | 'global' | string[] = 'local';
@@ -163,7 +217,7 @@ export class SearchService {
userId?: MiNote['userId'] | null;
channelId?: MiNote['channelId'] | null;
host?: string | null;
- filetype?: string | null;
+ filetype?: FileTypeCategory | null;
order?: string | null;
disableMeili?: boolean | null;
}, pagination: {
@@ -188,42 +242,8 @@ export class SearchService {
}
}
if (opts.filetype) {
- if (opts.filetype === 'image') {
- filter.qs.push({ op: 'or', qs: [
- { op: '=', k: 'attachedFileTypes', v: 'image/webp' },
- { op: '=', k: 'attachedFileTypes', v: 'image/png' },
- { op: '=', k: 'attachedFileTypes', v: 'image/jpeg' },
- { op: '=', k: 'attachedFileTypes', v: 'image/avif' },
- { op: '=', k: 'attachedFileTypes', v: 'image/apng' },
- { op: '=', k: 'attachedFileTypes', v: 'image/gif' },
- ] });
- } else if (opts.filetype === 'video') {
- filter.qs.push({ op: 'or', qs: [
- { op: '=', k: 'attachedFileTypes', v: 'video/mp4' },
- { op: '=', k: 'attachedFileTypes', v: 'video/webm' },
- { op: '=', k: 'attachedFileTypes', v: 'video/mpeg' },
- { op: '=', k: 'attachedFileTypes', v: 'video/x-m4v' },
- ] });
- } else if (opts.filetype === 'audio') {
- filter.qs.push({ op: 'or', qs: [
- { op: '=', k: 'attachedFileTypes', v: 'audio/mpeg' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/flac' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/wav' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/aac' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/webm' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/opus' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/ogg' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/x-m4a' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/mod' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/s3m' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/xm' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/it' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/x-mod' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/x-s3m' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/x-xm' },
- { op: '=', k: 'attachedFileTypes', v: 'audio/x-it' },
- ] });
- }
+ const filters = fileTypes[opts.filetype].map(mime => ({ op: '=' as const, k: 'attachedFileTypes', v: mime }));
+ filter.qs.push({ op: 'or', qs: filters });
}
const res = await this.meilisearchNoteIndex!.search(q, {
sort: [`createdAt:${opts.order ? opts.order : 'desc'}`],
@@ -274,18 +294,7 @@ export class SearchService {
}
if (opts.filetype) {
- /* this is very ugly, but the "correct" solution would
- be `and exists (select 1 from
- unnest(note."attachedFileTypes") x(t) where t like
- :type)` and I can't find a way to get TypeORM to
- generate that; this hack works because `~*` is
- "regexp match, ignoring case" and the stringified
- version of an array of varchars (which is what
- `attachedFileTypes` is) looks like `{foo,bar}`, so
- we're looking for opts.filetype as the first half of
- a MIME type, either at start of the array (after the
- `{`) or later (after a `,`) */
- query.andWhere(`note."attachedFileTypes"::varchar ~* :type`, { type: `[{,]${opts.filetype}/` });
+ query.andWhere('note."attachedFileTypes" && :types', { types: fileTypes[opts.filetype] });
}
this.queryService.generateVisibilityQuery(query, me);
diff --git a/packages/backend/src/models/Note.ts b/packages/backend/src/models/Note.ts
index 408e023ff7..8b5265e8fe 100644
--- a/packages/backend/src/models/Note.ts
+++ b/packages/backend/src/models/Note.ts
@@ -143,6 +143,7 @@ export class MiNote {
})
public fileIds: MiDriveFile['id'][];
+ @Index('IDX_NOTE_ATTACHED_FILE_TYPES', { synchronize: false })
@Column('varchar', {
length: 256, array: true, default: '{}',
})
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index eca55cd085..f46f4d2adb 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -5,7 +5,7 @@
import { Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import { SearchService } from '@/core/SearchService.js';
+import { fileTypeCategories, SearchService } from '@/core/SearchService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { RoleService } from '@/core/RoleService.js';
import { ApiError } from '../../error.js';
@@ -52,7 +52,11 @@ export const paramDef = {
type: 'string',
description: 'The local host is represented with `.`.',
},
- filetype: { type: 'string', nullable: true },
+ filetype: {
+ type: 'string',
+ nullable: true,
+ enum: fileTypeCategories,
+ },
userId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
channelId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
order: { type: 'string' },
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index d64537d289..e080aea064 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -22,13 +22,15 @@ SPDX-License-Identifier: AGPL-3.0-only
- Sort by newest to oldest
+ {{ i18n.ts._noteSearch.newestToOldest }}
- File Type
-
-
-
-
+ {{ i18n.ts._noteSearch.fileType }}
+
+
+
+
+
+
@@ -97,7 +99,7 @@ const notePagination = ref();
const user = ref(null);
const hostInput = ref(toRef(props, 'host').value);
const order = ref(false);
-const filetype = ref(null);
+const filetype = ref<'image' | 'video' | 'audio' | 'module' | 'flash' | null>(null);
const noteSearchableScope = instance.noteSearchableScope ?? 'local';
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 5d252fc030..816641bf76 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -25029,7 +25029,8 @@ export type operations = {
offset?: number;
/** @description The local host is represented with `.`. */
host?: string;
- filetype?: string | null;
+ /** @enum {string|null} */
+ filetype?: 'image' | 'video' | 'audio' | 'module' | 'flash';
/**
* Format: misskey:id
* @default null
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 57889ec995..8118227ce1 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -458,3 +458,14 @@ genKeys: "Generate Keys"
_genKeysDialog:
text: "Are you sure that you want to generate new keys? This will stop push notifications for all users who have already enabled them."
title: "Generate new keys"
+
+_noteSearch:
+ newestToOldest: "Sort by newest to oldest"
+ fileType: "File Type"
+ _fileType:
+ none: "None"
+ image: "Images"
+ video: "Videos"
+ audio: "Audio"
+ module: "Module"
+ flash: "Flash"
--
cgit v1.2.3-freya
From ea89348b62706c4f6fbeaf603fc73d1b9874e7d0 Mon Sep 17 00:00:00 2001
From: Hazelnoot
Date: Tue, 28 Jan 2025 01:47:03 -0500
Subject: add user-level "force content warning" moderation feature
---
locales/index.d.ts | 8 +
.../1738043621143-add_user_mandatoryCW.js | 11 +
packages/backend/src/core/NoteCreateService.ts | 11 +
packages/backend/src/core/NoteEditService.ts | 10 +
packages/backend/src/models/User.ts | 9 +
.../src/server/api/endpoints/admin/cw-user.ts | 53 ++
.../src/server/api/endpoints/admin/show-user.ts | 5 +
packages/frontend/src/pages/admin-user.vue | 16 +
packages/misskey-js/src/autogen/apiClientJSDoc.ts | 814 ++++++++++-----------
packages/misskey-js/src/consts.ts | 1 +
sharkey-locales/en-US.yml | 3 +
11 files changed, 534 insertions(+), 407 deletions(-)
create mode 100644 packages/backend/migration/1738043621143-add_user_mandatoryCW.js
create mode 100644 packages/backend/src/server/api/endpoints/admin/cw-user.ts
(limited to 'packages/backend/src/models')
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 9624b48b42..65e8096403 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12089,6 +12089,14 @@ export interface Locale extends ILocale {
* ID
*/
"id": string;
+ /**
+ * Force content warning
+ */
+ "mandatoryCW": string;
+ /**
+ * Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end.
+ */
+ "mandatoryCWDescription": string;
}
declare const locales: {
[lang: string]: Locale;
diff --git a/packages/backend/migration/1738043621143-add_user_mandatoryCW.js b/packages/backend/migration/1738043621143-add_user_mandatoryCW.js
new file mode 100644
index 0000000000..dd05076dd2
--- /dev/null
+++ b/packages/backend/migration/1738043621143-add_user_mandatoryCW.js
@@ -0,0 +1,11 @@
+export class AddUserMandatoryCW1738043621143 {
+ name = 'AddUserCW1738043621143'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user" ADD "mandatoryCW" text`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "mandatoryCW"`);
+ }
+}
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index f24c665659..ecf711e011 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -234,6 +234,7 @@ export class NoteCreateService implements OnApplicationShutdown {
host: MiUser['host'];
isBot: MiUser['isBot'];
noindex: MiUser['noindex'];
+ mandatoryCW: MiUser['mandatoryCW'];
}, data: Option, silent = false): Promise {
// チャンネル外にリプライしたら対象のスコープに合わせる
// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
@@ -368,6 +369,15 @@ export class NoteCreateService implements OnApplicationShutdown {
data.cw = null;
}
+ // Apply mandatory CW, if applicable
+ if (user.mandatoryCW) {
+ if (data.cw) {
+ data.cw += `, ${user.mandatoryCW}`;
+ } else {
+ data.cw = user.mandatoryCW;
+ }
+ }
+
let tags = data.apHashtags;
let emojis = data.apEmojis;
let mentionedUsers = data.apMentions;
@@ -441,6 +451,7 @@ export class NoteCreateService implements OnApplicationShutdown {
host: MiUser['host'];
isBot: MiUser['isBot'];
noindex: MiUser['noindex'];
+ mandatoryCW: MiUser['mandatoryCW'];
}, data: Option): Promise {
return this.create(user, data, true);
}
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 18912181d7..1f947aaffb 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -230,6 +230,7 @@ export class NoteEditService implements OnApplicationShutdown {
host: MiUser['host'];
isBot: MiUser['isBot'];
noindex: MiUser['noindex'];
+ mandatoryCW: MiUser['mandatoryCW'];
}, editid: MiNote['id'], data: Option, silent = false): Promise {
if (!editid) {
throw new Error('fail');
@@ -396,6 +397,15 @@ export class NoteEditService implements OnApplicationShutdown {
data.cw = null;
}
+ // Apply mandatory CW, if applicable
+ if (user.mandatoryCW) {
+ if (data.cw) {
+ data.cw += `, ${user.mandatoryCW}`;
+ } else {
+ data.cw = user.mandatoryCW;
+ }
+ }
+
let tags = data.apHashtags;
let emojis = data.apEmojis;
let mentionedUsers = data.apMentions;
diff --git a/packages/backend/src/models/User.ts b/packages/backend/src/models/User.ts
index 3a825d36a7..8a3ad1003d 100644
--- a/packages/backend/src/models/User.ts
+++ b/packages/backend/src/models/User.ts
@@ -339,6 +339,15 @@ export class MiUser {
})
public enableRss: boolean;
+ /**
+ * Specifies a Content Warning that should be forcibly applied to all notes by this user.
+ * If null (default), then no Content Warning is applied.
+ */
+ @Column('text', {
+ nullable: true,
+ })
+ public mandatoryCW: string | null;
+
constructor(data: Partial) {
if (data == null) return;
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
new file mode 100644
index 0000000000..d48ca565a4
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { UsersRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { CacheService } from '@/core/CacheService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ requireCredential: true,
+ requireModerator: true,
+ kind: 'write:admin:cw-user',
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ userId: { type: 'string', format: 'misskey:id' },
+ cw: { type: 'string', nullable: true },
+ },
+ required: ['userId', 'cw'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ @Inject(DI.usersRepository)
+ private readonly usersRepository: UsersRepository,
+
+ private readonly globalEventService: GlobalEventService,
+ ) {
+ super(meta, paramDef, async ps => {
+ const result = await this.usersRepository.update(ps.userId, {
+ // Collapse empty strings to null
+ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+ mandatoryCW: ps.cw || null,
+ });
+
+ if (result.affected && result.affected < 1) {
+ throw new Error('No such user');
+ }
+
+ // Synchronize caches and other processes
+ this.globalEventService.publishInternalEvent('localUserUpdated', { id: ps.userId });
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 669bffe2dc..0f0b0f8e7a 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -144,6 +144,10 @@ export const meta = {
type: 'string',
optional: false, nullable: false,
},
+ mandatoryCW: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
signins: {
type: 'array',
optional: false, nullable: false,
@@ -260,6 +264,7 @@ export default class extends Endpoint { // eslint-
isHibernated: user.isHibernated,
lastActiveDate: user.lastActiveDate ? user.lastActiveDate.toISOString() : null,
moderationNote: profile.moderationNote ?? '',
+ mandatoryCW: user.mandatoryCW,
signins,
policies: await this.roleService.getUserPolicies(user.id),
roles: await this.roleEntityService.packMany(roles, me),
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 11a34d34ef..e21db84334 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -83,6 +83,11 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.suspend }}
{{ i18n.ts.markAsNSFW }}
+
+ {{ i18n.ts.mandatoryCW }}
+ {{ i18n.ts.mandatoryCWDescription }}
+
+
{{ i18n.ts.resetPassword }}
@@ -222,6 +227,7 @@ import { i18n } from '@/i18n.js';
import { iAmAdmin, $i, iAmModerator } from '@/account.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
import MkPagination from '@/components/MkPagination.vue';
+import MkInput from '@/components/MkInput.vue';
const props = withDefaults(defineProps<{
userId: string;
@@ -243,6 +249,7 @@ const approved = ref(false);
const suspended = ref(false);
const markedAsNSFW = ref(false);
const moderationNote = ref('');
+const mandatoryCW = ref(null);
const isSystem = computed(() => info.value?.isSystem ?? false);
const filesPagination = {
endpoint: 'admin/drive/files' as const,
@@ -281,6 +288,15 @@ function createFetcher() {
markedAsNSFW.value = info.value.alwaysMarkNsfw;
suspended.value = info.value.isSuspended;
moderationNote.value = info.value.moderationNote;
+ mandatoryCW.value = info.value.mandatoryCW;
+
+ // These watch statements work because they're lazy-initialized.
+ // The watched values are already set, so they don't trigger any "change" just from refreshing the user.
+
+ watch(mandatoryCW, async () => {
+ await os.apiWithDialog('admin/cw-user', { userId: props.userId, cw: mandatoryCW.value });
+ refreshUser();
+ });
watch(moderationNote, async () => {
await misskeyApi('admin/update-user-note', { userId: user.value.id, text: moderationNote.value });
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index f4120b3afc..5e47ad15ad 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -5,7 +5,7 @@ declare module '../api.js' {
export interface APIClient {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:abuse-report:notification-recipient*
*/
@@ -17,7 +17,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:abuse-report:notification-recipient*
*/
@@ -29,7 +29,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *read:admin:abuse-report:notification-recipient*
*/
@@ -41,7 +41,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *read:admin:abuse-report:notification-recipient*
*/
@@ -53,7 +53,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:abuse-report:notification-recipient*
*/
@@ -65,7 +65,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:abuse-user-reports*
*/
request(
@@ -76,7 +76,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -87,7 +87,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:account*
*/
request(
@@ -98,7 +98,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:account*
*/
request(
@@ -109,7 +109,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:ad*
*/
request(
@@ -120,7 +120,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:ad*
*/
request(
@@ -131,7 +131,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:ad*
*/
request(
@@ -142,7 +142,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:ad*
*/
request(
@@ -153,7 +153,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:announcements*
*/
request(
@@ -164,7 +164,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:announcements*
*/
request(
@@ -175,7 +175,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:announcements*
*/
request(
@@ -186,7 +186,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:announcements*
*/
request(
@@ -197,7 +197,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:approve-user*
*/
request(
@@ -208,7 +208,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:avatar-decorations*
*/
request(
@@ -219,7 +219,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:avatar-decorations*
*/
request(
@@ -230,7 +230,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:avatar-decorations*
*/
request(
@@ -241,7 +241,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:avatar-decorations*
*/
request(
@@ -252,7 +252,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:meta*
*/
request(
@@ -263,7 +263,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
request(
@@ -274,7 +274,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:decline-user*
*/
request(
@@ -285,7 +285,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:delete-account*
*/
request(
@@ -296,7 +296,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:delete-all-files-of-a-user*
*/
request(
@@ -307,7 +307,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:drive*
*/
request(
@@ -318,7 +318,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:drive*
*/
request(
@@ -329,7 +329,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:drive*
*/
request(
@@ -340,7 +340,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:drive*
*/
request(
@@ -351,7 +351,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -362,7 +362,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -373,7 +373,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -384,7 +384,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -395,7 +395,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -406,7 +406,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes*
*/
@@ -418,7 +418,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
*/
request(
@@ -429,7 +429,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
*/
request(
@@ -440,7 +440,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -451,7 +451,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -462,7 +462,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -473,7 +473,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -484,7 +484,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:emoji*
*/
request(
@@ -495,7 +495,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:federation*
*/
request(
@@ -506,7 +506,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:federation*
*/
request(
@@ -517,7 +517,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:federation*
*/
request(
@@ -528,7 +528,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:federation*
*/
request(
@@ -539,7 +539,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:resolve-abuse-user-report*
*/
request(
@@ -550,7 +550,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
request(
@@ -561,7 +561,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:index-stats*
*/
request(
@@ -572,7 +572,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:table-stats*
*/
request(
@@ -583,7 +583,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:user-ips*
*/
request(
@@ -594,7 +594,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:invite-codes*
*/
request(
@@ -605,7 +605,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:invite-codes*
*/
request(
@@ -616,7 +616,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:meta*
*/
request(
@@ -627,7 +627,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:nsfw-user*
*/
request(
@@ -638,7 +638,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:promo*
*/
request(
@@ -649,7 +649,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:queue*
*/
request(
@@ -660,7 +660,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:queue*
*/
request(
@@ -671,7 +671,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:queue*
*/
request(
@@ -682,7 +682,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:queue*
*/
request(
@@ -693,7 +693,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
*/
request(
@@ -704,7 +704,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:relays*
*/
request(
@@ -715,7 +715,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:relays*
*/
request(
@@ -726,7 +726,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:relays*
*/
request(
@@ -737,7 +737,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:reset-password*
*/
request(
@@ -748,7 +748,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:resolve-abuse-user-report*
*/
request(
@@ -759,7 +759,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -770,7 +770,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -781,7 +781,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -792,7 +792,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:roles*
*/
request(
@@ -803,7 +803,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:roles*
*/
request(
@@ -814,7 +814,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -825,7 +825,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -836,7 +836,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:roles*
*/
request(
@@ -847,7 +847,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No* / **Permission**: *read:admin:roles*
*/
request(
@@ -858,7 +858,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:send-email*
*/
request(
@@ -869,7 +869,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:server-info*
*/
request(
@@ -880,7 +880,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:show-moderation-log*
*/
request(
@@ -891,7 +891,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:show-user*
*/
request(
@@ -902,7 +902,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:admin:show-user*
*/
request(
@@ -913,7 +913,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:silence-user*
*/
request(
@@ -924,7 +924,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:suspend-user*
*/
request(
@@ -935,7 +935,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:system-webhook*
*/
@@ -947,7 +947,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:system-webhook*
*/
@@ -959,7 +959,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:system-webhook*
*/
@@ -971,7 +971,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:system-webhook*
*/
@@ -983,7 +983,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *read:admin:system-webhook*
*/
@@ -995,7 +995,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes* / **Permission**: *write:admin:system-webhook*
*/
@@ -1007,7 +1007,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:unnsfw-user*
*/
request(
@@ -1018,7 +1018,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:unset-user-avatar*
*/
request(
@@ -1029,7 +1029,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:unset-user-banner*
*/
request(
@@ -1040,7 +1040,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:unsilence-user*
*/
request(
@@ -1051,7 +1051,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:unsuspend-user*
*/
request(
@@ -1062,7 +1062,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:resolve-abuse-user-report*
*/
request(
@@ -1073,7 +1073,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
request(
@@ -1084,7 +1084,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:admin:user-note*
*/
request(
@@ -1095,7 +1095,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1106,7 +1106,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1117,7 +1117,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1128,7 +1128,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1139,7 +1139,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1150,7 +1150,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1161,7 +1161,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1172,7 +1172,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1183,7 +1183,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:federation*
*/
request(
@@ -1194,7 +1194,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1205,7 +1205,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1216,7 +1216,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1227,7 +1227,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes*
*/
@@ -1239,7 +1239,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1250,7 +1250,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1261,7 +1261,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1272,7 +1272,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:blocks*
*/
request(
@@ -1283,7 +1283,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:blocks*
*/
request(
@@ -1294,7 +1294,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:blocks*
*/
request(
@@ -1305,7 +1305,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1316,7 +1316,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1327,7 +1327,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1338,7 +1338,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1349,7 +1349,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1360,7 +1360,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1371,7 +1371,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:channels*
*/
request(
@@ -1382,7 +1382,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:channels*
*/
request(
@@ -1393,7 +1393,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:channels*
*/
request(
@@ -1404,7 +1404,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1415,7 +1415,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1426,7 +1426,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1437,7 +1437,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1448,7 +1448,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1459,7 +1459,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:channels*
*/
request(
@@ -1470,7 +1470,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1481,7 +1481,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1492,7 +1492,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1503,7 +1503,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1514,7 +1514,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1525,7 +1525,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1536,7 +1536,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1547,7 +1547,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1558,7 +1558,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1569,7 +1569,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1580,7 +1580,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1591,7 +1591,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1602,7 +1602,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1613,7 +1613,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1624,7 +1624,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1635,7 +1635,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:clip-favorite*
*/
request(
@@ -1646,7 +1646,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1657,7 +1657,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:clip-favorite*
*/
request(
@@ -1668,7 +1668,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No* / **Permission**: *read:account*
*/
request(
@@ -1679,7 +1679,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1690,7 +1690,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No* / **Permission**: *read:account*
*/
request(
@@ -1701,7 +1701,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:clip-favorite*
*/
request(
@@ -1712,7 +1712,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:account*
*/
request(
@@ -1723,7 +1723,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1734,7 +1734,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1745,7 +1745,7 @@ declare module '../api.js' {
/**
* Find the notes to which the given file is attached.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1756,7 +1756,7 @@ declare module '../api.js' {
/**
* Check if a given file exists.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1767,7 +1767,7 @@ declare module '../api.js' {
/**
* Upload a new drive file.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1778,7 +1778,7 @@ declare module '../api.js' {
/**
* Delete an existing drive file.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1789,7 +1789,7 @@ declare module '../api.js' {
/**
* Search for a drive file by the given parameters.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1800,7 +1800,7 @@ declare module '../api.js' {
/**
* Search for a drive file by a hash of the contents.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1811,7 +1811,7 @@ declare module '../api.js' {
/**
* Show the properties of a drive file.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1822,7 +1822,7 @@ declare module '../api.js' {
/**
* Update the properties of a drive file.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1833,7 +1833,7 @@ declare module '../api.js' {
/**
* Request the server to download a new drive file from the specified URL.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1844,7 +1844,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1855,7 +1855,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1866,7 +1866,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1877,7 +1877,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1888,7 +1888,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1899,7 +1899,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:drive*
*/
request(
@@ -1910,7 +1910,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:drive*
*/
request(
@@ -1921,7 +1921,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1932,7 +1932,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1943,7 +1943,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1954,7 +1954,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1965,7 +1965,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -1976,7 +1976,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes*
*/
@@ -1988,7 +1988,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -1999,7 +1999,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:account*
*/
request(
@@ -2010,7 +2010,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2021,7 +2021,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2032,7 +2032,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2043,7 +2043,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2054,7 +2054,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2065,7 +2065,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties.
* **Credential required**: *Yes*
*/
@@ -2077,7 +2077,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2088,7 +2088,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:flash*
*/
request(
@@ -2099,7 +2099,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:flash*
*/
request(
@@ -2110,7 +2110,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2121,7 +2121,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:flash-likes*
*/
request(
@@ -2132,7 +2132,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:flash*
*/
request(
@@ -2143,7 +2143,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:flash-likes*
*/
request(
@@ -2154,7 +2154,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2165,7 +2165,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:flash-likes*
*/
request(
@@ -2176,7 +2176,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:flash*
*/
request(
@@ -2187,7 +2187,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2198,7 +2198,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2209,7 +2209,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2220,7 +2220,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2231,7 +2231,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2242,7 +2242,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:following*
*/
request(
@@ -2253,7 +2253,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2264,7 +2264,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *read:following*
*/
request(
@@ -2275,7 +2275,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2286,7 +2286,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:following*
*/
request(
@@ -2297,7 +2297,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2308,7 +2308,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2319,7 +2319,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2330,7 +2330,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:gallery*
*/
request(
@@ -2341,7 +2341,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:gallery*
*/
request(
@@ -2352,7 +2352,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:gallery-likes*
*/
request(
@@ -2363,7 +2363,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2374,7 +2374,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:gallery-likes*
*/
request(
@@ -2385,7 +2385,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *Yes* / **Permission**: *write:gallery*
*/
request(
@@ -2396,7 +2396,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2407,7 +2407,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2418,7 +2418,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2429,7 +2429,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2440,7 +2440,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2451,7 +2451,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request(
@@ -2462,7 +2462,7 @@ declare module '../api.js' {
/**
* No description provided.
- *
+ *
* **Credential required**: *No*
*/
request
@@ -64,10 +64,14 @@ const props = withDefaults(defineProps<{
defaultOpen?: boolean;
maxHeight?: number | null;
withSpacer?: boolean;
+ spacerMin?: number;
+ spacerMax?: number;
}>(), {
defaultOpen: false,
maxHeight: null,
withSpacer: true,
+ spacerMin: 14,
+ spacerMax: 22,
});
const rootEl = shallowRef();
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index c766a33823..a446dad0ab 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -288,20 +288,23 @@ const align = () => {
const onOpened = () => {
emit('opened');
- // NOTE: Chromatic テストの際に undefined になる場合がある
- if (content.value == null) return;
-
- // モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
- const el = content.value.children[0];
- el.addEventListener('mousedown', ev => {
- contentClicking = true;
- window.addEventListener('mouseup', ev => {
- // click イベントより先に mouseup イベントが発生するかもしれないのでちょっと待つ
- window.setTimeout(() => {
- contentClicking = false;
- }, 100);
- }, { passive: true, once: true });
- }, { passive: true });
+ // contentの子要素にアクセスするためレンダリングの完了を待つ必要がある（nextTickが必要）
+ nextTick(() => {
+ // NOTE: Chromatic テストの際に undefined になる場合がある
+ if (content.value == null) return;
+
+ // モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
+ const el = content.value.children[0];
+ el.addEventListener('mousedown', ev => {
+ contentClicking = true;
+ window.addEventListener('mouseup', ev => {
+ // click イベントより先に mouseup イベントが発生するかもしれないのでちょっと待つ
+ window.setTimeout(() => {
+ contentClicking = false;
+ }, 100);
+ }, { passive: true, once: true });
+ }, { passive: true });
+ });
};
const onClosed = () => {
diff --git a/packages/frontend/src/components/MkPagingButtons.vue b/packages/frontend/src/components/MkPagingButtons.vue
new file mode 100644
index 0000000000..fe59efd83a
--- /dev/null
+++ b/packages/frontend/src/components/MkPagingButtons.vue
@@ -0,0 +1,124 @@
+
+
+
+;
+
+export const InitialIds = {
+ ...Default,
+ args: {
+ ...Default.args,
+ initialRoleIds: [roles[0].id, roles[1].id, roles[4].id, roles[6].id, roles[8].id, roles[10].id],
+ },
+} satisfies StoryObj;
+
+export const InfoMessage = {
+ ...Default,
+ args: {
+ ...Default.args,
+ infoMessage: 'This is a message.',
+ },
+} satisfies StoryObj;
+
+export const Title = {
+ ...Default,
+ args: {
+ ...Default.args,
+ title: 'Select roles',
+ },
+} satisfies StoryObj;
+
+export const Full = {
+ ...Default,
+ args: {
+ ...Default.args,
+ initialRoleIds: roles.map(it => it.id),
+ infoMessage: InfoMessage.args.infoMessage,
+ title: Title.args.title,
+ },
+} satisfies StoryObj;
+
+export const FullWithPrivate = {
+ ...Default,
+ args: {
+ ...Default.args,
+ initialRoleIds: roles.map(it => it.id),
+ infoMessage: InfoMessage.args.infoMessage,
+ title: Title.args.title,
+ publicOnly: false,
+ },
+} satisfies StoryObj;
diff --git a/packages/frontend/src/components/MkRoleSelectDialog.vue b/packages/frontend/src/components/MkRoleSelectDialog.vue
new file mode 100644
index 0000000000..67a7a3f752
--- /dev/null
+++ b/packages/frontend/src/components/MkRoleSelectDialog.vue
@@ -0,0 +1,200 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSortOrderEditor.define.ts b/packages/frontend/src/components/MkSortOrderEditor.define.ts
new file mode 100644
index 0000000000..f023b5d72b
--- /dev/null
+++ b/packages/frontend/src/components/MkSortOrderEditor.define.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export type SortOrderDirection = '+' | '-'
+
+export type SortOrder = {
+ key: T;
+ direction: SortOrderDirection;
+}
diff --git a/packages/frontend/src/components/MkSortOrderEditor.vue b/packages/frontend/src/components/MkSortOrderEditor.vue
new file mode 100644
index 0000000000..da08f12297
--- /dev/null
+++ b/packages/frontend/src/components/MkSortOrderEditor.vue
@@ -0,0 +1,112 @@
+
+
+
+;
+
+export const Icon = {
+ ...Default,
+ args: {
+ ...Default.args,
+ iconClass: 'ti ti-arrow-up',
+ },
+} satisfies StoryObj;
+
+export const ExButton = {
+ ...Default,
+ args: {
+ ...Default.args,
+ exButtonIconClass: 'ti ti-x',
+ },
+} satisfies StoryObj;
+
+export const IconExButton = {
+ ...Default,
+ args: {
+ ...Default.args,
+ iconClass: 'ti ti-arrow-up',
+ exButtonIconClass: 'ti ti-x',
+ },
+} satisfies StoryObj;
diff --git a/packages/frontend/src/components/MkTagItem.vue b/packages/frontend/src/components/MkTagItem.vue
new file mode 100644
index 0000000000..98f2411392
--- /dev/null
+++ b/packages/frontend/src/components/MkTagItem.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkDataCell.vue b/packages/frontend/src/components/grid/MkDataCell.vue
new file mode 100644
index 0000000000..0ffd42abda
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkDataCell.vue
@@ -0,0 +1,391 @@
+
+
+
+, data?: DataSource[] }) {
+ const refData = ref[]>([]);
+ for (let i = 0; i < 100; i++) {
+ refData.value.push(d({}, i.toString()));
+ }
+
+ return {
+ settings: {
+ row: overrides?.settings?.row,
+ cols: [
+ ...defaultCols.filter(col => overrides?.settings?.cols?.every(c => c.bindTo !== col.bindTo) ?? true),
+ ...overrides?.settings?.cols ?? [],
+ ],
+ cells: overrides?.settings?.cells,
+ },
+ data: refData.value,
+ };
+}
+
+function createRender(params: { settings: GridSetting, data: DataSource[] }) {
+ return {
+ render(args) {
+ return {
+ components: {
+ MkGrid,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ data() {
+ return {
+ data: args.data,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...args,
+ };
+ },
+ events() {
+ return {
+ event: (event: GridEvent, context: GridContext) => {
+ switch (event.type) {
+ case 'cell-value-change': {
+ args.data[event.row.index][event.column.setting.bindTo] = event.newValue;
+ }
+ }
+ },
+ };
+ },
+ },
+ template: ';
+}
+
+export const Default = createRender(createArgs());
+
+export const NoNumber = createRender(createArgs({
+ settings: {
+ row: {
+ showNumber: false,
+ },
+ },
+}));
+
+export const NoSelectable = createRender(createArgs({
+ settings: {
+ row: {
+ selectable: false,
+ },
+ },
+}));
+
+export const Editable = createRender(createArgs({
+ settings: {
+ cols: defaultCols.map(col => ({ ...col, editable: true })),
+ },
+}));
+
+export const AdditionalRowStyle = createRender(createArgs({
+ settings: {
+ cols: defaultCols.map(col => ({ ...col, editable: true })),
+ row: {
+ styleRules: [
+ {
+ condition: ({ row }) => AdditionalRowStyle.args.data[row.index].check as boolean,
+ applyStyle: {
+ style: {
+ backgroundColor: 'lightgray',
+ },
+ },
+ },
+ ],
+ },
+ },
+}));
+
+export const ContextMenu = createRender(createArgs({
+ settings: {
+ cols: [
+ {
+ bindTo: 'check', icon: 'ti-check', type: 'boolean', width: 50, contextMenuFactory: (col, context) => [
+ {
+ type: 'button',
+ text: 'Check All',
+ action: () => {
+ for (const d of ContextMenu.args.data) {
+ d.check = true;
+ }
+ },
+ },
+ {
+ type: 'button',
+ text: 'Uncheck All',
+ action: () => {
+ for (const d of ContextMenu.args.data) {
+ d.check = false;
+ }
+ },
+ },
+ ],
+ },
+ ],
+ row: {
+ contextMenuFactory: (row, context) => [
+ {
+ type: 'button',
+ text: 'Delete',
+ action: () => {
+ const idxes = context.rangedRows.map(r => r.index);
+ const newData = ContextMenu.args.data.filter((d, i) => !idxes.includes(i));
+
+ ContextMenu.args.data.splice(0);
+ ContextMenu.args.data.push(...newData);
+ },
+ },
+ ],
+ },
+ cells: {
+ contextMenuFactory: (col, row, value, context) => [
+ {
+ type: 'button',
+ text: 'Delete',
+ action: () => {
+ for (const cell of context.rangedCells) {
+ ContextMenu.args.data[cell.row.index][cell.column.setting.bindTo] = undefined;
+ }
+ },
+ },
+ ],
+ },
+ },
+}));
diff --git a/packages/frontend/src/components/grid/MkGrid.vue b/packages/frontend/src/components/grid/MkGrid.vue
new file mode 100644
index 0000000000..60738365fb
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkGrid.vue
@@ -0,0 +1,1342 @@
+
+
+
+ | NonNullable;
+
+export type CellAddress = {
+ row: number;
+ col: number;
+}
+
+export const CELL_ADDRESS_NONE: CellAddress = {
+ row: -1,
+ col: -1,
+};
+
+export type GridCell = {
+ address: CellAddress;
+ value: CellValue;
+ column: GridColumn;
+ row: GridRow;
+ selected: boolean;
+ ranged: boolean;
+ contentSize: Size;
+ setting: GridCellSetting;
+ violation: ValidateViolation;
+}
+
+export type GridCellContextMenuFactory = (col: GridColumn, row: GridRow, value: CellValue, context: GridContext) => MenuItem[];
+
+export type GridCellSetting = {
+ contextMenuFactory?: GridCellContextMenuFactory;
+}
+
+export function createCell(
+ column: GridColumn,
+ row: GridRow,
+ value: CellValue,
+ setting: GridCellSetting,
+): GridCell {
+ const newValue = (row.using && column.setting.valueTransformer)
+ ? column.setting.valueTransformer(row, column, value)
+ : value;
+
+ return {
+ address: { row: row.index, col: column.index },
+ value: newValue,
+ column,
+ row,
+ selected: false,
+ ranged: false,
+ contentSize: { width: 0, height: 0 },
+ violation: {
+ valid: true,
+ params: {
+ column,
+ row,
+ value,
+ allCells: [],
+ },
+ violations: [],
+ },
+ setting,
+ };
+}
+
+export function resetCell(cell: GridCell): void {
+ cell.selected = false;
+ cell.ranged = false;
+ cell.violation = {
+ valid: true,
+ params: {
+ column: cell.column,
+ row: cell.row,
+ value: cell.value,
+ allCells: [],
+ },
+ violations: [],
+ };
+}
diff --git a/packages/frontend/src/components/grid/column.ts b/packages/frontend/src/components/grid/column.ts
new file mode 100644
index 0000000000..2f505756fe
--- /dev/null
+++ b/packages/frontend/src/components/grid/column.ts
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { GridCellValidator } from '@/components/grid/cell-validators.js';
+import { Size, SizeStyle } from '@/components/grid/grid.js';
+import { calcCellWidth } from '@/components/grid/grid-utils.js';
+import { CellValue, GridCell } from '@/components/grid/cell.js';
+import { GridRow } from '@/components/grid/row.js';
+import { MenuItem } from '@/types/menu.js';
+import { GridContext } from '@/components/grid/grid-event.js';
+
+export type ColumnType = 'text' | 'number' | 'date' | 'boolean' | 'image' | 'hidden';
+
+export type CustomValueEditor = (row: GridRow, col: GridColumn, value: CellValue, cellElement: HTMLElement) => Promise;
+export type CellValueTransformer = (row: GridRow, col: GridColumn, value: CellValue) => CellValue;
+export type GridColumnContextMenuFactory = (col: GridColumn, context: GridContext) => MenuItem[];
+
+export type GridColumnSetting = {
+ bindTo: string;
+ title?: string;
+ icon?: string;
+ type: ColumnType;
+ width: SizeStyle;
+ editable?: boolean;
+ validators?: GridCellValidator[];
+ customValueEditor?: CustomValueEditor;
+ valueTransformer?: CellValueTransformer;
+ contextMenuFactory?: GridColumnContextMenuFactory;
+ events?: {
+ copy?: (value: CellValue) => string;
+ paste?: (text: string) => CellValue;
+ delete?: (cell: GridCell, context: GridContext) => void;
+ }
+};
+
+export type GridColumn = {
+ index: number;
+ setting: GridColumnSetting;
+ width: string;
+ contentSize: Size;
+}
+
+export function createColumn(setting: GridColumnSetting, index: number): GridColumn {
+ return {
+ index,
+ setting,
+ width: calcCellWidth(setting.width),
+ contentSize: { width: 0, height: 0 },
+ };
+}
+
diff --git a/packages/frontend/src/components/grid/grid-event.ts b/packages/frontend/src/components/grid/grid-event.ts
new file mode 100644
index 0000000000..074b72b956
--- /dev/null
+++ b/packages/frontend/src/components/grid/grid-event.ts
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { CellAddress, CellValue, GridCell } from '@/components/grid/cell.js';
+import { GridState } from '@/components/grid/grid.js';
+import { ValidateViolation } from '@/components/grid/cell-validators.js';
+import { GridColumn } from '@/components/grid/column.js';
+import { GridRow } from '@/components/grid/row.js';
+
+export type GridContext = {
+ selectedCell?: GridCell;
+ rangedCells: GridCell[];
+ rangedRows: GridRow[];
+ randedBounds: {
+ leftTop: CellAddress;
+ rightBottom: CellAddress;
+ };
+ availableBounds: {
+ leftTop: CellAddress;
+ rightBottom: CellAddress;
+ };
+ state: GridState;
+ rows: GridRow[];
+ columns: GridColumn[];
+};
+
+export type GridEvent =
+ GridCellValueChangeEvent |
+ GridCellValidationEvent
+ ;
+
+export type GridCellValueChangeEvent = {
+ type: 'cell-value-change';
+ column: GridColumn;
+ row: GridRow;
+ oldValue: CellValue;
+ newValue: CellValue;
+};
+
+export type GridCellValidationEvent = {
+ type: 'cell-validation';
+ violation?: ValidateViolation;
+ all: ValidateViolation[];
+};
diff --git a/packages/frontend/src/components/grid/grid-utils.ts b/packages/frontend/src/components/grid/grid-utils.ts
new file mode 100644
index 0000000000..a45bc88926
--- /dev/null
+++ b/packages/frontend/src/components/grid/grid-utils.ts
@@ -0,0 +1,215 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { isRef, Ref } from 'vue';
+import { DataSource, SizeStyle } from '@/components/grid/grid.js';
+import { CELL_ADDRESS_NONE, CellAddress, CellValue, GridCell } from '@/components/grid/cell.js';
+import { GridRow } from '@/components/grid/row.js';
+import { GridContext } from '@/components/grid/grid-event.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
+import { GridColumn, GridColumnSetting } from '@/components/grid/column.js';
+
+export function isCellElement(elem: HTMLElement): boolean {
+ return elem.hasAttribute('data-grid-cell');
+}
+
+export function isRowElement(elem: HTMLElement): boolean {
+ return elem.hasAttribute('data-grid-row');
+}
+
+export function calcCellWidth(widthSetting: SizeStyle): string {
+ switch (widthSetting) {
+ case undefined:
+ case 'auto': {
+ return 'auto';
+ }
+ default: {
+ return `${widthSetting}px`;
+ }
+ }
+}
+
+function getCellRowByAttribute(elem: HTMLElement): number {
+ const row = elem.getAttribute('data-grid-cell-row');
+ if (row === null) {
+ throw new Error('data-grid-cell-row attribute not found');
+ }
+ return Number(row);
+}
+
+function getCellColByAttribute(elem: HTMLElement): number {
+ const col = elem.getAttribute('data-grid-cell-col');
+ if (col === null) {
+ throw new Error('data-grid-cell-col attribute not found');
+ }
+ return Number(col);
+}
+
+export function getCellAddress(elem: HTMLElement, parentNodeCount = 10): CellAddress {
+ let node = elem;
+ for (let i = 0; i < parentNodeCount; i++) {
+ if (!node.parentElement) {
+ break;
+ }
+
+ if (isCellElement(node) && isRowElement(node.parentElement)) {
+ const row = getCellRowByAttribute(node);
+ const col = getCellColByAttribute(node);
+
+ return { row, col };
+ }
+
+ node = node.parentElement;
+ }
+
+ return CELL_ADDRESS_NONE;
+}
+
+export function getCellElement(elem: HTMLElement, parentNodeCount = 10): HTMLElement | null {
+ let node = elem;
+ for (let i = 0; i < parentNodeCount; i++) {
+ if (isCellElement(node)) {
+ return node;
+ }
+
+ if (!node.parentElement) {
+ break;
+ }
+
+ node = node.parentElement;
+ }
+
+ return null;
+}
+
+export function equalCellAddress(a: CellAddress, b: CellAddress): boolean {
+ return a.row === b.row && a.col === b.col;
+}
+
+/**
+ * グリッドの選択範囲の内容をタブ区切り形式テキストに変換してクリップボードにコピーする。
+ */
+export function copyGridDataToClipboard(
+ gridItems: Ref | DataSource[],
+ context: GridContext,
+) {
+ const items = isRef(gridItems) ? gridItems.value : gridItems;
+ const lines = Array.of();
+ const bounds = context.randedBounds;
+
+ for (let row = bounds.leftTop.row; row <= bounds.rightBottom.row; row++) {
+ const rowItems = Array.of();
+ for (let col = bounds.leftTop.col; col <= bounds.rightBottom.col; col++) {
+ const { bindTo, events } = context.columns[col].setting;
+ const value = items[row][bindTo];
+ const transformValue = events?.copy
+ ? events.copy(value)
+ : typeof value === 'object' || Array.isArray(value)
+ ? JSON.stringify(value)
+ : value?.toString() ?? '';
+ rowItems.push(transformValue);
+ }
+ lines.push(rowItems.join('\t'));
+ }
+
+ const text = lines.join('\n');
+ copyToClipboard(text);
+
+ if (_DEV_) {
+ console.log(`Copied to clipboard: ${text}`);
+ }
+}
+
+/**
+ * クリップボードからタブ区切りテキストとして値を読み取り、グリッドの選択範囲に貼り付けるためのユーティリティ関数。
+ * …と言いつつも、使用箇所により反映方法に差があるため更新操作はコールバック関数に任せている。
+ */
+export async function pasteToGridFromClipboard(
+ context: GridContext,
+ callback: (row: GridRow, col: GridColumn, parsedValue: CellValue) => void,
+) {
+ function parseValue(value: string, setting: GridColumnSetting): CellValue {
+ if (setting.events?.paste) {
+ return setting.events.paste(value);
+ } else {
+ switch (setting.type) {
+ case 'number': {
+ return Number(value);
+ }
+ case 'boolean': {
+ return value === 'true';
+ }
+ default: {
+ return value;
+ }
+ }
+ }
+ }
+
+ const clipBoardText = await navigator.clipboard.readText();
+ if (_DEV_) {
+ console.log(`Paste from clipboard: ${clipBoardText}`);
+ }
+
+ const bounds = context.randedBounds;
+ const lines = clipBoardText.replace(/\r/g, '')
+ .split('\n')
+ .map(it => it.split('\t'));
+
+ if (lines.length === 1 && lines[0].length === 1) {
+ // 単独文字列の場合は選択範囲全体に同じテキストを貼り付ける
+ const ranges = context.rangedCells;
+ for (const cell of ranges) {
+ if (cell.column.setting.editable) {
+ callback(cell.row, cell.column, parseValue(lines[0][0], cell.column.setting));
+ }
+ }
+ } else {
+ // 表形式文字列の場合は表形式にパースし、選択範囲に合うように貼り付ける
+ const offsetRow = bounds.leftTop.row;
+ const offsetCol = bounds.leftTop.col;
+ const { columns, rows } = context;
+ for (let row = bounds.leftTop.row; row <= bounds.rightBottom.row; row++) {
+ const rowIdx = row - offsetRow;
+ if (lines.length <= rowIdx) {
+ // クリップボードから読んだ二次元配列よりも選択範囲の方が大きい場合、貼り付け操作を打ち切る
+ break;
+ }
+
+ const items = lines[rowIdx];
+ for (let col = bounds.leftTop.col; col <= bounds.rightBottom.col; col++) {
+ const colIdx = col - offsetCol;
+ if (items.length <= colIdx) {
+ // クリップボードから読んだ二次元配列よりも選択範囲の方が大きい場合、貼り付け操作を打ち切る
+ break;
+ }
+
+ if (columns[col].setting.editable) {
+ callback(rows[row], columns[col], parseValue(items[colIdx], columns[col].setting));
+ }
+ }
+ }
+ }
+}
+
+/**
+ * グリッドの選択範囲にあるデータを削除するためのユーティリティ関数。
+ * …と言いつつも、使用箇所により反映方法に差があるため更新操作はコールバック関数に任せている。
+ */
+export function removeDataFromGrid(
+ context: GridContext,
+ callback: (cell: GridCell) => void,
+) {
+ for (const cell of context.rangedCells) {
+ const { editable, events } = cell.column.setting;
+ if (editable) {
+ if (events?.delete) {
+ events.delete(cell, context);
+ } else {
+ callback(cell);
+ }
+ }
+ }
+}
diff --git a/packages/frontend/src/components/grid/grid.ts b/packages/frontend/src/components/grid/grid.ts
new file mode 100644
index 0000000000..0cb3b6f28b
--- /dev/null
+++ b/packages/frontend/src/components/grid/grid.ts
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { EventEmitter } from 'eventemitter3';
+import { CellValue, GridCellSetting } from '@/components/grid/cell.js';
+import { GridColumnSetting } from '@/components/grid/column.js';
+import { GridRowSetting } from '@/components/grid/row.js';
+
+export type GridSetting = {
+ row?: GridRowSetting;
+ cols: GridColumnSetting[];
+ cells?: GridCellSetting;
+};
+
+export type DataSource = Record;
+
+export type GridState =
+ 'normal' |
+ 'cellSelecting' |
+ 'cellEditing' |
+ 'colResizing' |
+ 'colSelecting' |
+ 'rowSelecting' |
+ 'hidden'
+ ;
+
+export type Size = {
+ width: number;
+ height: number;
+}
+
+export type SizeStyle = number | 'auto' | undefined;
+
+export type AdditionalStyle = {
+ className?: string;
+ style?: Record;
+}
+
+export class GridEventEmitter extends EventEmitter<{
+ 'forceRefreshContentSize': void;
+}> {
+}
diff --git a/packages/frontend/src/components/grid/row.ts b/packages/frontend/src/components/grid/row.ts
new file mode 100644
index 0000000000..e0a317c9d3
--- /dev/null
+++ b/packages/frontend/src/components/grid/row.ts
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { AdditionalStyle } from '@/components/grid/grid.js';
+import { GridCell } from '@/components/grid/cell.js';
+import { GridColumn } from '@/components/grid/column.js';
+import { MenuItem } from '@/types/menu.js';
+import { GridContext } from '@/components/grid/grid-event.js';
+
+export const defaultGridRowSetting: Required = {
+ showNumber: true,
+ selectable: true,
+ minimumDefinitionCount: 100,
+ styleRules: [],
+ contextMenuFactory: () => [],
+ events: {},
+};
+
+export type GridRowStyleRuleConditionParams = {
+ row: GridRow,
+ targetCols: GridColumn[],
+ cells: GridCell[]
+};
+
+export type GridRowStyleRule = {
+ condition: (params: GridRowStyleRuleConditionParams) => boolean;
+ applyStyle: AdditionalStyle;
+}
+
+export type GridRowContextMenuFactory = (row: GridRow, context: GridContext) => MenuItem[];
+
+export type GridRowSetting = {
+ showNumber?: boolean;
+ selectable?: boolean;
+ minimumDefinitionCount?: number;
+ styleRules?: GridRowStyleRule[];
+ contextMenuFactory?: GridRowContextMenuFactory;
+ events?: {
+ delete?: (rows: GridRow[]) => void;
+ }
+}
+
+export type GridRow = {
+ index: number;
+ ranged: boolean;
+ using: boolean;
+ setting: GridRowSetting;
+ additionalStyles: AdditionalStyle[];
+}
+
+export function createRow(index: number, using: boolean, setting: GridRowSetting): GridRow {
+ return {
+ index,
+ ranged: false,
+ using: using,
+ setting,
+ additionalStyles: [],
+ };
+}
+
+export function resetRow(row: GridRow): void {
+ row.ranged = false;
+ row.using = false;
+ row.additionalStyles = [];
+}
+
diff --git a/packages/frontend/src/components/hook/useLoading.ts b/packages/frontend/src/components/hook/useLoading.ts
new file mode 100644
index 0000000000..6c6ff6ae0d
--- /dev/null
+++ b/packages/frontend/src/components/hook/useLoading.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { computed, h, ref } from 'vue';
+import MkLoading from '@/components/global/MkLoading.vue';
+
+export const useLoading = (props?: {
+ static?: boolean;
+ inline?: boolean;
+ colored?: boolean;
+ mini?: boolean;
+ em?: boolean;
+}) => {
+ const showingCnt = ref(0);
+
+ const show = () => {
+ showingCnt.value++;
+ };
+
+ const close = (force?: boolean) => {
+ if (force) {
+ showingCnt.value = 0;
+ } else {
+ showingCnt.value = Math.max(0, showingCnt.value - 1);
+ }
+ };
+
+ const scope = (fn: () => T) => {
+ show();
+
+ const result = fn();
+ if (result instanceof Promise) {
+ return result.finally(() => close());
+ } else {
+ close();
+ return result;
+ }
+ };
+
+ const showing = computed(() => showingCnt.value > 0);
+ const component = computed(() => showing.value ? h(MkLoading, props) : null);
+
+ return {
+ show,
+ close,
+ scope,
+ component,
+ showing,
+ };
+};
diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html
index 0be589262f..84ba9dfabc 100644
--- a/packages/frontend/src/index.html
+++ b/packages/frontend/src/index.html
@@ -20,6 +20,7 @@
worker-src 'self';
script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://*.recaptcha.net https://*.gstatic.com https://challenges.cloudflare.com https://esm.sh;
style-src 'self' 'unsafe-inline';
+ font-src 'self' data:;
img-src 'self' data: blob: www.google.com xn--931a.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com;
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 589ace0155..18c7464d2e 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -602,6 +602,27 @@ export async function selectDriveFolder(multiple: boolean): Promise {
+ return new Promise((resolve) => {
+ popup(defineAsyncComponent(() => import('@/components/MkRoleSelectDialog.vue')), params, {
+ done: roles => {
+ resolve({ canceled: false, result: roles });
+ },
+ close: () => {
+ resolve({ canceled: true, result: undefined });
+ },
+ }, 'dispose');
+ });
+}
+
export async function pickEmoji(src: HTMLElement, opts: ComponentProps): Promise {
return new Promise(resolve => {
const { dispose } = popup(MkEmojiPickerDialog, {
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.impl.ts b/packages/frontend/src/pages/admin/custom-emojis-manager.impl.ts
new file mode 100644
index 0000000000..de2b2aca8c
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.impl.ts
@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export type RequestLogItem = {
+ failed: boolean;
+ url: string;
+ name: string;
+ error?: string;
+};
+
+export const gridSortOrderKeys = [
+ 'name',
+ 'category',
+ 'aliases',
+ 'type',
+ 'license',
+ 'host',
+ 'uri',
+ 'publicUrl',
+ 'isSensitive',
+ 'localOnly',
+ 'updatedAt',
+];
+export type GridSortOrderKey = typeof gridSortOrderKeys[number];
+
+export function emptyStrToUndefined(value: string | null) {
+ return value ? value : undefined;
+}
+
+export function emptyStrToNull(value: string) {
+ return value === '' ? null : value;
+}
+
+export function emptyStrToEmptyArray(value: string) {
+ return value === '' ? [] : value.split(' ').map(it => it.trim());
+}
+
+export function roleIdsParser(text: string): { id: string, name: string }[] {
+ // idとnameのペア配列をJSONで受け取る。それ以外の形式は許容しない
+ try {
+ const obj = JSON.parse(text);
+ if (!Array.isArray(obj)) {
+ return [];
+ }
+ if (!obj.every(it => typeof it === 'object' && 'id' in it && 'name' in it)) {
+ return [];
+ }
+
+ return obj.map(it => ({ id: it.id, name: it.name }));
+ } catch (ex) {
+ console.warn(ex);
+ return [];
+ }
+}
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
new file mode 100644
index 0000000000..55f9632ce4
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
@@ -0,0 +1,757 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue
new file mode 100644
index 0000000000..a3de5de569
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue
@@ -0,0 +1,477 @@
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._gridCommon.registrationLogs }}
+
+ {{ i18n.ts._customEmojisManager._gridCommon.registrationLogsCaption }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
new file mode 100644
index 0000000000..9a9d2990ba
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager2.stories.impl.ts b/packages/frontend/src/pages/admin/custom-emojis-manager2.stories.impl.ts
new file mode 100644
index 0000000000..f62304277a
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager2.stories.impl.ts
@@ -0,0 +1,160 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { delay, http, HttpResponse } from 'msw';
+import { StoryObj } from '@storybook/vue3';
+import { entities } from 'misskey-js';
+import { commonHandlers } from '../../../.storybook/mocks.js';
+import { emoji } from '../../../.storybook/fakes.js';
+import { fakeId } from '../../../.storybook/fake-utils.js';
+import custom_emojis_manager2 from './custom-emojis-manager2.vue';
+
+function createRender(params: {
+ emojis: entities.EmojiDetailedAdmin[];
+}) {
+ const storedEmojis: entities.EmojiDetailedAdmin[] = [...params.emojis];
+ const storedDriveFiles: entities.DriveFile[] = [];
+
+ return {
+ render(args) {
+ return {
+ components: {
+ custom_emojis_manager2,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '((resolve) => {
+ const reader = new FileReader();
+ reader.onload = () => {
+ resolve(reader.result as string);
+ };
+ reader.readAsDataURL(new Blob([file], { type: 'image/webp' }));
+ });
+
+ const driveFile: entities.DriveFile = {
+ id: fakeId(file.name),
+ createdAt: new Date().toISOString(),
+ name: file.name,
+ type: file.type,
+ md5: '',
+ size: file.size,
+ isSensitive: false,
+ blurhash: null,
+ properties: {},
+ url: base64,
+ thumbnailUrl: null,
+ comment: null,
+ folderId: null,
+ folder: null,
+ userId: null,
+ user: null,
+ };
+
+ storedDriveFiles.push(driveFile);
+
+ return HttpResponse.json(driveFile);
+ }),
+ http.post('api/admin/emoji/add', async ({ request }) => {
+ await delay(100);
+
+ const bodyStream = request.body as ReadableStream;
+ const body = await new Response(bodyStream).json() as entities.AdminEmojiAddRequest;
+
+ const fileId = body.fileId;
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ const file = storedDriveFiles.find(f => f.id === fileId)!;
+
+ const em = emoji({
+ id: fakeId(file.name),
+ name: body.name,
+ publicUrl: file.url,
+ originalUrl: file.url,
+ type: file.type,
+ aliases: body.aliases,
+ category: body.category ?? undefined,
+ license: body.license ?? undefined,
+ localOnly: body.localOnly,
+ isSensitive: body.isSensitive,
+ });
+ storedEmojis.push(em);
+
+ return HttpResponse.json(null);
+ }),
+ ],
+ },
+ },
+ } satisfies StoryObj;
+}
+
+export const Default = createRender({
+ emojis: [],
+});
+
+export const List10 = createRender({
+ emojis: Array.from({ length: 10 }, (_, i) => emoji({ name: `emoji_${i}` }, i.toString())),
+});
+
+export const List100 = createRender({
+ emojis: Array.from({ length: 100 }, (_, i) => emoji({ name: `emoji_${i}` }, i.toString())),
+});
+
+export const List1000 = createRender({
+ emojis: Array.from({ length: 1000 }, (_, i) => emoji({ name: `emoji_${i}` }, i.toString())),
+});
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager2.vue b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
new file mode 100644
index 0000000000..a952a5a3d1
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
@@ -0,0 +1,44 @@
+
+
+
+ {
+ const dropItems = ev.dataTransfer?.items;
+ if (!dropItems || dropItems.length === 0) {
+ return [];
+ }
+
+ const apiTestItem = dropItems[0];
+ if ('webkitGetAsEntry' in apiTestItem) {
+ return readDataTransferItems(dropItems);
+ } else {
+ // webkitGetAsEntryに対応していない場合はfilesから取得する（ディレクトリのサポートは出来ない）
+ const dropFiles = ev.dataTransfer.files;
+ if (dropFiles.length === 0) {
+ return [];
+ }
+
+ const droppedFiles = Array.of();
+ for (let i = 0; i < dropFiles.length; i++) {
+ const file = dropFiles.item(i);
+ if (file) {
+ droppedFiles.push({
+ isFile: true,
+ path: file.name,
+ file,
+ });
+ }
+ }
+
+ return droppedFiles;
+ }
+}
+
+/**
+ * ドラッグ＆ドロップされたファイルのリストからディレクトリ構造とファイルへの参照（{@link File}）を取得する。
+ */
+export async function readDataTransferItems(itemList: DataTransferItemList): Promise {
+ async function readEntry(entry: FileSystemEntry): Promise {
+ if (entry.isFile) {
+ return {
+ isFile: true,
+ path: entry.fullPath,
+ file: await readFile(entry as FileSystemFileEntry),
+ };
+ } else {
+ return {
+ isFile: false,
+ path: entry.fullPath,
+ children: await readDirectory(entry as FileSystemDirectoryEntry),
+ };
+ }
+ }
+
+ function readFile(fileSystemFileEntry: FileSystemFileEntry): Promise {
+ return new Promise((resolve, reject) => {
+ fileSystemFileEntry.file(resolve, reject);
+ });
+ }
+
+ function readDirectory(fileSystemDirectoryEntry: FileSystemDirectoryEntry): Promise {
+ return new Promise(async (resolve) => {
+ const allEntries = Array.of();
+ const reader = fileSystemDirectoryEntry.createReader();
+ while (true) {
+ const entries = await new Promise((res, rej) => reader.readEntries(res, rej));
+ if (entries.length === 0) {
+ break;
+ }
+ allEntries.push(...entries);
+ }
+
+ resolve(await Promise.all(allEntries.map(readEntry)));
+ });
+ }
+
+ // 扱いにくいので配列に変換
+ const items = Array.of();
+ for (let i = 0; i < itemList.length; i++) {
+ items.push(itemList[i]);
+ }
+
+ return Promise.all(
+ items
+ .map(it => it.webkitGetAsEntry())
+ .filter(it => it)
+ .map(it => readEntry(it!)),
+ );
+}
+
+/**
+ * {@link DroppedItem}のリストからディレクトリを再帰的に検索し、ファイルのリストを取得する。
+ */
+export function flattenDroppedFiles(items: DroppedItem[]): DroppedFile[] {
+ const result = Array.of();
+ for (const item of items) {
+ if (item.isFile) {
+ result.push(item);
+ } else {
+ result.push(...flattenDroppedFiles(item.children));
+ }
+ }
+ return result;
+}
diff --git a/packages/frontend/src/scripts/key-event.ts b/packages/frontend/src/scripts/key-event.ts
new file mode 100644
index 0000000000..a72776d48c
--- /dev/null
+++ b/packages/frontend/src/scripts/key-event.ts
@@ -0,0 +1,153 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/**
+ * {@link KeyboardEvent.code} の値を表す文字列。不足分は適宜追加する
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_code_values
+ */
+export type KeyCode =
+ | 'Backspace'
+ | 'Tab'
+ | 'Enter'
+ | 'Shift'
+ | 'Control'
+ | 'Alt'
+ | 'Pause'
+ | 'CapsLock'
+ | 'Escape'
+ | 'Space'
+ | 'PageUp'
+ | 'PageDown'
+ | 'End'
+ | 'Home'
+ | 'ArrowLeft'
+ | 'ArrowUp'
+ | 'ArrowRight'
+ | 'ArrowDown'
+ | 'Insert'
+ | 'Delete'
+ | 'Digit0'
+ | 'Digit1'
+ | 'Digit2'
+ | 'Digit3'
+ | 'Digit4'
+ | 'Digit5'
+ | 'Digit6'
+ | 'Digit7'
+ | 'Digit8'
+ | 'Digit9'
+ | 'KeyA'
+ | 'KeyB'
+ | 'KeyC'
+ | 'KeyD'
+ | 'KeyE'
+ | 'KeyF'
+ | 'KeyG'
+ | 'KeyH'
+ | 'KeyI'
+ | 'KeyJ'
+ | 'KeyK'
+ | 'KeyL'
+ | 'KeyM'
+ | 'KeyN'
+ | 'KeyO'
+ | 'KeyP'
+ | 'KeyQ'
+ | 'KeyR'
+ | 'KeyS'
+ | 'KeyT'
+ | 'KeyU'
+ | 'KeyV'
+ | 'KeyW'
+ | 'KeyX'
+ | 'KeyY'
+ | 'KeyZ'
+ | 'MetaLeft'
+ | 'MetaRight'
+ | 'ContextMenu'
+ | 'F1'
+ | 'F2'
+ | 'F3'
+ | 'F4'
+ | 'F5'
+ | 'F6'
+ | 'F7'
+ | 'F8'
+ | 'F9'
+ | 'F10'
+ | 'F11'
+ | 'F12'
+ | 'NumLock'
+ | 'ScrollLock'
+ | 'Semicolon'
+ | 'Equal'
+ | 'Comma'
+ | 'Minus'
+ | 'Period'
+ | 'Slash'
+ | 'Backquote'
+ | 'BracketLeft'
+ | 'Backslash'
+ | 'BracketRight'
+ | 'Quote'
+ | 'Meta'
+ | 'AltGraph'
+ ;
+
+/**
+ * 修飾キーを表す文字列。不足分は適宜追加する。
+ */
+export type KeyModifier =
+ | 'Shift'
+ | 'Control'
+ | 'Alt'
+ | 'Meta'
+ ;
+
+/**
+ * 押下されたキー以外の状態を表す文字列。不足分は適宜追加する。
+ */
+export type KeyState =
+ | 'composing'
+ | 'repeat'
+ ;
+
+export type KeyEventHandler = {
+ modifiers?: KeyModifier[];
+ states?: KeyState[];
+ code: KeyCode | 'any';
+ handler: (event: KeyboardEvent) => void;
+}
+
+export function handleKeyEvent(event: KeyboardEvent, handlers: KeyEventHandler[]) {
+ function checkModifier(ev: KeyboardEvent, modifiers? : KeyModifier[]) {
+ if (modifiers) {
+ return modifiers.every(modifier => ev.getModifierState(modifier));
+ }
+ return true;
+ }
+
+ function checkState(ev: KeyboardEvent, states?: KeyState[]) {
+ if (states) {
+ return states.every(state => ev.getModifierState(state));
+ }
+ return true;
+ }
+
+ let hit = false;
+ for (const handler of handlers.filter(it => it.code === event.code)) {
+ if (checkModifier(event, handler.modifiers) && checkState(event, handler.states)) {
+ handler.handler(event);
+ hit = true;
+ break;
+ }
+ }
+
+ if (!hit) {
+ for (const handler of handlers.filter(it => it.code === 'any')) {
+ handler.handler(event);
+ }
+ }
+}
diff --git a/packages/frontend/src/scripts/select-file.ts b/packages/frontend/src/scripts/select-file.ts
index b037aa8acc..c25b4d73bd 100644
--- a/packages/frontend/src/scripts/select-file.ts
+++ b/packages/frontend/src/scripts/select-file.ts
@@ -12,14 +12,28 @@ import { i18n } from '@/i18n.js';
import { defaultStore } from '@/store.js';
import { uploadFile } from '@/scripts/upload.js';
-export function chooseFileFromPc(multiple: boolean, keepOriginal = false): Promise {
+export function chooseFileFromPc(
+ multiple: boolean,
+ options?: {
+ uploadFolder?: string | null;
+ keepOriginal?: boolean;
+ nameConverter?: (file: File) => string | undefined;
+ },
+): Promise {
+ const uploadFolder = options?.uploadFolder ?? defaultStore.state.uploadFolder;
+ const keepOriginal = options?.keepOriginal ?? defaultStore.state.keepOriginalUploading;
+ const nameConverter = options?.nameConverter ?? (() => undefined);
+
return new Promise((res, rej) => {
const input = document.createElement('input');
input.type = 'file';
input.multiple = multiple;
input.onchange = () => {
if (!input.files) return res([]);
- const promises = Array.from(input.files, file => uploadFile(file, defaultStore.state.uploadFolder, undefined, keepOriginal));
+ const promises = Array.from(
+ input.files,
+ file => uploadFile(file, uploadFolder, nameConverter(file), keepOriginal),
+ );
Promise.all(promises).then(driveFiles => {
res(driveFiles);
@@ -94,7 +108,7 @@ function select(src: HTMLElement | EventTarget | null, label: string | null, mul
}, {
text: i18n.ts.upload,
icon: 'ti ti-upload',
- action: () => chooseFileFromPc(multiple, keepOriginal.value).then(files => res(files)),
+ action: () => chooseFileFromPc(multiple, { keepOriginal: keepOriginal.value }).then(files => res(files)),
}, {
text: i18n.ts.fromDrive,
icon: 'ti ti-cloud',
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 211ddb8287..7098b52205 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1117,6 +1117,9 @@ type EmojiDeleted = {
// @public (undocumented)
type EmojiDetailed = components['schemas']['EmojiDetailed'];
+// @public (undocumented)
+type EmojiDetailedAdmin = components['schemas']['EmojiDetailedAdmin'];
+
// @public (undocumented)
type EmojiRequest = operations['emoji']['requestBody']['content']['application/json'];
@@ -1294,6 +1297,8 @@ declare namespace entities {
AdminEmojiSetCategoryBulkRequest,
AdminEmojiSetLicenseBulkRequest,
AdminEmojiUpdateRequest,
+ V2AdminEmojiListRequest,
+ V2AdminEmojiListResponse,
AdminFederationDeleteAllFilesRequest,
AdminFederationRefreshRemoteInstanceMetadataRequest,
AdminFederationRemoveAllFollowingRequest,
@@ -1847,6 +1852,7 @@ declare namespace entities {
GalleryPost,
EmojiSimple,
EmojiDetailed,
+ EmojiDetailedAdmin,
Flash,
Signin,
RoleCondFormulaLogics,
@@ -3420,6 +3426,12 @@ type UsersShowResponse = operations['users___show']['responses']['200']['content
// @public (undocumented)
type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['content']['application/json'];
+// @public (undocumented)
+type V2AdminEmojiListRequest = operations['v2___admin___emoji___list']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type V2AdminEmojiListResponse = operations['v2___admin___emoji___list']['responses']['200']['content']['application/json'];
+
// Warnings were encountered during analysis:
//
// src/entities.ts:50:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index 3bcdae6a4a..edaa0498e9 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -493,6 +493,17 @@ declare module '../api.js' {
credential?: string | null,
): Promise>;
+ /**
+ * No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
+ */
+ request(
+ endpoint: E,
+ params: P,
+ credential?: string | null,
+ ): Promise>;
+
/**
* No description provided.
*
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index b016d5bbcf..982717597b 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -62,6 +62,8 @@ import type {
AdminEmojiSetCategoryBulkRequest,
AdminEmojiSetLicenseBulkRequest,
AdminEmojiUpdateRequest,
+ V2AdminEmojiListRequest,
+ V2AdminEmojiListResponse,
AdminFederationDeleteAllFilesRequest,
AdminFederationRefreshRemoteInstanceMetadataRequest,
AdminFederationRemoveAllFollowingRequest,
@@ -628,6 +630,7 @@ export type Endpoints = {
'admin/emoji/set-category-bulk': { req: AdminEmojiSetCategoryBulkRequest; res: EmptyResponse };
'admin/emoji/set-license-bulk': { req: AdminEmojiSetLicenseBulkRequest; res: EmptyResponse };
'admin/emoji/update': { req: AdminEmojiUpdateRequest; res: EmptyResponse };
+ 'v2/admin/emoji/list': { req: V2AdminEmojiListRequest; res: V2AdminEmojiListResponse };
'admin/federation/delete-all-files': { req: AdminFederationDeleteAllFilesRequest; res: EmptyResponse };
'admin/federation/refresh-remote-instance-metadata': { req: AdminFederationRefreshRemoteInstanceMetadataRequest; res: EmptyResponse };
'admin/federation/remove-all-following': { req: AdminFederationRemoveAllFollowingRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index 02be4848c7..e4299d62c7 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -65,6 +65,8 @@ export type AdminEmojiSetAliasesBulkRequest = operations['admin___emoji___set-al
export type AdminEmojiSetCategoryBulkRequest = operations['admin___emoji___set-category-bulk']['requestBody']['content']['application/json'];
export type AdminEmojiSetLicenseBulkRequest = operations['admin___emoji___set-license-bulk']['requestBody']['content']['application/json'];
export type AdminEmojiUpdateRequest = operations['admin___emoji___update']['requestBody']['content']['application/json'];
+export type V2AdminEmojiListRequest = operations['v2___admin___emoji___list']['requestBody']['content']['application/json'];
+export type V2AdminEmojiListResponse = operations['v2___admin___emoji___list']['responses']['200']['content']['application/json'];
export type AdminFederationDeleteAllFilesRequest = operations['admin___federation___delete-all-files']['requestBody']['content']['application/json'];
export type AdminFederationRefreshRemoteInstanceMetadataRequest = operations['admin___federation___refresh-remote-instance-metadata']['requestBody']['content']['application/json'];
export type AdminFederationRemoveAllFollowingRequest = operations['admin___federation___remove-all-following']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index 04574849d4..1a30da4437 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -33,6 +33,7 @@ export type FederationInstance = components['schemas']['FederationInstance'];
export type GalleryPost = components['schemas']['GalleryPost'];
export type EmojiSimple = components['schemas']['EmojiSimple'];
export type EmojiDetailed = components['schemas']['EmojiDetailed'];
+export type EmojiDetailedAdmin = components['schemas']['EmojiDetailedAdmin'];
export type Flash = components['schemas']['Flash'];
export type Signin = components['schemas']['Signin'];
export type RoleCondFormulaLogics = components['schemas']['RoleCondFormulaLogics'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ada685604d..75a99263d0 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -414,6 +414,15 @@ export type paths = {
*/
post: operations['admin___emoji___update'];
};
+ '/v2/admin/emoji/list': {
+ /**
+ * v2/admin/emoji/list
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
+ */
+ post: operations['v2___admin___emoji___list'];
+ };
'/admin/federation/delete-all-files': {
/**
* admin/federation/delete-all-files
@@ -4749,6 +4758,29 @@ export type components = {
localOnly: boolean;
roleIdsThatCanBeUsedThisEmojiAsReaction: string[];
};
+ EmojiDetailedAdmin: {
+ /** Format: id */
+ id: string;
+ /** Format: date-time */
+ updatedAt: string | null;
+ name: string;
+ /** @description The local host is represented with `null`. */
+ host: string | null;
+ publicUrl: string;
+ originalUrl: string;
+ uri: string | null;
+ type: string | null;
+ aliases: string[];
+ category: string | null;
+ license: string | null;
+ localOnly: boolean;
+ isSensitive: boolean;
+ roleIdsThatCanBeUsedThisEmojiAsReaction: {
+ /** Format: misskey:id */
+ id: string;
+ name: string;
+ }[];
+ };
Flash: {
/**
* Format: id
@@ -7872,6 +7904,97 @@ export type operations = {
};
};
};
+ /**
+ * v2/admin/emoji/list
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *read:admin:emoji*
+ */
+ v2___admin___emoji___list: {
+ requestBody: {
+ content: {
+ 'application/json': {
+ query?: ({
+ updatedAtFrom?: string;
+ updatedAtTo?: string;
+ name?: string;
+ host?: string;
+ uri?: string;
+ publicUrl?: string;
+ originalUrl?: string;
+ type?: string;
+ aliases?: string;
+ category?: string;
+ license?: string;
+ isSensitive?: boolean;
+ localOnly?: boolean;
+ /**
+ * @default all
+ * @enum {string}
+ */
+ hostType?: 'local' | 'remote' | 'all';
+ roleIds?: string[];
+ }) | null;
+ /** Format: misskey:id */
+ sinceId?: string;
+ /** Format: misskey:id */
+ untilId?: string;
+ /** @default 10 */
+ limit?: number;
+ page?: number;
+ /**
+ * @default [
+ * "-id"
+ * ]
+ */
+ sortKeys?: ('+id' | '-id' | '+updatedAt' | '-updatedAt' | '+name' | '-name' | '+host' | '-host' | '+uri' | '-uri' | '+publicUrl' | '-publicUrl' | '+type' | '-type' | '+aliases' | '-aliases' | '+category' | '-category' | '+license' | '-license' | '+isSensitive' | '-isSensitive' | '+localOnly' | '-localOnly' | '+roleIdsThatCanBeUsedThisEmojiAsReaction' | '-roleIdsThatCanBeUsedThisEmojiAsReaction')[];
+ };
+ };
+ };
+ responses: {
+ /** @description OK (with results) */
+ 200: {
+ content: {
+ 'application/json': {
+ emojis: components['schemas']['EmojiDetailedAdmin'][];
+ count: number;
+ allCount: number;
+ allPages: number;
+ };
+ };
+ };
+ /** @description Client error */
+ 400: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Authentication error */
+ 401: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Forbidden error */
+ 403: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description I'm Ai */
+ 418: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Internal server error */
+ 500: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ };
+ };
/**
* admin/federation/delete-all-files
* @description No description provided.
--
cgit v1.2.3-freya
From 993532bc1fe0f67d84e16a99ee916f7fff9b0935 Mon Sep 17 00:00:00 2001
From: Kinetix
Date: Tue, 28 Jan 2025 15:57:45 -0800
Subject: Adding robots.txt override via admin control panel This is a
requested low priority feature in #418 - I created the changes to follow
similarly to how the Instance Description is handled.
---
locales/index.d.ts | 8 ++++++++
packages/backend/migration/1738098171990-robotsTxt.js | 16 ++++++++++++++++
packages/backend/src/core/entities/MetaEntityService.ts | 1 +
packages/backend/src/models/Meta.ts | 5 +++++
packages/backend/src/models/json-schema/meta.ts | 4 ++++
packages/backend/src/server/api/endpoints/admin/meta.ts | 5 +++++
.../src/server/api/endpoints/admin/update-meta.ts | 5 +++++
packages/backend/src/server/web/ClientServerService.ts | 9 ++++++++-
packages/frontend/src/pages/admin/settings.vue | 7 +++++++
sharkey-locales/en-US.yml | 3 +++
10 files changed, 62 insertions(+), 1 deletion(-)
create mode 100644 packages/backend/migration/1738098171990-robotsTxt.js
(limited to 'packages/backend/src/models')
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 3a3b94b89d..70eba52ea0 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11626,6 +11626,14 @@ export interface Locale extends ILocale {
* Scheduled Notes
*/
"scheduledNotes": string;
+ /**
+ * Custom robots.txt
+ */
+ "robotsTxt": string;
+ /**
+ * Adding entries here will override the default robots.txt packaged with Sharkey. Maximum 2048 characters.
+ */
+ "robotsTxtDescription": string;
}
declare const locales: {
[lang: string]: Locale;
diff --git a/packages/backend/migration/1738098171990-robotsTxt.js b/packages/backend/migration/1738098171990-robotsTxt.js
new file mode 100644
index 0000000000..947f21cc46
--- /dev/null
+++ b/packages/backend/migration/1738098171990-robotsTxt.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: marie and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class RobotsTxt1738098171990 {
+ name = 'RobotsTxt1738098171990'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "robotsTxt" character varying(2048)`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "robotsTxt"`);
+ }
+}
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 7d7b4cbd81..857e8f5a7b 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -95,6 +95,7 @@ export class MetaEntityService {
mcaptchaInstanceUrl: instance.mcaptchaInstanceUrl,
enableRecaptcha: instance.enableRecaptcha,
enableAchievements: instance.enableAchievements,
+ robotsTxt: instance.robotsTxt,
recaptchaSiteKey: instance.recaptchaSiteKey,
enableTurnstile: instance.enableTurnstile,
turnstileSiteKey: instance.turnstileSiteKey,
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 3fc3f273dd..a224117676 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -599,6 +599,11 @@ export class MiMeta {
})
public enableAchievements: boolean;
+ @Column('varchar', {
+ length: 2048, nullable: true,
+ })
+ public robotsTxt: string | null;
+
@Column('jsonb', {
default: { },
})
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index 5179e5d51c..29fdb4f6be 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -139,6 +139,10 @@ export const packedMetaLiteSchema = {
type: 'boolean',
optional: false, nullable: true,
},
+ robotsTxt: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
enableTestcaptcha: {
type: 'boolean',
optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 6495e3b7da..436dcf27cb 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -391,6 +391,10 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
+ robotsTxt: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
enableIdenticonGeneration: {
type: 'boolean',
optional: false, nullable: false,
@@ -708,6 +712,7 @@ export default class extends Endpoint { // eslint-
enableStatsForFederatedInstances: instance.enableStatsForFederatedInstances,
enableServerMachineStats: instance.enableServerMachineStats,
enableAchievements: instance.enableAchievements,
+ robotsTxt: instance.robotsTxt,
enableIdenticonGeneration: instance.enableIdenticonGeneration,
bannedEmailDomains: instance.bannedEmailDomains,
policies: { ...DEFAULT_POLICIES, ...instance.policies },
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 72f428d85f..b3733d3d39 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -149,6 +149,7 @@ export const paramDef = {
enableStatsForFederatedInstances: { type: 'boolean' },
enableServerMachineStats: { type: 'boolean' },
enableAchievements: { type: 'boolean' },
+ robotsTxt: { type: 'string', nullable: true },
enableIdenticonGeneration: { type: 'boolean' },
serverRules: { type: 'array', items: { type: 'string' } },
bannedEmailDomains: { type: 'array', items: { type: 'string' } },
@@ -636,6 +637,10 @@ export default class extends Endpoint { // eslint-
set.enableAchievements = ps.enableAchievements;
}
+ if (ps.robotsTxt !== undefined) {
+ set.robotsTxt = ps.robotsTxt;
+ }
+
if (ps.enableIdenticonGeneration !== undefined) {
set.enableIdenticonGeneration = ps.enableIdenticonGeneration;
}
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index e59314bf55..e93900b358 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -488,7 +488,14 @@ export class ClientServerService {
});
fastify.get('/robots.txt', async (request, reply) => {
- return await reply.sendFile('/robots.txt', staticAssets);
+ if (this.meta.robotsTxt) {
+ let content = '';
+ content += this.meta.robotsTxt;
+ reply.header('Content-Type', 'text/plain');
+ return await reply.send(content);
+ } else {
+ return await reply.sendFile('/robots.txt', staticAssets);
+ }
});
// OpenSearch XML
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 68f211de5c..cd05b43be8 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -159,6 +159,11 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.enableBotTrending }}{{ i18n.ts.modified }}
{{ i18n.ts.turnOffBotTrending }}
+
+
+ {{ i18n.ts.robotsTxt }}{{ i18n.ts.modified }}
+ {{ i18n.ts.robotsTxtDescription }}
+
@@ -369,10 +374,12 @@ const serviceWorkerForm = useForm({
const otherForm = useForm({
enableAchievements: meta.enableAchievements,
enableBotTrending: meta.enableBotTrending,
+ robotsTxt: meta.robotsTxt,
}, async (state) => {
await os.apiWithDialog('admin/update-meta', {
enableAchievements: state.enableAchievements,
enableBotTrending: state.enableBotTrending,
+ robotsTxt: state.robotsTxt,
});
fetchInstance(true);
});
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 6b3c099411..e0430b10ea 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -434,3 +434,6 @@ scheduledNotes: "Scheduled Notes"
_permissions:
"read:notes-schedule": "View your list of scheduled notes"
"write:notes-schedule": "Compose or delete scheduled notes"
+
+robotsTxt: "Custom robots.txt"
+robotsTxtDescription: "Adding entries here will override the default robots.txt packaged with Sharkey. Maximum 2048 characters."
--
cgit v1.2.3-freya
From fbc6d0de54031de840c39be3a2c7c63fe522c439 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 5 Feb 2025 10:39:46 +0900
Subject: enhance: ページslugに使用可能な文字を限定 (#15395)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* wip
* paramの正規表現で弾くように
* apiWithDialogを使用するように
* Update CHANGELOG.md
---------
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
---
CHANGELOG.md | 2 +-
locales/index.d.ts | 14 +--
locales/ja-JP.yml | 5 +-
packages/backend/src/models/Page.ts | 2 +
.../src/server/api/endpoints/pages/create.ts | 4 +-
.../src/server/api/endpoints/pages/update.ts | 5 +-
.../frontend/src/pages/page-editor/page-editor.vue | 111 ++++++++++-----------
7 files changed, 59 insertions(+), 84 deletions(-)
(limited to 'packages/backend/src/models')
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b9f91a38..7f48d1c532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,9 @@
- Playが実装されたため、ページ機能の「ソースを見る」は削除されました
### Server
+- Enhance: ページのURLに使用可能な文字を限定するように
- Fix: 個別お知らせページのmetaタグ出力の条件が間違っていたのを修正
-
## 2025.1.0
### Note
diff --git a/locales/index.d.ts b/locales/index.d.ts
index a0540fd228..4e26d5406b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4195,7 +4195,7 @@ export interface Locale extends ILocale {
*/
"invalidParamError": string;
/**
- * リクエストパラメータに問題があります。通常これはバグですが、入力した文字数が多すぎる等の可能性もあります。
+ * リクエストパラメータに問題があります。通常これはバグですが、入力した文字数が多すぎる・許可されていない文字を入力している等の可能性もあります。
*/
"invalidParamErrorDescription": string;
/**
@@ -9180,18 +9180,6 @@ export interface Locale extends ILocale {
* ソースを表示中
*/
"readPage": string;
- /**
- * ページを作成しました
- */
- "created": string;
- /**
- * ページを更新しました
- */
- "updated": string;
- /**
- * ページを削除しました
- */
- "deleted": string;
/**
* ページ設定
*/
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a578704434..13d8aec9b8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1044,7 +1044,7 @@ youCannotCreateAnymore: "これ以上作成することはできません。"
cannotPerformTemporary: "一時的に利用できません"
cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。"
invalidParamError: "パラメータエラー"
-invalidParamErrorDescription: "リクエストパラメータに問題があります。通常これはバグですが、入力した文字数が多すぎる等の可能性もあります。"
+invalidParamErrorDescription: "リクエストパラメータに問題があります。通常これはバグですが、入力した文字数が多すぎる・許可されていない文字を入力している等の可能性もあります。"
permissionDeniedError: "操作が拒否されました"
permissionDeniedErrorDescription: "このアカウントにはこの操作を行うための権限がありません。"
preset: "プリセット"
@@ -2422,9 +2422,6 @@ _pages:
newPage: "ページの作成"
editPage: "ページの編集"
readPage: "ソースを表示中"
- created: "ページを作成しました"
- updated: "ページを更新しました"
- deleted: "ページを削除しました"
pageSetting: "ページ設定"
nameAlreadyExists: "指定されたページURLは既に存在しています"
invalidNameTitle: "不正なページURLです"
diff --git a/packages/backend/src/models/Page.ts b/packages/backend/src/models/Page.ts
index 1695bf570e..0b59e7a92c 100644
--- a/packages/backend/src/models/Page.ts
+++ b/packages/backend/src/models/Page.ts
@@ -118,3 +118,5 @@ export class MiPage {
}
}
}
+
+export const pageNameSchema = { type: 'string', pattern: /^[^\s:\/?#\[\]@!$&'()*+,;=\\%\x00-\x20]{1,256}$/.source } as const;
diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts
index fa03b0b457..6de5fe3d44 100644
--- a/packages/backend/src/server/api/endpoints/pages/create.ts
+++ b/packages/backend/src/server/api/endpoints/pages/create.ts
@@ -7,7 +7,7 @@ import ms from 'ms';
import { Inject, Injectable } from '@nestjs/common';
import type { DriveFilesRepository, PagesRepository } from '@/models/_.js';
import { IdService } from '@/core/IdService.js';
-import { MiPage } from '@/models/Page.js';
+import { MiPage, pageNameSchema } from '@/models/Page.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { PageEntityService } from '@/core/entities/PageEntityService.js';
import { DI } from '@/di-symbols.js';
@@ -51,7 +51,7 @@ export const paramDef = {
type: 'object',
properties: {
title: { type: 'string' },
- name: { type: 'string', minLength: 1 },
+ name: { ...pageNameSchema, minLength: 1 },
summary: { type: 'string', nullable: true },
content: { type: 'array', items: {
type: 'object', additionalProperties: true,
diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts
index e52d9c32df..a6aeb6002e 100644
--- a/packages/backend/src/server/api/endpoints/pages/update.ts
+++ b/packages/backend/src/server/api/endpoints/pages/update.ts
@@ -10,6 +10,7 @@ import type { PagesRepository, DriveFilesRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../error.js';
+import { pageNameSchema } from '@/models/Page.js';
export const meta = {
tags: ['pages'],
@@ -31,13 +32,11 @@ export const meta = {
code: 'NO_SUCH_PAGE',
id: '21149b9e-3616-4778-9592-c4ce89f5a864',
},
-
accessDenied: {
message: 'Access denied.',
code: 'ACCESS_DENIED',
id: '3c15cd52-3b4b-4274-967d-6456fc4f792b',
},
-
noSuchFile: {
message: 'No such file.',
code: 'NO_SUCH_FILE',
@@ -56,7 +55,7 @@ export const paramDef = {
properties: {
pageId: { type: 'string', format: 'misskey:id' },
title: { type: 'string' },
- name: { type: 'string', minLength: 1 },
+ name: { ...pageNameSchema, minLength: 1 },
summary: { type: 'string', nullable: true },
content: { type: 'array', items: {
type: 'object', additionalProperties: true,
diff --git a/packages/frontend/src/pages/page-editor/page-editor.vue b/packages/frontend/src/pages/page-editor/page-editor.vue
index ddb808390c..c08cfebab3 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.vue
+++ b/packages/frontend/src/pages/page-editor/page-editor.vue
@@ -96,7 +96,7 @@ const summary = ref
+ <
+
+ >
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkRoleSelectDialog.stories.impl.ts b/packages/frontend/src/components/MkRoleSelectDialog.stories.impl.ts
new file mode 100644
index 0000000000..411d62edf9
--- /dev/null
+++ b/packages/frontend/src/components/MkRoleSelectDialog.stories.impl.ts
@@ -0,0 +1,106 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { StoryObj } from '@storybook/vue3';
+import { http, HttpResponse } from 'msw';
+import { role } from '../../.storybook/fakes.js';
+import { commonHandlers } from '../../.storybook/mocks.js';
+import MkRoleSelectDialog from '@/components/MkRoleSelectDialog.vue';
+
+const roles = [
+ role({ displayOrder: 1 }, '1'), role({ displayOrder: 1 }, '1'), role({ displayOrder: 1 }, '1'), role({ displayOrder: 1 }, '1'),
+ role({ displayOrder: 2 }, '2'), role({ displayOrder: 2 }, '2'), role({ displayOrder: 3 }, '3'), role({ displayOrder: 3 }, '3'),
+ role({ displayOrder: 4 }, '4'), role({ displayOrder: 5 }, '5'), role({ displayOrder: 6 }, '6'), role({ displayOrder: 7 }, '7'),
+ role({ displayOrder: 999, name: 'privateRole', isPublic: false }, '999'),
+];
+
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkRoleSelectDialog,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '
+
+ {{ i }}
+
+
+
+
+
+ {{ min }}
+
+
+
+
+
+ {{ max }}
+
+
+ {{ infoMessage }}
+
+
+
+ {{ i18n.ts.add }}
+
+
+
+
+
+
+
+ {{ i18n.ts._roleSelectDialog.notSelected }}
+
+
+
+ {{ i18n.ts.ok }}
+ {{ i18n.ts.cancel }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkTagItem.stories.impl.ts b/packages/frontend/src/components/MkTagItem.stories.impl.ts
new file mode 100644
index 0000000000..3f243ff651
--- /dev/null
+++ b/packages/frontend/src/components/MkTagItem.stories.impl.ts
@@ -0,0 +1,70 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+/* eslint-disable import/no-default-export */
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import MkTagItem from './MkTagItem.vue';
+
+export const Default = {
+ render(args) {
+ return {
+ components: {
+ MkTagItem: MkTagItem,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ events() {
+ return {
+ click: action('click'),
+ exButtonClick: action('exButtonClick'),
+ };
+ },
+ },
+ template: '
+
+
+
+ {{ content }}
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkCellTooltip.vue b/packages/frontend/src/components/grid/MkCellTooltip.vue
new file mode 100644
index 0000000000..fd289c6cd9
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkCellTooltip.vue
@@ -0,0 +1,35 @@
+
+
+
+
+ {{ content }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkDataRow.vue b/packages/frontend/src/components/grid/MkDataRow.vue
new file mode 100644
index 0000000000..280a14bc4a
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkDataRow.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+ {{ cell.value }}
+
+
+ {{ cell.value }}
+
+
+ {{ cell.value }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkGrid.stories.impl.ts b/packages/frontend/src/components/grid/MkGrid.stories.impl.ts
new file mode 100644
index 0000000000..5801012f15
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkGrid.stories.impl.ts
@@ -0,0 +1,223 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { ref } from 'vue';
+import { commonHandlers } from '../../../.storybook/mocks.js';
+import { boolean, choose, country, date, firstName, integer, lastName, text } from '../../../.storybook/fake-utils.js';
+import MkGrid from './MkGrid.vue';
+import { GridContext, GridEvent } from '@/components/grid/grid-event.js';
+import { DataSource, GridSetting } from '@/components/grid/grid.js';
+import { GridColumnSetting } from '@/components/grid/column.js';
+
+function d(p: {
+ check?: boolean,
+ name?: string,
+ email?: string,
+ age?: number,
+ birthday?: string,
+ gender?: string,
+ country?: string,
+ reportCount?: number,
+ createdAt?: string,
+}, seed: string) {
+ const prefix = text(10, seed);
+
+ return {
+ check: p.check ?? boolean(seed),
+ name: p.name ?? `${firstName(seed)} ${lastName(seed)}`,
+ email: p.email ?? `${prefix}@example.com`,
+ age: p.age ?? integer(20, 80, seed),
+ birthday: date({}, seed).toISOString(),
+ gender: p.gender ?? choose(['male', 'female', 'other', 'unknown'], seed),
+ country: p.country ?? country(seed),
+ reportCount: p.reportCount ?? integer(0, 9999, seed),
+ createdAt: p.createdAt ?? date({}, seed).toISOString(),
+ };
+}
+
+const defaultCols: GridColumnSetting[] = [
+ { bindTo: 'check', icon: 'ti-check', type: 'boolean', width: 50 },
+ { bindTo: 'name', title: 'Name', type: 'text', width: 'auto' },
+ { bindTo: 'email', title: 'Email', type: 'text', width: 'auto' },
+ { bindTo: 'age', title: 'Age', type: 'number', width: 50 },
+ { bindTo: 'birthday', title: 'Birthday', type: 'date', width: 'auto' },
+ { bindTo: 'gender', title: 'Gender', type: 'text', width: 80 },
+ { bindTo: 'country', title: 'Country', type: 'text', width: 120 },
+ { bindTo: 'reportCount', title: 'ReportCount', type: 'number', width: 'auto' },
+ { bindTo: 'createdAt', title: 'CreatedAt', type: 'date', width: 'auto' },
+];
+
+function createArgs(overrides?: { settings?: Partial
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkHeaderCell.vue b/packages/frontend/src/components/grid/MkHeaderCell.vue
new file mode 100644
index 0000000000..605d27c6d6
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkHeaderCell.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkHeaderRow.vue b/packages/frontend/src/components/grid/MkHeaderRow.vue
new file mode 100644
index 0000000000..8affa08fd5
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkHeaderRow.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ text }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/MkNumberCell.vue b/packages/frontend/src/components/grid/MkNumberCell.vue
new file mode 100644
index 0000000000..674bba96bc
--- /dev/null
+++ b/packages/frontend/src/components/grid/MkNumberCell.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/grid/cell-validators.ts b/packages/frontend/src/components/grid/cell-validators.ts
new file mode 100644
index 0000000000..949cab2ec6
--- /dev/null
+++ b/packages/frontend/src/components/grid/cell-validators.ts
@@ -0,0 +1,110 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { CellValue, GridCell } from '@/components/grid/cell.js';
+import { GridColumn } from '@/components/grid/column.js';
+import { GridRow } from '@/components/grid/row.js';
+import { i18n } from '@/i18n.js';
+
+export type ValidatorParams = {
+ column: GridColumn;
+ row: GridRow;
+ value: CellValue;
+ allCells: GridCell[];
+};
+
+export type ValidatorResult = {
+ valid: boolean;
+ message?: string;
+}
+
+export type GridCellValidator = {
+ name?: string;
+ ignoreViolation?: boolean;
+ validate: (params: ValidatorParams) => ValidatorResult;
+}
+
+export type ValidateViolation = {
+ valid: boolean;
+ params: ValidatorParams;
+ violations: ValidateViolationItem[];
+}
+
+export type ValidateViolationItem = {
+ valid: boolean;
+ validator: GridCellValidator;
+ result: ValidatorResult;
+}
+
+export function cellValidation(allCells: GridCell[], cell: GridCell, newValue: CellValue): ValidateViolation {
+ const { column, row } = cell;
+ const validators = column.setting.validators ?? [];
+
+ const params: ValidatorParams = {
+ column,
+ row,
+ value: newValue,
+ allCells,
+ };
+
+ const violations: ValidateViolationItem[] = validators.map(validator => {
+ const result = validator.validate(params);
+ return {
+ valid: result.valid,
+ validator,
+ result,
+ };
+ });
+
+ return {
+ valid: violations.every(v => v.result.valid),
+ params,
+ violations,
+ };
+}
+
+class ValidatorPreset {
+ required(): GridCellValidator {
+ return {
+ name: 'required',
+ validate: ({ value }): ValidatorResult => {
+ return {
+ valid: value !== null && value !== undefined && value !== '',
+ message: i18n.ts._gridComponent._error.requiredValue,
+ };
+ },
+ };
+ }
+
+ regex(pattern: RegExp): GridCellValidator {
+ return {
+ name: 'regex',
+ validate: ({ value }): ValidatorResult => {
+ return {
+ valid: (typeof value !== 'string') || pattern.test(value.toString() ?? ''),
+ message: i18n.tsx._gridComponent._error.patternNotMatch({ pattern: pattern.source }),
+ };
+ },
+ };
+ }
+
+ unique(): GridCellValidator {
+ return {
+ name: 'unique',
+ validate: ({ column, row, value, allCells }): ValidatorResult => {
+ const bindTo = column.setting.bindTo;
+ const isUnique = allCells
+ .filter(it => it.column.setting.bindTo === bindTo && it.row.index !== row.index)
+ .every(cell => cell.value !== value);
+ return {
+ valid: isUnique,
+ message: i18n.ts._gridComponent._error.notUnique,
+ };
+ },
+ };
+ }
+}
+
+export const validators = new ValidatorPreset();
diff --git a/packages/frontend/src/components/grid/cell.ts b/packages/frontend/src/components/grid/cell.ts
new file mode 100644
index 0000000000..71b7a3e3f1
--- /dev/null
+++ b/packages/frontend/src/components/grid/cell.ts
@@ -0,0 +1,88 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { ValidateViolation } from '@/components/grid/cell-validators.js';
+import { Size } from '@/components/grid/grid.js';
+import { GridColumn } from '@/components/grid/column.js';
+import { GridRow } from '@/components/grid/row.js';
+import { MenuItem } from '@/types/menu.js';
+import { GridContext } from '@/components/grid/grid-event.js';
+
+export type CellValue = string | boolean | number | undefined | null | Array
+ {{ content }}
+
+
+
+
+ {{ i18n.ts._customEmojisManager._gridCommon.searchSettings }}
+
+ {{ i18n.ts._customEmojisManager._gridCommon.searchSettingCaption }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._gridCommon.sortOrder }}
+
+
+
+
+
+ name
+
+
+ category
+
+
+ aliases
+
+
+
+ type
+
+
+ license
+
+
+ sensitive
+
+
+
+
+
+
+ localOnly
+
+
+
+
+
+ updatedAt(from)
+
+
+ updatedAt(to)
+
+
+
+ role
+
+
+
+
+
+
+ {{ i18n.ts.search }}
+
+
+ {{ i18n.ts.reset }}
+
+
+
+ {{ i18n.ts._customEmojisManager._local._list.emojisNothing }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.delete }} ({{ deleteItemsCount }})
+
+
+
+
+
+
+
+
+ {{ i18n.ts.update }} ({{ updatedItemsCount }})
+
+ {{ i18n.ts.reset }}
+
+
+
+
+ {{ i18n.ts._customEmojisManager._local._register.uploadSettingTitle }}
+ {{ i18n.ts._customEmojisManager._local._register.uploadSettingDescription }}
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.vue
new file mode 100644
index 0000000000..ea4303f342
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+ {{ i18n.ts.uploadFolder }}
+
+
+
+
+ {{ i18n.ts.keepOriginalUploading }}
+ {{ i18n.ts.keepOriginalUploadingDescription }}
+
+
+
+ {{ i18n.ts._customEmojisManager._local._register.directoryToCategoryLabel }}
+ {{ i18n.ts._customEmojisManager._local._register.directoryToCategoryCaption }}
+
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._local._register.emojiInputAreaCaption }}
+
+ -
+
- {{ i18n.ts._customEmojisManager._local._register.emojiInputAreaList1 }} +
- {{ i18n.ts._customEmojisManager._local._register.emojiInputAreaList2 }} +
- {{ i18n.ts._customEmojisManager._local._register.emojiInputAreaList3 }} +
+
+
+
+
+ {{ i18n.ts.registration }}
+
+
+ {{ i18n.ts.clear }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue
new file mode 100644
index 0000000000..f75f6c0da5
--- /dev/null
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.logs-folder.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._logs.showSuccessLogSwitch }}
+
+
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._logs.failureLogNothing }}
+
+
+ {{ i18n.ts._customEmojisManager._logs.logNothing }}
+
+
+
+
+ {{ i18n.ts._customEmojisManager._gridCommon.searchSettings }}
+
+ {{ i18n.ts._customEmojisManager._gridCommon.searchSettingCaption }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._customEmojisManager._gridCommon.sortOrder }}
+
+
+
+
+
+ name
+
+
+ host
+
+
+ uri
+
+
+ publicUrl
+
+
+
+
+
+ {{ i18n.ts.search }}
+
+
+ {{ i18n.ts.reset }}
+
+
+
+ {{ i18n.ts._customEmojisManager._local._list.emojisNothing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ i18n.ts._customEmojisManager._remote.importEmojisButton
+ }} ({{ checkedItemsCount }})
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index fd15ae1d66..969ca8b9e8 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -121,6 +121,11 @@ const menuDef = computed(() => [{
text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: currentPage.value?.route.name === 'emojis',
+ }, {
+ icon: 'ti ti-icons',
+ text: i18n.ts.customEmojis + '(beta)',
+ to: '/admin/emojis2',
+ active: currentPage.value?.route.name === 'emojis2',
}, {
icon: 'ti ti-sparkles',
text: i18n.ts.avatarDecorations,
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index e98e0b59b1..732b209a36 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -382,6 +382,10 @@ const routes: RouteDef[] = [{
path: '/emojis',
name: 'emojis',
component: page(() => import('@/pages/custom-emojis-manager.vue')),
+ }, {
+ path: '/emojis2',
+ name: 'emojis2',
+ component: page(() => import('@/pages/admin/custom-emojis-manager2.vue')),
}, {
path: '/avatar-decorations',
name: 'avatarDecorations',
diff --git a/packages/frontend/src/scripts/file-drop.ts b/packages/frontend/src/scripts/file-drop.ts
new file mode 100644
index 0000000000..c2e863c0dc
--- /dev/null
+++ b/packages/frontend/src/scripts/file-drop.ts
@@ -0,0 +1,121 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export type DroppedItem = DroppedFile | DroppedDirectory;
+
+export type DroppedFile = {
+ isFile: true;
+ path: string;
+ file: File;
+};
+
+export type DroppedDirectory = {
+ isFile: false;
+ path: string;
+ children: DroppedItem[];
+}
+
+export async function extractDroppedItems(ev: DragEvent): Promise