diff options
18 files changed, 105 insertions, 12 deletions
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.html b/client/src/app/account/account-settings/account-details/account-details.component.html index bc18b39b4..593b87e29 100644 --- a/client/src/app/account/account-settings/account-details/account-details.component.html +++ b/client/src/app/account/account-settings/account-details/account-details.component.html | |||
@@ -9,6 +9,12 @@ | |||
9 | <div *ngIf="formErrors['displayNSFW']" class="alert alert-danger"> | 9 | <div *ngIf="formErrors['displayNSFW']" class="alert alert-danger"> |
10 | {{ formErrors['displayNSFW'] }} | 10 | {{ formErrors['displayNSFW'] }} |
11 | </div> | 11 | </div> |
12 | <br/> | ||
13 | <input | ||
14 | type="checkbox" id="autoPlayVideo" | ||
15 | formControlName="autoPlayVideo" | ||
16 | > | ||
17 | <label for="autoPlayVideo">Automatically plays video</label> | ||
12 | 18 | ||
13 | <input type="submit" value="Save" [disabled]="!form.valid"> | 19 | <input type="submit" value="Save" [disabled]="!form.valid"> |
14 | </form> | 20 | </form> |
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.ts b/client/src/app/account/account-settings/account-details/account-details.component.ts index d835c53e5..b8c19d8d6 100644 --- a/client/src/app/account/account-settings/account-details/account-details.component.ts +++ b/client/src/app/account/account-settings/account-details/account-details.component.ts | |||
@@ -31,7 +31,8 @@ export class AccountDetailsComponent extends FormReactive implements OnInit { | |||
31 | 31 | ||
32 | buildForm () { | 32 | buildForm () { |
33 | this.form = this.formBuilder.group({ | 33 | this.form = this.formBuilder.group({ |
34 | displayNSFW: [ this.user.displayNSFW ] | 34 | displayNSFW: [ this.user.displayNSFW ], |
35 | autoPlayVideo: [ this.user.autoPlayVideo ] | ||
35 | }) | 36 | }) |
36 | 37 | ||
37 | this.form.valueChanges.subscribe(data => this.onValueChanged(data)) | 38 | this.form.valueChanges.subscribe(data => this.onValueChanged(data)) |
@@ -43,8 +44,10 @@ export class AccountDetailsComponent extends FormReactive implements OnInit { | |||
43 | 44 | ||
44 | updateDetails () { | 45 | updateDetails () { |
45 | const displayNSFW = this.form.value['displayNSFW'] | 46 | const displayNSFW = this.form.value['displayNSFW'] |
47 | const autoPlayVideo = this.form.value['autoPlayVideo'] | ||
46 | const details: UserUpdateMe = { | 48 | const details: UserUpdateMe = { |
47 | displayNSFW | 49 | displayNSFW, |
50 | autoPlayVideo | ||
48 | } | 51 | } |
49 | 52 | ||
50 | this.error = null | 53 | this.error = null |
diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/account/account-settings/account-settings.component.html index c0a74cc47..f14eadd49 100644 --- a/client/src/app/account/account-settings/account-settings.component.html +++ b/client/src/app/account/account-settings/account-settings.component.html | |||
@@ -11,5 +11,5 @@ | |||
11 | <div class="account-title">Account settings</div> | 11 | <div class="account-title">Account settings</div> |
12 | <my-account-change-password></my-account-change-password> | 12 | <my-account-change-password></my-account-change-password> |
13 | 13 | ||
14 | <div class="account-title">Filtering</div> | 14 | <div class="account-title">Videos</div> |
15 | <my-account-details [user]="user"></my-account-details> | 15 | <my-account-details [user]="user"></my-account-details> |
diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts index 7b6c8816f..9ad275392 100644 --- a/client/src/app/core/auth/auth-user.model.ts +++ b/client/src/app/core/auth/auth-user.model.ts | |||
@@ -69,7 +69,8 @@ export class AuthUser extends User { | |||
69 | ROLE: 'role', | 69 | ROLE: 'role', |
70 | EMAIL: 'email', | 70 | EMAIL: 'email', |
71 | USERNAME: 'username', | 71 | USERNAME: 'username', |
72 | DISPLAY_NSFW: 'display_nsfw' | 72 | DISPLAY_NSFW: 'display_nsfw', |
73 | AUTO_PLAY_VIDEO: 'auto_play_video' | ||
73 | } | 74 | } |
74 | 75 | ||
75 | tokens: Tokens | 76 | tokens: Tokens |
@@ -83,7 +84,8 @@ export class AuthUser extends User { | |||
83 | username: localStorage.getItem(this.KEYS.USERNAME), | 84 | username: localStorage.getItem(this.KEYS.USERNAME), |
84 | email: localStorage.getItem(this.KEYS.EMAIL), | 85 | email: localStorage.getItem(this.KEYS.EMAIL), |
85 | role: parseInt(localStorage.getItem(this.KEYS.ROLE), 10) as UserRole, | 86 | role: parseInt(localStorage.getItem(this.KEYS.ROLE), 10) as UserRole, |
86 | displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true' | 87 | displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true', |
88 | autoPlayVideo: localStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true' | ||
87 | }, | 89 | }, |
88 | Tokens.load() | 90 | Tokens.load() |
89 | ) | 91 | ) |
@@ -97,6 +99,7 @@ export class AuthUser extends User { | |||
97 | localStorage.removeItem(this.KEYS.ID) | 99 | localStorage.removeItem(this.KEYS.ID) |
98 | localStorage.removeItem(this.KEYS.ROLE) | 100 | localStorage.removeItem(this.KEYS.ROLE) |
99 | localStorage.removeItem(this.KEYS.DISPLAY_NSFW) | 101 | localStorage.removeItem(this.KEYS.DISPLAY_NSFW) |
102 | localStorage.removeItem(this.KEYS.AUTO_PLAY_VIDEO) | ||
100 | localStorage.removeItem(this.KEYS.EMAIL) | 103 | localStorage.removeItem(this.KEYS.EMAIL) |
101 | Tokens.flush() | 104 | Tokens.flush() |
102 | } | 105 | } |
@@ -133,6 +136,7 @@ export class AuthUser extends User { | |||
133 | localStorage.setItem(AuthUser.KEYS.EMAIL, this.email) | 136 | localStorage.setItem(AuthUser.KEYS.EMAIL, this.email) |
134 | localStorage.setItem(AuthUser.KEYS.ROLE, this.role.toString()) | 137 | localStorage.setItem(AuthUser.KEYS.ROLE, this.role.toString()) |
135 | localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW)) | 138 | localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW)) |
139 | localStorage.setItem(AuthUser.KEYS.AUTO_PLAY_VIDEO, JSON.stringify(this.autoPlayVideo)) | ||
136 | this.tokens.save() | 140 | this.tokens.save() |
137 | } | 141 | } |
138 | } | 142 | } |
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index e2b8b6ba5..37264a8ad 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts | |||
@@ -33,6 +33,7 @@ interface UserLoginWithUserInformation extends UserLogin { | |||
33 | id: number | 33 | id: number |
34 | role: UserRole | 34 | role: UserRole |
35 | displayNSFW: boolean | 35 | displayNSFW: boolean |
36 | autoPlayVideo: boolean | ||
36 | email: string | 37 | email: string |
37 | videoQuota: number | 38 | videoQuota: number |
38 | account: Account | 39 | account: Account |
@@ -191,6 +192,7 @@ export class AuthService { | |||
191 | .subscribe( | 192 | .subscribe( |
192 | res => { | 193 | res => { |
193 | this.user.displayNSFW = res.displayNSFW | 194 | this.user.displayNSFW = res.displayNSFW |
195 | this.user.autoPlayVideo = res.autoPlayVideo | ||
194 | this.user.role = res.role | 196 | this.user.role = res.role |
195 | this.user.videoChannels = res.videoChannels | 197 | this.user.videoChannels = res.videoChannels |
196 | this.user.account = res.account | 198 | this.user.account = res.account |
@@ -212,6 +214,7 @@ export class AuthService { | |||
212 | id: res.id, | 214 | id: res.id, |
213 | role: res.role, | 215 | role: res.role, |
214 | displayNSFW: res.displayNSFW, | 216 | displayNSFW: res.displayNSFW, |
217 | autoPlayVideo: res.autoPlayVideo, | ||
215 | email: res.email, | 218 | email: res.email, |
216 | videoQuota: res.videoQuota, | 219 | videoQuota: res.videoQuota, |
217 | account: res.account, | 220 | account: res.account, |
@@ -230,6 +233,7 @@ export class AuthService { | |||
230 | role: obj.role, | 233 | role: obj.role, |
231 | email: obj.email, | 234 | email: obj.email, |
232 | displayNSFW: obj.displayNSFW, | 235 | displayNSFW: obj.displayNSFW, |
236 | autoPlayVideo: obj.autoPlayVideo, | ||
233 | videoQuota: obj.videoQuota, | 237 | videoQuota: obj.videoQuota, |
234 | videoChannels: obj.videoChannels, | 238 | videoChannels: obj.videoChannels, |
235 | account: obj.account | 239 | account: obj.account |
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts index b4d13f37c..7a962ae3e 100644 --- a/client/src/app/shared/users/user.model.ts +++ b/client/src/app/shared/users/user.model.ts | |||
@@ -8,6 +8,7 @@ export type UserConstructorHash = { | |||
8 | role: UserRole, | 8 | role: UserRole, |
9 | videoQuota?: number, | 9 | videoQuota?: number, |
10 | displayNSFW?: boolean, | 10 | displayNSFW?: boolean, |
11 | autoPlayVideo?: boolean, | ||
11 | createdAt?: Date, | 12 | createdAt?: Date, |
12 | account?: Account, | 13 | account?: Account, |
13 | videoChannels?: VideoChannel[] | 14 | videoChannels?: VideoChannel[] |
@@ -18,6 +19,7 @@ export class User implements UserServerModel { | |||
18 | email: string | 19 | email: string |
19 | role: UserRole | 20 | role: UserRole |
20 | displayNSFW: boolean | 21 | displayNSFW: boolean |
22 | autoPlayVideo: boolean | ||
21 | videoQuota: number | 23 | videoQuota: number |
22 | account: Account | 24 | account: Account |
23 | videoChannels: VideoChannel[] | 25 | videoChannels: VideoChannel[] |
@@ -42,6 +44,10 @@ export class User implements UserServerModel { | |||
42 | this.displayNSFW = hash.displayNSFW | 44 | this.displayNSFW = hash.displayNSFW |
43 | } | 45 | } |
44 | 46 | ||
47 | if (hash.autoPlayVideo !== undefined) { | ||
48 | this.autoPlayVideo = hash.autoPlayVideo | ||
49 | } | ||
50 | |||
45 | if (hash.createdAt !== undefined) { | 51 | if (hash.createdAt !== undefined) { |
46 | this.createdAt = hash.createdAt | 52 | this.createdAt = hash.createdAt |
47 | } | 53 | } |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 5e4823c9c..e35b02f3f 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -290,12 +290,12 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
290 | 290 | ||
291 | const videojsOptions = { | 291 | const videojsOptions = { |
292 | controls: true, | 292 | controls: true, |
293 | autoplay: true, | 293 | autoplay: this.user.autoPlayVideo, |
294 | plugins: { | 294 | plugins: { |
295 | peertube: { | 295 | peertube: { |
296 | videoFiles: this.video.files, | 296 | videoFiles: this.video.files, |
297 | playerElement: this.playerElement, | 297 | playerElement: this.playerElement, |
298 | autoplay: true, | 298 | autoplay: this.user.autoPlayVideo, |
299 | peerTubeLink: false | 299 | peerTubeLink: false |
300 | } | 300 | } |
301 | } | 301 | } |
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index d6c0e67f9..995542604 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts | |||
@@ -134,6 +134,7 @@ async function createUser (req: express.Request) { | |||
134 | password: body.password, | 134 | password: body.password, |
135 | email: body.email, | 135 | email: body.email, |
136 | displayNSFW: false, | 136 | displayNSFW: false, |
137 | autoPlayVideo: true, | ||
137 | role: body.role, | 138 | role: body.role, |
138 | videoQuota: body.videoQuota | 139 | videoQuota: body.videoQuota |
139 | }) | 140 | }) |
@@ -162,6 +163,7 @@ async function registerUser (req: express.Request) { | |||
162 | password: body.password, | 163 | password: body.password, |
163 | email: body.email, | 164 | email: body.email, |
164 | displayNSFW: false, | 165 | displayNSFW: false, |
166 | autoPlayVideo: true, | ||
165 | role: UserRole.USER, | 167 | role: UserRole.USER, |
166 | videoQuota: CONFIG.USER.VIDEO_QUOTA | 168 | videoQuota: CONFIG.USER.VIDEO_QUOTA |
167 | }) | 169 | }) |
@@ -219,6 +221,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr | |||
219 | if (body.password !== undefined) user.password = body.password | 221 | if (body.password !== undefined) user.password = body.password |
220 | if (body.email !== undefined) user.email = body.email | 222 | if (body.email !== undefined) user.email = body.email |
221 | if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW | 223 | if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW |
224 | if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo | ||
222 | 225 | ||
223 | await user.save() | 226 | await user.save() |
224 | 227 | ||
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts index b5b5642d6..159c2a700 100644 --- a/server/helpers/custom-validators/users.ts +++ b/server/helpers/custom-validators/users.ts | |||
@@ -21,10 +21,18 @@ function isUserUsernameValid (value: string) { | |||
21 | return exists(value) && validator.matches(value, new RegExp(`^[a-z0-9._]{${min},${max}}$`)) | 21 | return exists(value) && validator.matches(value, new RegExp(`^[a-z0-9._]{${min},${max}}$`)) |
22 | } | 22 | } |
23 | 23 | ||
24 | function isUserDisplayNSFWValid (value: any) { | 24 | function isBoolean (value: any) { |
25 | return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) | 25 | return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) |
26 | } | 26 | } |
27 | 27 | ||
28 | function isUserDisplayNSFWValid (value: any) { | ||
29 | return isBoolean(value) | ||
30 | } | ||
31 | |||
32 | function isUserAutoPlayVideoValid (value: any) { | ||
33 | return isBoolean(value) | ||
34 | } | ||
35 | |||
28 | function isUserRoleValid (value: any) { | 36 | function isUserRoleValid (value: any) { |
29 | return exists(value) && validator.isInt('' + value) && UserRole[value] !== undefined | 37 | return exists(value) && validator.isInt('' + value) && UserRole[value] !== undefined |
30 | } | 38 | } |
@@ -36,5 +44,6 @@ export { | |||
36 | isUserRoleValid, | 44 | isUserRoleValid, |
37 | isUserVideoQuotaValid, | 45 | isUserVideoQuotaValid, |
38 | isUserUsernameValid, | 46 | isUserUsernameValid, |
39 | isUserDisplayNSFWValid | 47 | isUserDisplayNSFWValid, |
48 | isUserAutoPlayVideoValid | ||
40 | } | 49 | } |
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 341086bd6..ff322730f 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -8,7 +8,7 @@ import { isTestInstance, root } from '../helpers/core-utils' | |||
8 | 8 | ||
9 | // --------------------------------------------------------------------------- | 9 | // --------------------------------------------------------------------------- |
10 | 10 | ||
11 | const LAST_MIGRATION_VERSION = 125 | 11 | const LAST_MIGRATION_VERSION = 130 |
12 | 12 | ||
13 | // --------------------------------------------------------------------------- | 13 | // --------------------------------------------------------------------------- |
14 | 14 | ||
diff --git a/server/initializers/migrations/0130-user-autoplay-video.ts b/server/initializers/migrations/0130-user-autoplay-video.ts new file mode 100644 index 000000000..9f6878e39 --- /dev/null +++ b/server/initializers/migrations/0130-user-autoplay-video.ts | |||
@@ -0,0 +1,27 @@ | |||
1 | import * as Sequelize from 'sequelize' | ||
2 | import * as Promise from 'bluebird' | ||
3 | |||
4 | function up (utils: { | ||
5 | transaction: Sequelize.Transaction, | ||
6 | queryInterface: Sequelize.QueryInterface, | ||
7 | sequelize: Sequelize.Sequelize | ||
8 | }): Promise<void> { | ||
9 | const q = utils.queryInterface | ||
10 | |||
11 | const data = { | ||
12 | type: Sequelize.BOOLEAN, | ||
13 | allowNull: false, | ||
14 | defaultValue: true | ||
15 | } | ||
16 | |||
17 | return q.addColumn('user', 'autoPlayVideo', data) | ||
18 | } | ||
19 | |||
20 | function down (options) { | ||
21 | throw new Error('Not implemented.') | ||
22 | } | ||
23 | |||
24 | export { | ||
25 | up, | ||
26 | down | ||
27 | } | ||
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 920176d07..a6fdbe268 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts | |||
@@ -5,6 +5,7 @@ import { isSignupAllowed, logger } from '../../helpers' | |||
5 | import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc' | 5 | import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc' |
6 | import { | 6 | import { |
7 | isUserDisplayNSFWValid, | 7 | isUserDisplayNSFWValid, |
8 | isUserAutoPlayVideoValid, | ||
8 | isUserPasswordValid, | 9 | isUserPasswordValid, |
9 | isUserRoleValid, | 10 | isUserRoleValid, |
10 | isUserUsernameValid, | 11 | isUserUsernameValid, |
@@ -86,6 +87,7 @@ const usersUpdateMeValidator = [ | |||
86 | body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'), | 87 | body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'), |
87 | body('email').optional().isEmail().withMessage('Should have a valid email attribute'), | 88 | body('email').optional().isEmail().withMessage('Should have a valid email attribute'), |
88 | body('displayNSFW').optional().custom(isUserDisplayNSFWValid).withMessage('Should have a valid display Not Safe For Work attribute'), | 89 | body('displayNSFW').optional().custom(isUserDisplayNSFWValid).withMessage('Should have a valid display Not Safe For Work attribute'), |
90 | body('autoPlayVideo').optional().custom(isUserAutoPlayVideoValid).withMessage('Should have a valid automatically plays video attribute'), | ||
89 | 91 | ||
90 | (req: express.Request, res: express.Response, next: express.NextFunction) => { | 92 | (req: express.Request, res: express.Response, next: express.NextFunction) => { |
91 | // TODO: Add old password verification | 93 | // TODO: Add old password verification |
diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 26f04dcb5..70ed61e07 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts | |||
@@ -20,7 +20,7 @@ import { | |||
20 | } from '../../helpers' | 20 | } from '../../helpers' |
21 | import { | 21 | import { |
22 | isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid, | 22 | isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid, |
23 | isUserVideoQuotaValid | 23 | isUserVideoQuotaValid, isUserAutoPlayVideoValid |
24 | } from '../../helpers/custom-validators/users' | 24 | } from '../../helpers/custom-validators/users' |
25 | import { OAuthTokenModel } from '../oauth/oauth-token' | 25 | import { OAuthTokenModel } from '../oauth/oauth-token' |
26 | import { getSort, throwIfNotValid } from '../utils' | 26 | import { getSort, throwIfNotValid } from '../utils' |
@@ -83,6 +83,12 @@ export class UserModel extends Model<UserModel> { | |||
83 | displayNSFW: boolean | 83 | displayNSFW: boolean |
84 | 84 | ||
85 | @AllowNull(false) | 85 | @AllowNull(false) |
86 | @Default(true) | ||
87 | @Is('UserAutoPlayVideo', value => throwIfNotValid(value, isUserAutoPlayVideoValid, 'auto play video boolean')) | ||
88 | @Column | ||
89 | autoPlayVideo: boolean | ||
90 | |||
91 | @AllowNull(false) | ||
86 | @Is('UserRole', value => throwIfNotValid(value, isUserRoleValid, 'role')) | 92 | @Is('UserRole', value => throwIfNotValid(value, isUserRoleValid, 'role')) |
87 | @Column | 93 | @Column |
88 | role: number | 94 | role: number |
@@ -223,6 +229,7 @@ export class UserModel extends Model<UserModel> { | |||
223 | username: this.username, | 229 | username: this.username, |
224 | email: this.email, | 230 | email: this.email, |
225 | displayNSFW: this.displayNSFW, | 231 | displayNSFW: this.displayNSFW, |
232 | autoPlayVideo: this.autoPlayVideo, | ||
226 | role: this.role, | 233 | role: this.role, |
227 | roleLabel: USER_ROLE_LABELS[ this.role ], | 234 | roleLabel: USER_ROLE_LABELS[ this.role ], |
228 | videoQuota: this.videoQuota, | 235 | videoQuota: this.videoQuota, |
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 1e3533bf3..72488e5c4 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -350,6 +350,14 @@ describe('Test users API validators', function () { | |||
350 | await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields }) | 350 | await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields }) |
351 | }) | 351 | }) |
352 | 352 | ||
353 | it('Should fail with an invalid autoPlayVideo attribute', async function () { | ||
354 | const fields = { | ||
355 | autoPlayVideo: -1 | ||
356 | } | ||
357 | |||
358 | await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields }) | ||
359 | }) | ||
360 | |||
353 | it('Should fail with an non authenticated user', async function () { | 361 | it('Should fail with an non authenticated user', async function () { |
354 | const fields = { | 362 | const fields = { |
355 | password: 'my super password' | 363 | password: 'my super password' |
@@ -362,6 +370,7 @@ describe('Test users API validators', function () { | |||
362 | const fields = { | 370 | const fields = { |
363 | password: 'my super password', | 371 | password: 'my super password', |
364 | displayNSFW: true, | 372 | displayNSFW: true, |
373 | autoPlayVideo: false, | ||
365 | email: 'super_email@example.com' | 374 | email: 'super_email@example.com' |
366 | } | 375 | } |
367 | 376 | ||
diff --git a/server/tests/api/users.ts b/server/tests/api/users.ts index b3163b1e1..67e4cc8c6 100644 --- a/server/tests/api/users.ts +++ b/server/tests/api/users.ts | |||
@@ -415,6 +415,15 @@ describe('Test users', function () { | |||
415 | .a('number') | 415 | .a('number') |
416 | }) | 416 | }) |
417 | 417 | ||
418 | it('Should be able to change the autoPlayVideo attribute', async function () { | ||
419 | await updateMyUser(server.url, accessTokenUser, undefined, undefined, undefined, false) | ||
420 | |||
421 | const res = await getMyUserInformation(server.url, accessTokenUser) | ||
422 | const user = res.body | ||
423 | |||
424 | expect(user.autoPlayVideo).to.be.false | ||
425 | }) | ||
426 | |||
418 | it('Should be able to change the email display attribute', async function () { | 427 | it('Should be able to change the email display attribute', async function () { |
419 | await updateMyUser(server.url, accessTokenUser, undefined, undefined, 'updated@example.com') | 428 | await updateMyUser(server.url, accessTokenUser, undefined, undefined, 'updated@example.com') |
420 | 429 | ||
diff --git a/server/tests/utils/users.ts b/server/tests/utils/users.ts index ce04b9d96..a37d84ab4 100644 --- a/server/tests/utils/users.ts +++ b/server/tests/utils/users.ts | |||
@@ -111,12 +111,14 @@ function removeUser (url: string, userId: number, accessToken: string, expectedS | |||
111 | .expect(expectedStatus) | 111 | .expect(expectedStatus) |
112 | } | 112 | } |
113 | 113 | ||
114 | function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, email?: string) { | 114 | function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, |
115 | email?: string, autoPlayVideo?: boolean) { | ||
115 | const path = '/api/v1/users/me' | 116 | const path = '/api/v1/users/me' |
116 | 117 | ||
117 | const toSend = {} | 118 | const toSend = {} |
118 | if (newPassword !== undefined && newPassword !== null) toSend['password'] = newPassword | 119 | if (newPassword !== undefined && newPassword !== null) toSend['password'] = newPassword |
119 | if (displayNSFW !== undefined && displayNSFW !== null) toSend['displayNSFW'] = displayNSFW | 120 | if (displayNSFW !== undefined && displayNSFW !== null) toSend['displayNSFW'] = displayNSFW |
121 | if (autoPlayVideo !== undefined && autoPlayVideo !== null) toSend['autoPlayVideo'] = autoPlayVideo | ||
120 | if (email !== undefined && email !== null) toSend['email'] = email | 122 | if (email !== undefined && email !== null) toSend['email'] = email |
121 | 123 | ||
122 | return request(url) | 124 | return request(url) |
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts index 0ee41a79b..83417a7bd 100644 --- a/shared/models/users/user-update-me.model.ts +++ b/shared/models/users/user-update-me.model.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | export interface UserUpdateMe { | 1 | export interface UserUpdateMe { |
2 | displayNSFW?: boolean | 2 | displayNSFW?: boolean |
3 | autoPlayVideo?: boolean | ||
3 | email?: string | 4 | email?: string |
4 | password?: string | 5 | password?: string |
5 | } | 6 | } |
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index 4b17881e5..f2b43d371 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts | |||
@@ -7,6 +7,7 @@ export interface User { | |||
7 | username: string | 7 | username: string |
8 | email: string | 8 | email: string |
9 | displayNSFW: boolean | 9 | displayNSFW: boolean |
10 | autoPlayVideo: boolean | ||
10 | role: UserRole | 11 | role: UserRole |
11 | videoQuota: number | 12 | videoQuota: number |
12 | createdAt: Date | 13 | createdAt: Date |