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

Correctly send Flag/Dislike/View activities

Browse source
This commit is contained in:
Chocobozzz 2019-01-15 14:52:33 +01:00
parent 848f499def
commit 1e7eb25f6c
No known key found for this signature in database
GPG key ID: 583A612D890159BE
9 changed files with 138 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/controllers/api/videos/abuse.ts
View file

@ -3,7 +3,6 @@ import { UserRight, VideoAbuseCreate, VideoAbuseState } from '../../../../shared
import { logger } from '../../../helpers/logger'
import { getFormattedObjects } from '../../../helpers/utils'
import { sequelizeTypescript } from '../../../initializers'
import { sendVideoAbuse } from '../../../lib/activitypub/send'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
@ -23,6 +22,7 @@ import { VideoAbuseModel } from '../../../models/video/video-abuse'
import { auditLoggerFactory, VideoAbuseAuditView } from '../../../helpers/audit-logger'
import { UserModel } from '../../../models/account/user'
import { Notifier } from '../../../lib/notifier'
import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag'
const auditLogger = auditLoggerFactory('abuse')
const abuseVideoRouter = express.Router()

4
server/controllers/api/videos/index.ts
View file

@ -23,7 +23,6 @@ import {
fetchRemoteVideoDescription,
getVideoActivityPubUrl
} from '../../../lib/activitypub'
import { sendCreateView } from '../../../lib/activitypub/send'
import { JobQueue } from '../../../lib/job-queue'
import { Redis } from '../../../lib/redis'
import {
@ -59,6 +58,7 @@ import { resetSequelizeInstance } from '../../../helpers/database-utils'
import { move } from 'fs-extra'
import { watchingRouter } from './watching'
import { Notifier } from '../../../lib/notifier'
import { sendView } from '../../../lib/activitypub/send/send-view'
const auditLogger = auditLoggerFactory('videos')
const videosRouter = express.Router()
@ -422,7 +422,7 @@ async function viewVideo (req: express.Request, res: express.Response) {
])
const serverActor = await getServerActor()
await sendCreateView(serverActor, videoInstance, undefined)
await sendView(serverActor, videoInstance, undefined)
return res.status(204).end()
}