Warning : I was not able to run the tests on my machine. It uses a different approach to handle databse connexion and didn't find where to configure it...
- create a migration file to add a boolean column in user table
- add autoPlayVideo attribute everywhere it is needed (both on client and server side)
- add tests
- add a way to configure this attribute in account-settings
- use the attribute in video-watch component to actually autoplay or not the video
<div *ngIf="formErrors['displayNSFW']" class="alert alert-danger">
{{ formErrors['displayNSFW'] }}
</div>
+ <br/>
+ <input
+ type="checkbox" id="autoPlayVideo"
+ formControlName="autoPlayVideo"
+ >
+ <label for="autoPlayVideo">Automatically plays video</label>
<input type="submit" value="Save" [disabled]="!form.valid">
</form>
buildForm () {
this.form = this.formBuilder.group({
- displayNSFW: [ this.user.displayNSFW ]
+ displayNSFW: [ this.user.displayNSFW ],
+ autoPlayVideo: [ this.user.autoPlayVideo ]
})
this.form.valueChanges.subscribe(data => this.onValueChanged(data))
updateDetails () {
const displayNSFW = this.form.value['displayNSFW']
+ const autoPlayVideo = this.form.value['autoPlayVideo']
const details: UserUpdateMe = {
- displayNSFW
+ displayNSFW,
+ autoPlayVideo
}
this.error = null
<div class="account-title">Account settings</div>
<my-account-change-password></my-account-change-password>
-<div class="account-title">Filtering</div>
+<div class="account-title">Videos</div>
<my-account-details [user]="user"></my-account-details>
ROLE: 'role',
EMAIL: 'email',
USERNAME: 'username',
- DISPLAY_NSFW: 'display_nsfw'
+ DISPLAY_NSFW: 'display_nsfw',
+ AUTO_PLAY_VIDEO: 'auto_play_video'
}
tokens: Tokens
username: localStorage.getItem(this.KEYS.USERNAME),
email: localStorage.getItem(this.KEYS.EMAIL),
role: parseInt(localStorage.getItem(this.KEYS.ROLE), 10) as UserRole,
- displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true'
+ displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true',
+ autoPlayVideo: localStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true'
},
Tokens.load()
)
localStorage.removeItem(this.KEYS.ID)
localStorage.removeItem(this.KEYS.ROLE)
localStorage.removeItem(this.KEYS.DISPLAY_NSFW)
+ localStorage.removeItem(this.KEYS.AUTO_PLAY_VIDEO)
localStorage.removeItem(this.KEYS.EMAIL)
Tokens.flush()
}
localStorage.setItem(AuthUser.KEYS.EMAIL, this.email)
localStorage.setItem(AuthUser.KEYS.ROLE, this.role.toString())
localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW))
+ localStorage.setItem(AuthUser.KEYS.AUTO_PLAY_VIDEO, JSON.stringify(this.autoPlayVideo))
this.tokens.save()
}
}
id: number
role: UserRole
displayNSFW: boolean
+ autoPlayVideo: boolean
email: string
videoQuota: number
account: Account
.subscribe(
res => {
this.user.displayNSFW = res.displayNSFW
+ this.user.autoPlayVideo = res.autoPlayVideo
this.user.role = res.role
this.user.videoChannels = res.videoChannels
this.user.account = res.account
id: res.id,
role: res.role,
displayNSFW: res.displayNSFW,
+ autoPlayVideo: res.autoPlayVideo,
email: res.email,
videoQuota: res.videoQuota,
account: res.account,
role: obj.role,
email: obj.email,
displayNSFW: obj.displayNSFW,
+ autoPlayVideo: obj.autoPlayVideo,
videoQuota: obj.videoQuota,
videoChannels: obj.videoChannels,
account: obj.account
role: UserRole,
videoQuota?: number,
displayNSFW?: boolean,
+ autoPlayVideo?: boolean,
createdAt?: Date,
account?: Account,
videoChannels?: VideoChannel[]
email: string
role: UserRole
displayNSFW: boolean
+ autoPlayVideo: boolean
videoQuota: number
account: Account
videoChannels: VideoChannel[]
this.displayNSFW = hash.displayNSFW
}
+ if (hash.autoPlayVideo !== undefined) {
+ this.autoPlayVideo = hash.autoPlayVideo
+ }
+
if (hash.createdAt !== undefined) {
this.createdAt = hash.createdAt
}
const videojsOptions = {
controls: true,
- autoplay: true,
+ autoplay: this.user.autoPlayVideo,
plugins: {
peertube: {
videoFiles: this.video.files,
playerElement: this.playerElement,
- autoplay: true,
+ autoplay: this.user.autoPlayVideo,
peerTubeLink: false
}
}
password: body.password,
email: body.email,
displayNSFW: false,
+ autoPlayVideo: true,
role: body.role,
videoQuota: body.videoQuota
})
password: body.password,
email: body.email,
displayNSFW: false,
+ autoPlayVideo: true,
role: UserRole.USER,
videoQuota: CONFIG.USER.VIDEO_QUOTA
})
if (body.password !== undefined) user.password = body.password
if (body.email !== undefined) user.email = body.email
if (body.displayNSFW !== undefined) user.displayNSFW = body.displayNSFW
+ if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo
await user.save()
return exists(value) && validator.matches(value, new RegExp(`^[a-z0-9._]{${min},${max}}$`))
}
-function isUserDisplayNSFWValid (value: any) {
+function isBoolean (value: any) {
return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
}
+function isUserDisplayNSFWValid (value: any) {
+ return isBoolean(value)
+}
+
+function isUserAutoPlayVideoValid (value: any) {
+ return isBoolean(value)
+}
+
function isUserRoleValid (value: any) {
return exists(value) && validator.isInt('' + value) && UserRole[value] !== undefined
}
isUserRoleValid,
isUserVideoQuotaValid,
isUserUsernameValid,
- isUserDisplayNSFWValid
+ isUserDisplayNSFWValid,
+ isUserAutoPlayVideoValid
}
// ---------------------------------------------------------------------------
-const LAST_MIGRATION_VERSION = 125
+const LAST_MIGRATION_VERSION = 130
// ---------------------------------------------------------------------------
--- /dev/null
+import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
+
+function up (utils: {
+ transaction: Sequelize.Transaction,
+ queryInterface: Sequelize.QueryInterface,
+ sequelize: Sequelize.Sequelize
+}): Promise<void> {
+ const q = utils.queryInterface
+
+ const data = {
+ type: Sequelize.BOOLEAN,
+ allowNull: false,
+ defaultValue: true
+ }
+
+ return q.addColumn('user', 'autoPlayVideo', data)
+}
+
+function down (options) {
+ throw new Error('Not implemented.')
+}
+
+export {
+ up,
+ down
+}
import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
import {
isUserDisplayNSFWValid,
+ isUserAutoPlayVideoValid,
isUserPasswordValid,
isUserRoleValid,
isUserUsernameValid,
body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'),
body('email').optional().isEmail().withMessage('Should have a valid email attribute'),
body('displayNSFW').optional().custom(isUserDisplayNSFWValid).withMessage('Should have a valid display Not Safe For Work attribute'),
+ body('autoPlayVideo').optional().custom(isUserAutoPlayVideoValid).withMessage('Should have a valid automatically plays video attribute'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
// TODO: Add old password verification
} from '../../helpers'
import {
isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid,
- isUserVideoQuotaValid
+ isUserVideoQuotaValid, isUserAutoPlayVideoValid
} from '../../helpers/custom-validators/users'
import { OAuthTokenModel } from '../oauth/oauth-token'
import { getSort, throwIfNotValid } from '../utils'
@Column
displayNSFW: boolean
+ @AllowNull(false)
+ @Default(true)
+ @Is('UserAutoPlayVideo', value => throwIfNotValid(value, isUserAutoPlayVideoValid, 'auto play video boolean'))
+ @Column
+ autoPlayVideo: boolean
+
@AllowNull(false)
@Is('UserRole', value => throwIfNotValid(value, isUserRoleValid, 'role'))
@Column
username: this.username,
email: this.email,
displayNSFW: this.displayNSFW,
+ autoPlayVideo: this.autoPlayVideo,
role: this.role,
roleLabel: USER_ROLE_LABELS[ this.role ],
videoQuota: this.videoQuota,
await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields })
})
+ it('Should fail with an invalid autoPlayVideo attribute', async function () {
+ const fields = {
+ autoPlayVideo: -1
+ }
+
+ await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields })
+ })
+
it('Should fail with an non authenticated user', async function () {
const fields = {
password: 'my super password'
const fields = {
password: 'my super password',
displayNSFW: true,
+ autoPlayVideo: false,
email: 'super_email@example.com'
}
.a('number')
})
+ it('Should be able to change the autoPlayVideo attribute', async function () {
+ await updateMyUser(server.url, accessTokenUser, undefined, undefined, undefined, false)
+
+ const res = await getMyUserInformation(server.url, accessTokenUser)
+ const user = res.body
+
+ expect(user.autoPlayVideo).to.be.false
+ })
+
it('Should be able to change the email display attribute', async function () {
await updateMyUser(server.url, accessTokenUser, undefined, undefined, 'updated@example.com')
.expect(expectedStatus)
}
-function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, email?: string) {
+function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean,
+ email?: string, autoPlayVideo?: boolean) {
const path = '/api/v1/users/me'
const toSend = {}
if (newPassword !== undefined && newPassword !== null) toSend['password'] = newPassword
if (displayNSFW !== undefined && displayNSFW !== null) toSend['displayNSFW'] = displayNSFW
+ if (autoPlayVideo !== undefined && autoPlayVideo !== null) toSend['autoPlayVideo'] = autoPlayVideo
if (email !== undefined && email !== null) toSend['email'] = email
return request(url)
export interface UserUpdateMe {
displayNSFW?: boolean
+ autoPlayVideo?: boolean
email?: string
password?: string
}
username: string
email: string
displayNSFW: boolean
+ autoPlayVideo: boolean
role: UserRole
videoQuota: number
createdAt: Date
projects / oweals / peertube.git / commitdiff