forks/peertube
1
0
Fork 0
Code Releases Activity

Fix integrity issues with after destroy hook

Browse source
This commit is contained in:
Chocobozzz 2017-10-26 14:05:20 +02:00
parent 6cd44728bb
commit 911238e343
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/lib/friends.ts
View file

@ -86,7 +86,7 @@ function updateVideoToFriends (videoData: RemoteVideoUpdateData, transaction: Se
return createRequest(options)
}
function removeVideoToFriends (videoParams: RemoteVideoRemoveData, transaction: Sequelize.Transaction) {
function removeVideoToFriends (videoParams: RemoteVideoRemoveData, transaction?: Sequelize.Transaction) {
const options = {
type: ENDPOINT_ACTIONS.REMOVE_VIDEO,
endpoint: REQUEST_ENDPOINTS.VIDEOS,
@ -106,7 +106,7 @@ function addVideoAuthorToFriends (authorData: RemoteVideoAuthorCreateData, trans
return createRequest(options)
}
function removeVideoAuthorToFriends (authorData: RemoteVideoAuthorRemoveData, transaction: Sequelize.Transaction) {
function removeVideoAuthorToFriends (authorData: RemoteVideoAuthorRemoveData, transaction?: Sequelize.Transaction) {
const options = {
type: ENDPOINT_ACTIONS.REMOVE_AUTHOR,
endpoint: REQUEST_ENDPOINTS.VIDEOS,
@ -136,7 +136,7 @@ function updateVideoChannelToFriends (videoChannelData: RemoteVideoChannelUpdate
return createRequest(options)
}
function removeVideoChannelToFriends (videoChannelParams: RemoteVideoChannelRemoveData, transaction: Sequelize.Transaction) {
function removeVideoChannelToFriends (videoChannelParams: RemoteVideoChannelRemoveData, transaction?: Sequelize.Transaction) {
const options = {
type: ENDPOINT_ACTIONS.REMOVE_CHANNEL,
endpoint: REQUEST_ENDPOINTS.VIDEOS,

4
server/models/video/author.ts
View file

@ -107,13 +107,13 @@ function associate (models) {
})
}
function afterDestroy (author: AuthorInstance, options: { transaction: Sequelize.Transaction }) {
function afterDestroy (author: AuthorInstance) {
if (author.isOwned()) {
const removeVideoAuthorToFriendsParams = {
uuid: author.uuid
}
return removeVideoAuthorToFriends(removeVideoAuthorToFriendsParams, options.transaction)
return removeVideoAuthorToFriends(removeVideoAuthorToFriendsParams)
}
return undefined

4
server/models/video/video-channel.ts
View file

@ -178,13 +178,13 @@ function associate (models) {
})
}
function afterDestroy (videoChannel: VideoChannelInstance, options: { transaction: Sequelize.Transaction }) {
function afterDestroy (videoChannel: VideoChannelInstance) {
if (videoChannel.isOwned()) {
const removeVideoChannelToFriendsParams = {
uuid: videoChannel.uuid
}
return removeVideoChannelToFriends(removeVideoChannelToFriendsParams, options.transaction)
return removeVideoChannelToFriends(removeVideoChannelToFriendsParams)
}
return undefined

4
server/models/video/video.ts
View file

@ -317,7 +317,7 @@ function associate (models) {
})
}
function afterDestroy (video: VideoInstance, options: { transaction: Sequelize.Transaction }) {
function afterDestroy (video: VideoInstance) {
const tasks = []
tasks.push(
@ -331,7 +331,7 @@ function afterDestroy (video: VideoInstance, options: { transaction: Sequelize.T
tasks.push(
video.removePreview(),
removeVideoToFriends(removeVideoToFriendsParams, options.transaction)
removeVideoToFriends(removeVideoToFriendsParams)
)
// Remove physical files and torrents