Merge branch 'develop' into mkjs-n

2023-05-12 07:03:20 +00:00
parent 00cc846729 f983e44d9e
commit 64f4bb6a90
63 changed files with 1694 additions and 1197 deletions
--- 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,