IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix ownership changes

Browse Source
This commit is contained in:
Chocobozzz
2019-04-24 09:44:36 +02:00
parent dc85273764
commit b876eaf11a
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/controllers/api/videos/ownership.ts
View File

@@ -17,6 +17,7 @@ import { VideoChannelModel } from '../../../models/video/video-channel'
import { getFormattedObjects } from '../../../helpers/utils'
import { changeVideoChannelShare } from '../../../lib/activitypub'
import { sendUpdateVideo } from '../../../lib/activitypub/send'
import { VideoModel } from '../../../models/video/video'
const ownershipVideoRouter = express.Router()
@@ -97,12 +98,15 @@ async function listVideoOwnership (req: express.Request, res: express.Response)
async function acceptOwnership (req: express.Request, res: express.Response) {
return sequelizeTypescript.transaction(async t => {
const videoChangeOwnership = res.locals.videoChangeOwnership
const targetVideo = videoChangeOwnership.Video
const channel = res.locals.videoChannel
// We need more attributes for federation
const targetVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoChangeOwnership.Video.id)
const oldVideoChannel = await VideoChannelModel.loadByIdAndPopulateAccount(targetVideo.channelId)
targetVideo.set('channelId', channel.id)
targetVideo.channelId = channel.id
const targetVideoUpdated = await targetVideo.save({ transaction: t })
targetVideoUpdated.VideoChannel = channel
@@ -111,7 +115,7 @@ async function acceptOwnership (req: express.Request, res: express.Response) {
await sendUpdateVideo(targetVideoUpdated, t, oldVideoChannel.Account.Actor)
}
videoChangeOwnership.set('status', VideoChangeOwnershipStatus.ACCEPTED)
videoChangeOwnership.status = VideoChangeOwnershipStatus.ACCEPTED
await videoChangeOwnership.save({ transaction: t })
return res.sendStatus(204)
@@ -122,7 +126,7 @@ async function refuseOwnership (req: express.Request, res: express.Response) {
return sequelizeTypescript.transaction(async t => {
const videoChangeOwnership = res.locals.videoChangeOwnership
videoChangeOwnership.set('status', VideoChangeOwnershipStatus.REFUSED)
videoChangeOwnership.status = VideoChangeOwnershipStatus.REFUSED
await videoChangeOwnership.save({ transaction: t })
return res.sendStatus(204)