summaryrefslogtreecommitdiff
path: root/packages/backend
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-05-11 16:22:46 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-05-11 16:22:46 +0900
commitb380dc53e13cd925eb94420863fe38f4779a6ab8 (patch)
treece23f83b9f1ebaa6094111e8207e9d42b16e651f /packages/backend
parentfix(frontend): より明確な説明にしたのとtypo修正 (diff)
downloadmisskey-b380dc53e13cd925eb94420863fe38f4779a6ab8.tar.gz
misskey-b380dc53e13cd925eb94420863fe38f4779a6ab8.tar.bz2
misskey-b380dc53e13cd925eb94420863fe38f4779a6ab8.zip
fix typo
Diffstat (limited to '')
-rw-r--r--packages/backend/migration/1683789676867-fix-typo.js11
-rw-r--r--packages/backend/src/core/entities/UserEntityService.ts2
-rw-r--r--packages/backend/src/models/entities/UserProfile.ts2
-rw-r--r--packages/backend/src/models/json-schema/user.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/admin/show-user.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/i/update.ts4
-rw-r--r--packages/backend/src/server/web/ClientServerService.ts12
-rw-r--r--packages/backend/src/server/web/views/clip.pug2
-rw-r--r--packages/backend/src/server/web/views/flash.pug2
-rw-r--r--packages/backend/src/server/web/views/gallery-post.pug2
-rw-r--r--packages/backend/src/server/web/views/note.pug2
-rw-r--r--packages/backend/src/server/web/views/page.pug2
-rw-r--r--packages/backend/src/server/web/views/user.pug2
-rw-r--r--packages/backend/test/e2e/users.ts8
14 files changed, 33 insertions, 22 deletions
diff --git a/packages/backend/migration/1683789676867-fix-typo.js b/packages/backend/migration/1683789676867-fix-typo.js
new file mode 100644
index 0000000000..c0dbbf0050
--- /dev/null
+++ b/packages/backend/migration/1683789676867-fix-typo.js
@@ -0,0 +1,11 @@
+export class FixTypo1683789676867 {
+ name = 'FixTypo1683789676867'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" RENAME COLUMN "preventAiLarning" TO "preventAiLearning"`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" RENAME COLUMN "preventAiLearning" TO "preventAiLarning"`);
+ }
+}
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index cb0b15fac9..7f61e1d6f3 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -445,7 +445,7 @@ export class UserEntityService implements OnModuleInit {
carefulBot: profile!.carefulBot,
autoAcceptFollowed: profile!.autoAcceptFollowed,
noCrawle: profile!.noCrawle,
- preventAiLarning: profile!.preventAiLarning,
+ preventAiLearning: profile!.preventAiLearning,
isExplorable: user.isExplorable,
isDeleted: user.isDeleted,
hideOnlineStatus: user.hideOnlineStatus,
diff --git a/packages/backend/src/models/entities/UserProfile.ts b/packages/backend/src/models/entities/UserProfile.ts
index 2cebc56096..236ee8f988 100644
--- a/packages/backend/src/models/entities/UserProfile.ts
+++ b/packages/backend/src/models/entities/UserProfile.ts
@@ -150,7 +150,7 @@ export class UserProfile {
@Column('boolean', {
default: true,
})
- public preventAiLarning: boolean;
+ public preventAiLearning: boolean;
@Column('boolean', {
default: false,
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 9d630db4cd..f9a20ac398 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -304,7 +304,7 @@ export const packedMeDetailedOnlySchema = {
type: 'boolean',
nullable: false, optional: false,
},
- preventAiLarning: {
+ preventAiLearning: {
type: 'boolean',
nullable: false, optional: false,
},
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 12e656a2f7..f49d2a0966 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
emailVerified: profile.emailVerified,
autoAcceptFollowed: profile.autoAcceptFollowed,
noCrawle: profile.noCrawle,
- preventAiLarning: profile.preventAiLarning,
+ preventAiLearning: profile.preventAiLearning,
alwaysMarkNsfw: profile.alwaysMarkNsfw,
autoSensitive: profile.autoSensitive,
carefulBot: profile.carefulBot,
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 4cc173c2d0..74be00a8b8 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -138,7 +138,7 @@ export const paramDef = {
carefulBot: { type: 'boolean' },
autoAcceptFollowed: { type: 'boolean' },
noCrawle: { type: 'boolean' },
- preventAiLarning: { type: 'boolean' },
+ preventAiLearning: { type: 'boolean' },
isBot: { type: 'boolean' },
isCat: { type: 'boolean' },
showTimelineReplies: { type: 'boolean' },
@@ -243,7 +243,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
if (typeof ps.autoAcceptFollowed === 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
if (typeof ps.noCrawle === 'boolean') profileUpdates.noCrawle = ps.noCrawle;
- if (typeof ps.preventAiLarning === 'boolean') profileUpdates.preventAiLarning = ps.preventAiLarning;
+ if (typeof ps.preventAiLearning === 'boolean') profileUpdates.preventAiLearning = ps.preventAiLearning;
if (typeof ps.isCat === 'boolean') updates.isCat = ps.isCat;
if (typeof ps.injectFeaturedNote === 'boolean') profileUpdates.injectFeaturedNote = ps.injectFeaturedNote;
if (typeof ps.receiveAnnouncementEmail === 'boolean') profileUpdates.receiveAnnouncementEmail = ps.receiveAnnouncementEmail;
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 12369c927c..f780280c1f 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -423,7 +423,7 @@ export class ClientServerService {
: [];
reply.header('Cache-Control', 'public, max-age=15');
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
@@ -471,7 +471,7 @@ export class ClientServerService {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: note.userId });
const meta = await this.metaService.fetch();
reply.header('Cache-Control', 'public, max-age=15');
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
@@ -514,7 +514,7 @@ export class ClientServerService {
} else {
reply.header('Cache-Control', 'private, max-age=0, must-revalidate');
}
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
@@ -542,7 +542,7 @@ export class ClientServerService {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: flash.userId });
const meta = await this.metaService.fetch();
reply.header('Cache-Control', 'public, max-age=15');
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
@@ -570,7 +570,7 @@ export class ClientServerService {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: clip.userId });
const meta = await this.metaService.fetch();
reply.header('Cache-Control', 'public, max-age=15');
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
@@ -596,7 +596,7 @@ export class ClientServerService {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: post.userId });
const meta = await this.metaService.fetch();
reply.header('Cache-Control', 'public, max-age=15');
- if (profile.preventAiLarning) {
+ if (profile.preventAiLearning) {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
diff --git a/packages/backend/src/server/web/views/clip.pug b/packages/backend/src/server/web/views/clip.pug
index 1491e0f748..74dc62f1e7 100644
--- a/packages/backend/src/server/web/views/clip.pug
+++ b/packages/backend/src/server/web/views/clip.pug
@@ -21,7 +21,7 @@ block og
block meta
if profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/src/server/web/views/flash.pug b/packages/backend/src/server/web/views/flash.pug
index 5005d27869..5594fcdfbf 100644
--- a/packages/backend/src/server/web/views/flash.pug
+++ b/packages/backend/src/server/web/views/flash.pug
@@ -21,7 +21,7 @@ block og
block meta
if profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/src/server/web/views/gallery-post.pug b/packages/backend/src/server/web/views/gallery-post.pug
index 2c1102ee79..10f2d269bc 100644
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ b/packages/backend/src/server/web/views/gallery-post.pug
@@ -21,7 +21,7 @@ block og
block meta
if user.host || profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index d768c4a46d..badfcccd61 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -22,7 +22,7 @@ block og
block meta
if user.host || isRenote || profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/src/server/web/views/page.pug b/packages/backend/src/server/web/views/page.pug
index 1dd95c52b8..ddffc361c8 100644
--- a/packages/backend/src/server/web/views/page.pug
+++ b/packages/backend/src/server/web/views/page.pug
@@ -21,7 +21,7 @@ block og
block meta
if profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index a5427d2ce0..f4c83aa89d 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -20,7 +20,7 @@ block og
block meta
if user.host || profile.noCrawle
meta(name='robots' content='noindex')
- if profile.preventAiLarning
+ if profile.preventAiLearning
meta(name='robots' content='noimageai')
meta(name='robots' content='noai')
diff --git a/packages/backend/test/e2e/users.ts b/packages/backend/test/e2e/users.ts
index 640fa71a7b..a7f8210c8e 100644
--- a/packages/backend/test/e2e/users.ts
+++ b/packages/backend/test/e2e/users.ts
@@ -145,7 +145,7 @@ describe('ユーザー', () => {
carefulBot: user.carefulBot,
autoAcceptFollowed: user.autoAcceptFollowed,
noCrawle: user.noCrawle,
- preventAiLarning: user.preventAiLarning,
+ preventAiLearning: user.preventAiLearning,
isExplorable: user.isExplorable,
isDeleted: user.isDeleted,
hideOnlineStatus: user.hideOnlineStatus,
@@ -391,7 +391,7 @@ describe('ユーザー', () => {
assert.strictEqual(response.carefulBot, false);
assert.strictEqual(response.autoAcceptFollowed, true);
assert.strictEqual(response.noCrawle, false);
- assert.strictEqual(response.preventAiLarning, true);
+ assert.strictEqual(response.preventAiLearning, true);
assert.strictEqual(response.isExplorable, true);
assert.strictEqual(response.isDeleted, false);
assert.strictEqual(response.hideOnlineStatus, false);
@@ -464,8 +464,8 @@ describe('ユーザー', () => {
{ parameters: (): object => ({ autoAcceptFollowed: false }) },
{ parameters: (): object => ({ noCrawle: true }) },
{ parameters: (): object => ({ noCrawle: false }) },
- { parameters: (): object => ({ preventAiLarning: false }) },
- { parameters: (): object => ({ preventAiLarning: true }) },
+ { parameters: (): object => ({ preventAiLearning: false }) },
+ { parameters: (): object => ({ preventAiLearning: true }) },
{ parameters: (): object => ({ isBot: true }) },
{ parameters: (): object => ({ isBot: false }) },
{ parameters: (): object => ({ isCat: true }) },