interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't import test tools in core

This commit is contained in:
Chocobozzz 2018-11-22 15:30:41 +01:00
parent 6cc98dfff3
commit a8f378e02c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/lib/activitypub/process/process-create.ts
View File

@ -12,7 +12,6 @@ import { getOrCreateVideoAndAccountAndChannel } from '../videos'
import { forwardVideoRelatedActivity } from '../send/utils' import { forwardVideoRelatedActivity } from '../send/utils'
import { Redis } from '../../redis' import { Redis } from '../../redis'
import { createOrUpdateCacheFile } from '../cache-file' import { createOrUpdateCacheFile } from '../cache-file'
import { immutableAssign } from '../../../tests/utils'
import { getVideoDislikeActivityPubUrl } from '../url' import { getVideoDislikeActivityPubUrl } from '../url'
import { VideoModel } from '../../../models/video/video' import { VideoModel } from '../../../models/video/video'
@ -71,7 +70,7 @@ async function processCreateDislike (byActor: ActorModel, activity: ActivityCrea
const [ , created ] = await AccountVideoRateModel.findOrCreate({ const [ , created ] = await AccountVideoRateModel.findOrCreate({
where: rate, where: rate,
defaults: immutableAssign(rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }), defaults: Object.assign({}, rate, { url: getVideoDislikeActivityPubUrl(byActor, video) }),
transaction: t transaction: t
}) })
if (created === true) await video.increment('dislikes', { transaction: t }) if (created === true) await video.increment('dislikes', { transaction: t })

5
server/lib/activitypub/process/process-like.ts
View File

@ -5,8 +5,7 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat
import { ActorModel } from '../../../models/activitypub/actor' import { ActorModel } from '../../../models/activitypub/actor'
import { forwardVideoRelatedActivity } from '../send/utils' import { forwardVideoRelatedActivity } from '../send/utils'
import { getOrCreateVideoAndAccountAndChannel } from '../videos' import { getOrCreateVideoAndAccountAndChannel } from '../videos'
import { immutableAssign } from '../../../tests/utils' import { getVideoLikeActivityPubUrl } from '../url'
import { getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url'
async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) { async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) {
return retryTransactionWrapper(processLikeVideo, byActor, activity) return retryTransactionWrapper(processLikeVideo, byActor, activity)
@ -36,7 +35,7 @@ async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) {
} }
const [ , created ] = await AccountVideoRateModel.findOrCreate({ const [ , created ] = await AccountVideoRateModel.findOrCreate({
where: rate, where: rate,
defaults: immutableAssign(rate, { url: getVideoLikeActivityPubUrl(byActor, video) }), defaults: Object.assign({}, rate, { url: getVideoLikeActivityPubUrl(byActor, video) }),
transaction: t transaction: t
}) })
if (created === true) await video.increment('likes', { transaction: t }) if (created === true) await video.increment('likes', { transaction: t })