diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-20 10:24:29 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:52 +0100 |
commit | 892211e8493b1f992fce7616cb1e48b7ff87a1dc (patch) | |
tree | 7bb218141a20c14d293d695ad4dad12687e537b2 /server/controllers | |
parent | 54141398354e6e7b94aa3065a705a1251390111c (diff) | |
download | PeerTube-892211e8493b1f992fce7616cb1e48b7ff87a1dc.tar.gz PeerTube-892211e8493b1f992fce7616cb1e48b7ff87a1dc.tar.zst PeerTube-892211e8493b1f992fce7616cb1e48b7ff87a1dc.zip |
Move activitypub functions from helpers/ to lib/
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/api/videos/index.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 8c9b0aa50..0d114dcd2 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts | |||
@@ -3,7 +3,6 @@ import * as multer from 'multer' | |||
3 | import { extname, join } from 'path' | 3 | import { extname, join } from 'path' |
4 | import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' | 4 | import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared' |
5 | import { | 5 | import { |
6 | fetchRemoteVideoDescription, | ||
7 | generateRandomString, | 6 | generateRandomString, |
8 | getFormattedObjects, | 7 | getFormattedObjects, |
9 | getVideoFileHeight, | 8 | getVideoFileHeight, |
@@ -12,7 +11,6 @@ import { | |||
12 | resetSequelizeInstance, | 11 | resetSequelizeInstance, |
13 | retryTransactionWrapper | 12 | retryTransactionWrapper |
14 | } from '../../../helpers' | 13 | } from '../../../helpers' |
15 | import { getVideoActivityPubUrl, shareVideoByServer } from '../../../helpers/activitypub' | ||
16 | import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' | 14 | import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers' |
17 | import { database as db } from '../../../initializers/database' | 15 | import { database as db } from '../../../initializers/database' |
18 | import { sendAddVideo } from '../../../lib/activitypub/send/send-add' | 16 | import { sendAddVideo } from '../../../lib/activitypub/send/send-add' |
@@ -37,6 +35,9 @@ import { abuseVideoRouter } from './abuse' | |||
37 | import { blacklistRouter } from './blacklist' | 35 | import { blacklistRouter } from './blacklist' |
38 | import { videoChannelRouter } from './channel' | 36 | import { videoChannelRouter } from './channel' |
39 | import { rateVideoRouter } from './rate' | 37 | import { rateVideoRouter } from './rate' |
38 | import { getVideoActivityPubUrl } from '../../../lib/activitypub/url' | ||
39 | import { shareVideoByServer } from '../../../lib/activitypub/share' | ||
40 | import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos' | ||
40 | 41 | ||
41 | const videosRouter = express.Router() | 42 | const videosRouter = express.Router() |
42 | 43 | ||