Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Do not inject instance language in user API

Chocobozzzfcb3d83e3283
diff --git a/packages/tests/src/api/users/users.ts b/packages/tests/src/api/users/users.ts
index cfbbdd54b9..ae5f43ccb3 100644
--- a/packages/tests/src/api/users/users.ts
+++ b/packages/tests/src/api/users/users.ts
@@ -55,7 +55,7 @@ describe('Test users', function () {
expect(user.id).to.be.a('number')
expect(user.account.displayName).to.equal('user_1')
expect(user.account.description).to.be.null
- expect(user.language).to.equal('en')
+ expect(user.language).to.be.null
}
expect(userMe.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)
@@ -331,29 +331,6 @@ describe('Test users', function () {
expect(user.noAccountSetupWarningModal).to.be.true
})
- it('Should update instance config and automatically update user language', async function () {
- {
- const user = await server.users.getMyInfo({ token: userToken })
- expect(user.videoLanguages).to.be.null
- expect(user.language).to.equal('en')
- }
-
- {
- await server.config.updateExistingConfig({
- newConfig: {
- instance: {
- defaultLanguage: 'es'
- }
- }
- })
- }
-
- {
- const user = await server.users.getMyInfo({ token: userToken })
- expect(user.language).to.equal('es')
- }
- })
-
it('Should be able to update my languages', async function () {
await server.users.updateMe({
token: userToken,
diff --git a/server/core/models/user/user.ts b/server/core/models/user/user.ts
index 1ed51f0a41..ecb77dfe76 100644
--- a/server/core/models/user/user.ts
+++ b/server/core/models/user/user.ts
@@ -1032,7 +1032,7 @@ export class UserModel extends SequelizeModel<UserModel> {
autoPlayNextVideoPlaylist: this.autoPlayNextVideoPlaylist,
videoLanguages: this.videoLanguages,
- language: this.getLanguage(),
+ language: this.language,
role: {
id: this.role,