yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Add federation to ownership change

Browse source
This commit is contained in:
Chocobozzz 2018-09-04 10:22:10 +02:00
parent 0b74c74abe
commit 5cf84858d4
No known key found for this signature in database
GPG key ID: 583A612D890159BE
13 changed files with 139 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/controllers/api/users/index.ts
View file

@ -229,7 +229,7 @@ function getUser (req: express.Request, res: express.Response, next: express.Nex
}
async function autocompleteUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
const resultList = await UserModel.autocomplete(req.query.search as string)
const resultList = await UserModel.autoComplete(req.query.search as string)
return res.json(resultList)
}

35
server/controllers/api/videos/ownership.ts
View file

@ -14,9 +14,11 @@ import {
import { AccountModel } from '../../../models/account/account'
import { VideoModel } from '../../../models/video/video'
import { VideoChangeOwnershipModel } from '../../../models/video/video-change-ownership'
import { VideoChangeOwnershipStatus } from '../../../../shared/models/videos'
import { VideoChangeOwnershipStatus, VideoPrivacy, VideoState } from '../../../../shared/models/videos'
import { VideoChannelModel } from '../../../models/video/video-channel'
import { getFormattedObjects } from '../../../helpers/utils'
import { changeVideoChannelShare } from '../../../lib/activitypub'
import { sendUpdateVideo } from '../../../lib/activitypub/send'
const ownershipVideoRouter = express.Router()
@ -59,8 +61,8 @@ async function giveVideoOwnership (req: express.Request, res: express.Response)
const initiatorAccount = res.locals.oauth.token.User.Account as AccountModel
const nextOwner = res.locals.nextOwner as AccountModel
await sequelizeTypescript.transaction(async t => {
await VideoChangeOwnershipModel.findOrCreate({
await sequelizeTypescript.transaction(t => {
return VideoChangeOwnershipModel.findOrCreate({
where: {
initiatorAccountId: initiatorAccount.id,
nextOwnerAccountId: nextOwner.id,
@ -72,11 +74,14 @@ async function giveVideoOwnership (req: express.Request, res: express.Response)
nextOwnerAccountId: nextOwner.id,
videoId: videoInstance.id,
status: VideoChangeOwnershipStatus.WAITING
}
},
transaction: t
})
logger.info('Ownership change for video %s created.', videoInstance.name)
return res.type('json').status(204).end()
})
logger.info('Ownership change for video %s created.', videoInstance.name)
return res.type('json').status(204).end()
}
async function listVideoOwnership (req: express.Request, res: express.Response) {
@ -97,11 +102,19 @@ async function acceptOwnership (req: express.Request, res: express.Response) {
const targetVideo = videoChangeOwnership.Video
const channel = res.locals.videoChannel as VideoChannelModel
targetVideo.set('channelId', channel.id)
const oldVideoChannel = await VideoChannelModel.loadByIdAndPopulateAccount(targetVideo.channelId)
targetVideo.set('channelId', channel.id)
const targetVideoUpdated = await targetVideo.save({ transaction: t })
targetVideoUpdated.VideoChannel = channel
if (targetVideoUpdated.privacy !== VideoPrivacy.PRIVATE && targetVideoUpdated.state === VideoState.PUBLISHED) {
await changeVideoChannelShare(targetVideoUpdated, oldVideoChannel, t)
await sendUpdateVideo(targetVideoUpdated, t, oldVideoChannel.Account.Actor)
}
await targetVideo.save()
videoChangeOwnership.set('status', VideoChangeOwnershipStatus.ACCEPTED)
await videoChangeOwnership.save()
await videoChangeOwnership.save({ transaction: t })
return res.sendStatus(204)
})
@ -110,8 +123,10 @@ async function acceptOwnership (req: express.Request, res: express.Response) {
async function refuseOwnership (req: express.Request, res: express.Response) {
return sequelizeTypescript.transaction(async t => {
const videoChangeOwnership = res.locals.videoChangeOwnership as VideoChangeOwnershipModel
videoChangeOwnership.set('status', VideoChangeOwnershipStatus.REFUSED)
await videoChangeOwnership.save()
await videoChangeOwnership.save({ transaction: t })
return res.sendStatus(204)
})
}