diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:00:09 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:00:09 +0100 |
commit | 28f3d1b36a70426795240c9370e47b6c4ba847f8 (patch) | |
tree | fccd90a94deeab6e5ffc3b646280d5cba751c513 /server/controllers/api/videos/index.ts | |
parent | b426edd4854adc6e65844d8c54b8998e792b5778 (diff) | |
parent | 1e7eb25f6cb6893db8f99ff40ef0509aa2a16614 (diff) | |
download | PeerTube-28f3d1b36a70426795240c9370e47b6c4ba847f8.tar.gz PeerTube-28f3d1b36a70426795240c9370e47b6c4ba847f8.tar.zst PeerTube-28f3d1b36a70426795240c9370e47b6c4ba847f8.zip |
Merge branch 'feature/correctly-send-activities' into develop
Diffstat (limited to 'server/controllers/api/videos/index.ts')
-rw-r--r-- | server/controllers/api/videos/index.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index e04fc8186..3b1c2d255 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts | |||
@@ -23,7 +23,6 @@ import { | |||
23 | fetchRemoteVideoDescription, | 23 | fetchRemoteVideoDescription, |
24 | getVideoActivityPubUrl | 24 | getVideoActivityPubUrl |
25 | } from '../../../lib/activitypub' | 25 | } from '../../../lib/activitypub' |
26 | import { sendCreateView } from '../../../lib/activitypub/send' | ||
27 | import { JobQueue } from '../../../lib/job-queue' | 26 | import { JobQueue } from '../../../lib/job-queue' |
28 | import { Redis } from '../../../lib/redis' | 27 | import { Redis } from '../../../lib/redis' |
29 | import { | 28 | import { |
@@ -60,6 +59,7 @@ import { resetSequelizeInstance } from '../../../helpers/database-utils' | |||
60 | import { move } from 'fs-extra' | 59 | import { move } from 'fs-extra' |
61 | import { watchingRouter } from './watching' | 60 | import { watchingRouter } from './watching' |
62 | import { Notifier } from '../../../lib/notifier' | 61 | import { Notifier } from '../../../lib/notifier' |
62 | import { sendView } from '../../../lib/activitypub/send/send-view' | ||
63 | 63 | ||
64 | const auditLogger = auditLoggerFactory('videos') | 64 | const auditLogger = auditLoggerFactory('videos') |
65 | const videosRouter = express.Router() | 65 | const videosRouter = express.Router() |
@@ -425,7 +425,7 @@ async function viewVideo (req: express.Request, res: express.Response) { | |||
425 | ]) | 425 | ]) |
426 | 426 | ||
427 | const serverActor = await getServerActor() | 427 | const serverActor = await getServerActor() |
428 | await sendCreateView(serverActor, videoInstance, undefined) | 428 | await sendView(serverActor, videoInstance, undefined) |
429 | 429 | ||
430 | return res.status(204).end() | 430 | return res.status(204).end() |
431 | } | 431 | } |