import { extname, join } from 'path'
import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared'
import {
- fetchRemoteVideoDescription,
generateRandomString,
getFormattedObjects,
getVideoFileHeight,
resetSequelizeInstance,
retryTransactionWrapper
} from '../../../helpers'
-import { getVideoActivityPubUrl, shareVideoByServer } from '../../../helpers/activitypub'
import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers'
import { database as db } from '../../../initializers/database'
import { sendAddVideo } from '../../../lib/activitypub/send/send-add'
import { blacklistRouter } from './blacklist'
import { videoChannelRouter } from './channel'
import { rateVideoRouter } from './rate'
+import { getVideoActivityPubUrl } from '../../../lib/activitypub/url'
+import { shareVideoByServer } from '../../../lib/activitypub/share'
+import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos'
const videosRouter = express.Router()
-import { join } from 'path'
-import * as request from 'request'
-import * as Sequelize from 'sequelize'
-import * as url from 'url'
-import { ActivityIconObject } from '../../shared/index'
import { Activity } from '../../shared/models/activitypub/activity'
-import { ActivityPubActor } from '../../shared/models/activitypub/activitypub-actor'
-import { VideoChannelObject } from '../../shared/models/activitypub/objects/video-channel-object'
import { ResultList } from '../../shared/models/result-list.model'
-import { database as db, REMOTE_SCHEME } from '../initializers'
-import { ACTIVITY_PUB, CONFIG, STATIC_PATHS } from '../initializers/constants'
-import { videoChannelActivityObjectToDBAttributes } from '../lib/activitypub/process/misc'
-import { sendVideoAnnounce } from '../lib/activitypub/send/send-announce'
-import { sendVideoChannelAnnounce } from '../lib/index'
-import { AccountFollowInstance } from '../models/account/account-follow-interface'
import { AccountInstance } from '../models/account/account-interface'
-import { VideoAbuseInstance } from '../models/video/video-abuse-interface'
-import { VideoChannelInstance } from '../models/video/video-channel-interface'
-import { VideoInstance } from '../models/video/video-interface'
-import { isRemoteAccountValid } from './custom-validators'
-import { logger } from './logger'
import { signObject } from './peertube-crypto'
-import { doRequest, doRequestAndSaveToFile } from './requests'
-import { getServerAccount } from './utils'
-import { isVideoChannelObjectValid } from './custom-validators/activitypub/video-channels'
-
-function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObject) {
- const thumbnailName = video.getThumbnailName()
- const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
-
- const options = {
- method: 'GET',
- uri: icon.url
- }
- return doRequestAndSaveToFile(options, thumbnailPath)
-}
-
-async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
- const serverAccount = await getServerAccount()
-
- await db.VideoChannelShare.create({
- accountId: serverAccount.id,
- videoChannelId: videoChannel.id
- }, { transaction: t })
-
- return sendVideoChannelAnnounce(serverAccount, videoChannel, t)
-}
-
-async function shareVideoByServer (video: VideoInstance, t: Sequelize.Transaction) {
- const serverAccount = await getServerAccount()
-
- await db.VideoShare.create({
- accountId: serverAccount.id,
- videoId: video.id
- }, { transaction: t })
-
- return sendVideoAnnounce(serverAccount, video, t)
-}
-
-function getVideoActivityPubUrl (video: VideoInstance) {
- return CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
-}
-
-function getVideoChannelActivityPubUrl (videoChannel: VideoChannelInstance) {
- return CONFIG.WEBSERVER.URL + '/video-channels/' + videoChannel.uuid
-}
-
-function getAccountActivityPubUrl (accountName: string) {
- return CONFIG.WEBSERVER.URL + '/account/' + accountName
-}
-
-function getVideoAbuseActivityPubUrl (videoAbuse: VideoAbuseInstance) {
- return CONFIG.WEBSERVER.URL + '/admin/video-abuses/' + videoAbuse.id
-}
-
-function getAccountFollowActivityPubUrl (accountFollow: AccountFollowInstance) {
- const me = accountFollow.AccountFollower
- const following = accountFollow.AccountFollowing
-
- return me.url + '#follows/' + following.id
-}
-
-function getAccountFollowAcceptActivityPubUrl (accountFollow: AccountFollowInstance) {
- const follower = accountFollow.AccountFollower
- const me = accountFollow.AccountFollowing
-
- return follower.url + '#accepts/follows/' + me.id
-}
-
-function getAnnounceActivityPubUrl (originalUrl: string, byAccount: AccountInstance) {
- return originalUrl + '#announces/' + byAccount.id
-}
-
-function getUpdateActivityPubUrl (originalUrl: string, updatedAt: string) {
- return originalUrl + '#updates/' + updatedAt
-}
-
-function getUndoActivityPubUrl (originalUrl: string) {
- return originalUrl + '/undo'
-}
-
-async function getOrCreateAccount (accountUrl: string) {
- let account = await db.Account.loadByUrl(accountUrl)
-
- // We don't have this account in our database, fetch it on remote
- if (!account) {
- const res = await fetchRemoteAccountAndCreateServer(accountUrl)
- if (res === undefined) throw new Error('Cannot fetch remote account.')
-
- // Save our new account in database
- account = await res.account.save()
- }
-
- return account
-}
-
-async function getOrCreateVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
- let videoChannel = await db.VideoChannel.loadByUrl(videoChannelUrl)
-
- // We don't have this account in our database, fetch it on remote
- if (!videoChannel) {
- videoChannel = await fetchRemoteVideoChannel(ownerAccount, videoChannelUrl)
- if (videoChannel === undefined) throw new Error('Cannot fetch remote video channel.')
-
- // Save our new video channel in database
- await videoChannel.save()
- }
-
- return videoChannel
-}
-
-async function fetchRemoteAccountAndCreateServer (accountUrl: string) {
- const options = {
- uri: accountUrl,
- method: 'GET',
- headers: {
- 'Accept': ACTIVITY_PUB.ACCEPT_HEADER
- }
- }
-
- logger.info('Fetching remote account %s.', accountUrl)
-
- let requestResult
- try {
- requestResult = await doRequest(options)
- } catch (err) {
- logger.warn('Cannot fetch remote account %s.', accountUrl, err)
- return undefined
- }
-
- const accountJSON: ActivityPubActor = JSON.parse(requestResult.body)
- if (isRemoteAccountValid(accountJSON) === false) {
- logger.debug('Remote account JSON is not valid.', { accountJSON })
- return undefined
- }
-
- const followersCount = await fetchAccountCount(accountJSON.followers)
- const followingCount = await fetchAccountCount(accountJSON.following)
-
- const account = db.Account.build({
- uuid: accountJSON.uuid,
- name: accountJSON.preferredUsername,
- url: accountJSON.url,
- publicKey: accountJSON.publicKey.publicKeyPem,
- privateKey: null,
- followersCount: followersCount,
- followingCount: followingCount,
- inboxUrl: accountJSON.inbox,
- outboxUrl: accountJSON.outbox,
- sharedInboxUrl: accountJSON.endpoints.sharedInbox,
- followersUrl: accountJSON.followers,
- followingUrl: accountJSON.following
- })
-
- const accountHost = url.parse(account.url).host
- const serverOptions = {
- where: {
- host: accountHost
- },
- defaults: {
- host: accountHost
- }
- }
- const [ server ] = await db.Server.findOrCreate(serverOptions)
- account.set('serverId', server.id)
-
- return { account, server }
-}
-
-async function fetchRemoteVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
- const options = {
- uri: videoChannelUrl,
- method: 'GET',
- headers: {
- 'Accept': ACTIVITY_PUB.ACCEPT_HEADER
- }
- }
-
- logger.info('Fetching remote video channel %s.', videoChannelUrl)
-
- let requestResult
- try {
- requestResult = await doRequest(options)
- } catch (err) {
- logger.warn('Cannot fetch remote video channel %s.', videoChannelUrl, err)
- return undefined
- }
-
- const videoChannelJSON: VideoChannelObject = JSON.parse(requestResult.body)
- if (isVideoChannelObjectValid(videoChannelJSON) === false) {
- logger.debug('Remote video channel JSON is not valid.', { videoChannelJSON })
- return undefined
- }
-
- const videoChannelAttributes = videoChannelActivityObjectToDBAttributes(videoChannelJSON, ownerAccount)
- const videoChannel = db.VideoChannel.build(videoChannelAttributes)
- videoChannel.Account = ownerAccount
-
- return videoChannel
-}
-
-function fetchRemoteVideoPreview (video: VideoInstance) {
- // FIXME: use url
- const host = video.VideoChannel.Account.Server.host
- const path = join(STATIC_PATHS.PREVIEWS, video.getPreviewName())
-
- return request.get(REMOTE_SCHEME.HTTP + '://' + host + path)
-}
-
-async function fetchRemoteVideoDescription (video: VideoInstance) {
- // FIXME: use url
- const host = video.VideoChannel.Account.Server.host
- const path = video.getDescriptionPath()
- const options = {
- uri: REMOTE_SCHEME.HTTP + '://' + host + path,
- json: true
- }
-
- const { body } = await doRequest(options)
- return body.description ? body.description : ''
-}
function activityPubContextify <T> (data: T) {
return Object.assign(data,{
// ---------------------------------------------------------------------------
export {
- fetchRemoteAccountAndCreateServer,
activityPubContextify,
activityPubCollectionPagination,
- generateThumbnailFromUrl,
- getOrCreateAccount,
- fetchRemoteVideoPreview,
- fetchRemoteVideoDescription,
- shareVideoChannelByServer,
- shareVideoByServer,
- getOrCreateVideoChannel,
- buildSignedActivity,
- getVideoActivityPubUrl,
- getVideoChannelActivityPubUrl,
- getAccountActivityPubUrl,
- getVideoAbuseActivityPubUrl,
- getAccountFollowActivityPubUrl,
- getAccountFollowAcceptActivityPubUrl,
- getAnnounceActivityPubUrl,
- getUpdateActivityPubUrl,
- getUndoActivityPubUrl
-}
-
-// ---------------------------------------------------------------------------
-
-async function fetchAccountCount (url: string) {
- const options = {
- uri: url,
- method: 'GET'
- }
-
- let requestResult
- try {
- requestResult = await doRequest(options)
- } catch (err) {
- logger.warn('Cannot fetch remote account count %s.', url, err)
- return undefined
- }
-
- return requestResult.totalItems ? requestResult.totalItems : 0
+ buildSignedActivity
}
import * as WebFinger from 'webfinger.js'
+import { WebFingerData } from '../../shared'
import { isTestInstance } from './core-utils'
import { isActivityPubUrlValid } from './custom-validators'
-import { WebFingerData } from '../../shared'
-import { fetchRemoteAccountAndCreateServer } from './activitypub'
+import { fetchRemoteAccountAndCreateServer } from '../lib/activitypub/account'
const webfinger = new WebFinger({
webfist_fallback: false,
--- /dev/null
+import * as url from 'url'
+import { ActivityPubActor } from '../../../shared/models/activitypub/activitypub-actor'
+import { isRemoteAccountValid } from '../../helpers/custom-validators/activitypub/account'
+import { logger } from '../../helpers/logger'
+import { doRequest } from '../../helpers/requests'
+import { ACTIVITY_PUB } from '../../initializers/constants'
+import { database as db } from '../../initializers/database'
+
+async function getOrCreateAccount (accountUrl: string) {
+ let account = await db.Account.loadByUrl(accountUrl)
+
+ // We don't have this account in our database, fetch it on remote
+ if (!account) {
+ const res = await fetchRemoteAccountAndCreateServer(accountUrl)
+ if (res === undefined) throw new Error('Cannot fetch remote account.')
+
+ // Save our new account in database
+ account = await res.account.save()
+ }
+
+ return account
+}
+
+async function fetchRemoteAccountAndCreateServer (accountUrl: string) {
+ const options = {
+ uri: accountUrl,
+ method: 'GET',
+ headers: {
+ 'Accept': ACTIVITY_PUB.ACCEPT_HEADER
+ }
+ }
+
+ logger.info('Fetching remote account %s.', accountUrl)
+
+ let requestResult
+ try {
+ requestResult = await doRequest(options)
+ } catch (err) {
+ logger.warn('Cannot fetch remote account %s.', accountUrl, err)
+ return undefined
+ }
+
+ const accountJSON: ActivityPubActor = JSON.parse(requestResult.body)
+ if (isRemoteAccountValid(accountJSON) === false) {
+ logger.debug('Remote account JSON is not valid.', { accountJSON })
+ return undefined
+ }
+
+ const followersCount = await fetchAccountCount(accountJSON.followers)
+ const followingCount = await fetchAccountCount(accountJSON.following)
+
+ const account = db.Account.build({
+ uuid: accountJSON.uuid,
+ name: accountJSON.preferredUsername,
+ url: accountJSON.url,
+ publicKey: accountJSON.publicKey.publicKeyPem,
+ privateKey: null,
+ followersCount: followersCount,
+ followingCount: followingCount,
+ inboxUrl: accountJSON.inbox,
+ outboxUrl: accountJSON.outbox,
+ sharedInboxUrl: accountJSON.endpoints.sharedInbox,
+ followersUrl: accountJSON.followers,
+ followingUrl: accountJSON.following
+ })
+
+ const accountHost = url.parse(account.url).host
+ const serverOptions = {
+ where: {
+ host: accountHost
+ },
+ defaults: {
+ host: accountHost
+ }
+ }
+ const [ server ] = await db.Server.findOrCreate(serverOptions)
+ account.set('serverId', server.id)
+
+ return { account, server }
+}
+
+export {
+ getOrCreateAccount,
+ fetchRemoteAccountAndCreateServer
+}
+
+// ---------------------------------------------------------------------------
+
+async function fetchAccountCount (url: string) {
+ const options = {
+ uri: url,
+ method: 'GET'
+ }
+
+ let requestResult
+ try {
+ requestResult = await doRequest(options)
+ } catch (err) {
+ logger.warn('Cannot fetch remote account count %s.', url, err)
+ return undefined
+ }
+
+ return requestResult.totalItems ? requestResult.totalItems : 0
+}
export * from './process'
export * from './send'
+export * from './account'
+export * from './share'
+export * from './video-channels'
+export * from './videos'
+export * from './url'
import * as Bluebird from 'bluebird'
import { VideoTorrentObject } from '../../../../shared'
import { ActivityAdd } from '../../../../shared/models/activitypub/activity'
-import { generateThumbnailFromUrl, getOrCreateAccount, logger, retryTransactionWrapper } from '../../../helpers'
-import { getOrCreateVideoChannel } from '../../../helpers/activitypub'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
import { database as db } from '../../../initializers'
import { AccountInstance } from '../../../models/account/account-interface'
import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { getOrCreateAccount } from '../account'
+import { getOrCreateVideoChannel } from '../video-channels'
+import { generateThumbnailFromUrl } from '../videos'
import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
async function processAddActivity (activity: ActivityAdd) {
return retryTransactionWrapper(addRemoteVideo, options)
}
-function addRemoteVideo (
- account: AccountInstance,
- activity: ActivityAdd,
- videoChannel: VideoChannelInstance,
- videoToCreateData: VideoTorrentObject
-) {
+function addRemoteVideo (account: AccountInstance,
+ activity: ActivityAdd,
+ videoChannel: VideoChannelInstance,
+ videoToCreateData: VideoTorrentObject) {
logger.debug('Adding remote video %s.', videoToCreateData.url)
return db.sequelize.transaction(async t => {
import { ActivityAnnounce } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount } from '../../../helpers/activitypub'
import { logger } from '../../../helpers/logger'
import { database as db } from '../../../initializers/index'
import { VideoInstance } from '../../../models/index'
import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
import { processAddActivity } from './process-add'
import { processCreateActivity } from './process-create'
+import { getOrCreateAccount } from '../account'
async function processAnnounceActivity (activity: ActivityAnnounce) {
const announcedActivity = activity.object
import { ActivityCreate, VideoChannelObject } from '../../../../shared'
import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects/video-abuse-object'
import { logger, retryTransactionWrapper } from '../../../helpers'
-import { getOrCreateAccount, getVideoChannelActivityPubUrl } from '../../../helpers/activitypub'
import { database as db } from '../../../initializers'
import { AccountInstance } from '../../../models/account/account-interface'
+import { getOrCreateAccount } from '../account'
+import { getVideoChannelActivityPubUrl } from '../url'
import { videoChannelActivityObjectToDBAttributes } from './misc'
async function processCreateActivity (activity: ActivityCreate) {
import { ActivityDelete } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount } from '../../../helpers/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { database as db } from '../../../initializers'
import { AccountInstance } from '../../../models/account/account-interface'
import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
import { VideoInstance } from '../../../models/video/video-interface'
+import { getOrCreateAccount } from '../account'
async function processDeleteActivity (activity: ActivityDelete) {
const account = await getOrCreateAccount(activity.actor)
import { ActivityFollow } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount, retryTransactionWrapper } from '../../../helpers'
+import { retryTransactionWrapper } from '../../../helpers'
import { database as db } from '../../../initializers'
import { AccountInstance } from '../../../models/account/account-interface'
import { logger } from '../../../helpers/logger'
import { sendAccept } from '../send/send-accept'
+import { getOrCreateAccount } from '../account'
async function processFollowActivity (activity: ActivityFollow) {
const activityObject = activity.object
import { VideoChannelObject, VideoTorrentObject } from '../../../../shared'
import { ActivityUpdate } from '../../../../shared/models/activitypub/activity'
-import { getOrCreateAccount } from '../../../helpers/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { resetSequelizeInstance } from '../../../helpers/utils'
import { VideoInstance } from '../../../models/video/video-interface'
import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
import Bluebird = require('bluebird')
+import { getOrCreateAccount } from '../account'
async function processUpdateActivity (activity: ActivityUpdate) {
const account = await getOrCreateAccount(activity.actor)
import { AccountInstance } from '../../../models'
import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
import { unicastTo } from './misc'
-import { getAccountFollowAcceptActivityPubUrl } from '../../../helpers/activitypub'
+import { getAccountFollowAcceptActivityPubUrl } from '../url'
async function sendAccept (accountFollow: AccountFollowInstance, t: Transaction) {
const follower = accountFollow.AccountFollower
import { broadcastToFollowers } from './misc'
import { addActivityData } from './send-add'
import { createActivityData } from './send-create'
-import { getAnnounceActivityPubUrl } from '../../../helpers/activitypub'
+import { getAnnounceActivityPubUrl } from '../url'
async function sendVideoAnnounce (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
const url = getAnnounceActivityPubUrl(video.url, byAccount)
import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
import { VideoAbuseInstance } from '../../../models/video/video-abuse-interface'
import { broadcastToFollowers, getAudience, unicastTo } from './misc'
-import { getVideoAbuseActivityPubUrl } from '../../../helpers/activitypub'
+import { getVideoAbuseActivityPubUrl } from '../url'
async function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
const byAccount = videoChannel.Account
import { ActivityFollow } from '../../../../shared/models/activitypub/activity'
import { AccountInstance } from '../../../models'
import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
+import { getAccountFollowActivityPubUrl } from '../url'
import { unicastTo } from './misc'
-import { getAccountFollowActivityPubUrl } from '../../../helpers/activitypub'
async function sendFollow (accountFollow: AccountFollowInstance, t: Transaction) {
const me = accountFollow.AccountFollower
import { AccountInstance } from '../../../models'
import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
import { unicastTo } from './misc'
-import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl } from '../../../helpers/activitypub'
import { followActivityData } from './send-follow'
+import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl } from '../url'
async function sendUndoFollow (accountFollow: AccountFollowInstance, t: Transaction) {
const me = accountFollow.AccountFollower
import { Transaction } from 'sequelize'
import { ActivityUpdate } from '../../../../shared/models/activitypub/activity'
-import { getUpdateActivityPubUrl } from '../../../helpers/activitypub'
import { database as db } from '../../../initializers'
import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
+import { getUpdateActivityPubUrl } from '../url'
import { broadcastToFollowers, getAudience } from './misc'
async function sendUpdateVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
--- /dev/null
+import { Transaction } from 'sequelize'
+import { getServerAccount } from '../../helpers/utils'
+import { database as db } from '../../initializers'
+import { VideoChannelInstance } from '../../models/index'
+import { VideoInstance } from '../../models/video/video-interface'
+import { sendVideoAnnounce, sendVideoChannelAnnounce } from './send/send-announce'
+
+async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t: Transaction) {
+ const serverAccount = await getServerAccount()
+
+ await db.VideoChannelShare.create({
+ accountId: serverAccount.id,
+ videoChannelId: videoChannel.id
+ }, { transaction: t })
+
+ return sendVideoChannelAnnounce(serverAccount, videoChannel, t)
+}
+
+async function shareVideoByServer (video: VideoInstance, t: Transaction) {
+ const serverAccount = await getServerAccount()
+
+ await db.VideoShare.create({
+ accountId: serverAccount.id,
+ videoId: video.id
+ }, { transaction: t })
+
+ return sendVideoAnnounce(serverAccount, video, t)
+}
+
+export {
+ shareVideoChannelByServer,
+ shareVideoByServer
+}
--- /dev/null
+import { CONFIG } from '../../initializers/constants'
+import { VideoInstance } from '../../models/video/video-interface'
+import { VideoChannelInstance } from '../../models/video/video-channel-interface'
+import { VideoAbuseInstance } from '../../models/video/video-abuse-interface'
+import { AccountFollowInstance } from '../../models/account/account-follow-interface'
+import { AccountInstance } from '../../models/account/account-interface'
+
+function getVideoActivityPubUrl (video: VideoInstance) {
+ return CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
+}
+
+function getVideoChannelActivityPubUrl (videoChannel: VideoChannelInstance) {
+ return CONFIG.WEBSERVER.URL + '/video-channels/' + videoChannel.uuid
+}
+
+function getAccountActivityPubUrl (accountName: string) {
+ return CONFIG.WEBSERVER.URL + '/account/' + accountName
+}
+
+function getVideoAbuseActivityPubUrl (videoAbuse: VideoAbuseInstance) {
+ return CONFIG.WEBSERVER.URL + '/admin/video-abuses/' + videoAbuse.id
+}
+
+function getAccountFollowActivityPubUrl (accountFollow: AccountFollowInstance) {
+ const me = accountFollow.AccountFollower
+ const following = accountFollow.AccountFollowing
+
+ return me.url + '#follows/' + following.id
+}
+
+function getAccountFollowAcceptActivityPubUrl (accountFollow: AccountFollowInstance) {
+ const follower = accountFollow.AccountFollower
+ const me = accountFollow.AccountFollowing
+
+ return follower.url + '#accepts/follows/' + me.id
+}
+
+function getAnnounceActivityPubUrl (originalUrl: string, byAccount: AccountInstance) {
+ return originalUrl + '#announces/' + byAccount.id
+}
+
+function getUpdateActivityPubUrl (originalUrl: string, updatedAt: string) {
+ return originalUrl + '#updates/' + updatedAt
+}
+
+function getUndoActivityPubUrl (originalUrl: string) {
+ return originalUrl + '/undo'
+}
+
+export {
+ getVideoActivityPubUrl,
+ getVideoChannelActivityPubUrl,
+ getAccountActivityPubUrl,
+ getVideoAbuseActivityPubUrl,
+ getAccountFollowActivityPubUrl,
+ getAccountFollowAcceptActivityPubUrl,
+ getAnnounceActivityPubUrl,
+ getUpdateActivityPubUrl,
+ getUndoActivityPubUrl
+}
--- /dev/null
+import { VideoChannelObject } from '../../../shared/models/activitypub/objects/video-channel-object'
+import { isVideoChannelObjectValid } from '../../helpers/custom-validators/activitypub/video-channels'
+import { logger } from '../../helpers/logger'
+import { doRequest } from '../../helpers/requests'
+import { database as db } from '../../initializers'
+import { ACTIVITY_PUB } from '../../initializers/constants'
+import { AccountInstance } from '../../models/account/account-interface'
+import { videoChannelActivityObjectToDBAttributes } from './process/misc'
+
+async function getOrCreateVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
+ let videoChannel = await db.VideoChannel.loadByUrl(videoChannelUrl)
+
+ // We don't have this account in our database, fetch it on remote
+ if (!videoChannel) {
+ videoChannel = await fetchRemoteVideoChannel(ownerAccount, videoChannelUrl)
+ if (videoChannel === undefined) throw new Error('Cannot fetch remote video channel.')
+
+ // Save our new video channel in database
+ await videoChannel.save()
+ }
+
+ return videoChannel
+}
+
+async function fetchRemoteVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
+ const options = {
+ uri: videoChannelUrl,
+ method: 'GET',
+ headers: {
+ 'Accept': ACTIVITY_PUB.ACCEPT_HEADER
+ }
+ }
+
+ logger.info('Fetching remote video channel %s.', videoChannelUrl)
+
+ let requestResult
+ try {
+ requestResult = await doRequest(options)
+ } catch (err) {
+ logger.warn('Cannot fetch remote video channel %s.', videoChannelUrl, err)
+ return undefined
+ }
+
+ const videoChannelJSON: VideoChannelObject = JSON.parse(requestResult.body)
+ if (isVideoChannelObjectValid(videoChannelJSON) === false) {
+ logger.debug('Remote video channel JSON is not valid.', { videoChannelJSON })
+ return undefined
+ }
+
+ const videoChannelAttributes = videoChannelActivityObjectToDBAttributes(videoChannelJSON, ownerAccount)
+ const videoChannel = db.VideoChannel.build(videoChannelAttributes)
+ videoChannel.Account = ownerAccount
+
+ return videoChannel
+}
+
+export {
+ getOrCreateVideoChannel,
+ fetchRemoteVideoChannel
+}
--- /dev/null
+import { join } from 'path'
+import * as request from 'request'
+import { ActivityIconObject } from '../../../shared/index'
+import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
+import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers/constants'
+import { VideoInstance } from '../../models/video/video-interface'
+
+function fetchRemoteVideoPreview (video: VideoInstance) {
+ // FIXME: use url
+ const host = video.VideoChannel.Account.Server.host
+ const path = join(STATIC_PATHS.PREVIEWS, video.getPreviewName())
+
+ return request.get(REMOTE_SCHEME.HTTP + '://' + host + path)
+}
+
+async function fetchRemoteVideoDescription (video: VideoInstance) {
+ // FIXME: use url
+ const host = video.VideoChannel.Account.Server.host
+ const path = video.getDescriptionPath()
+ const options = {
+ uri: REMOTE_SCHEME.HTTP + '://' + host + path,
+ json: true
+ }
+
+ const { body } = await doRequest(options)
+ return body.description ? body.description : ''
+}
+
+function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObject) {
+ const thumbnailName = video.getThumbnailName()
+ const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
+
+ const options = {
+ method: 'GET',
+ uri: icon.url
+ }
+ return doRequestAndSaveToFile(options, thumbnailPath)
+}
+
+export {
+ fetchRemoteVideoPreview,
+ fetchRemoteVideoDescription,
+ generateThumbnailFromUrl
+}
import { createWriteStream } from 'fs'
import { database as db, CONFIG, CACHE } from '../../initializers'
-import { logger, unlinkPromise, fetchRemoteVideoPreview } from '../../helpers'
+import { logger, unlinkPromise } from '../../helpers'
import { VideoInstance } from '../../models'
+import { fetchRemoteVideoPreview } from '../activitypub/videos'
class VideosPreviewCache {
import * as Bluebird from 'bluebird'
import { computeResolutionsToTranscode, logger } from '../../../helpers'
-
import { database as db } from '../../../initializers/database'
import { VideoInstance } from '../../../models'
-
+import { sendAddVideo } from '../../activitypub/send/send-add'
import { JobScheduler } from '../job-scheduler'
import { TranscodingJobPayload } from './transcoding-job-scheduler'
-import { shareVideoByServer } from '../../../helpers/activitypub'
-import { sendAddVideo } from '../../activitypub/send/send-add'
+import { shareVideoByServer } from '../../activitypub/share'
async function process (data: TranscodingJobPayload, jobId: number) {
const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID)
import { UserInstance } from '../models'
import { createVideoChannel } from './video-channel'
import { logger } from '../helpers/logger'
-import { getAccountActivityPubUrl } from '../helpers/activitypub'
+import { getAccountActivityPubUrl } from './activitypub/url'
async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
const { account, videoChannel } = await db.sequelize.transaction(async t => {
import { logger } from '../helpers'
import { database as db } from '../initializers'
import { AccountInstance } from '../models'
-import { getVideoChannelActivityPubUrl } from '../helpers/activitypub'
+import { getVideoChannelActivityPubUrl } from './activitypub/url'
async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
const videoChannelData = {
import { NextFunction, Request, RequestHandler, Response } from 'express'
import { ActivityPubSignature } from '../../shared'
import { isSignatureVerified, logger } from '../helpers'
-import { fetchRemoteAccountAndCreateServer } from '../helpers/activitypub'
import { database as db } from '../initializers'
import { ACTIVITY_PUB } from '../initializers/constants'
+import { fetchRemoteAccountAndCreateServer } from '../lib/activitypub/account'
async function checkSignature (req: Request, res: Response, next: NextFunction) {
const signatureObject: ActivityPubSignature = req.body.signature
projects / oweals / peertube.git / commitdiff