More robust federation

In particular when fetching pleroma outbox
pull/1868/head
Chocobozzz 2019-05-31 15:14:40 +02:00
parent 57cfff7885
commit ee79b60e4e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
8 changed files with 48 additions and 15 deletions

View File

@ -10,4 +10,8 @@
@include miniature-rows;
padding-top: 0 !important;
.section-title {
align-items: center;
}
}

View File

@ -1,5 +1,4 @@
import { UserRight, VideoConstant, VideoDetails as VideoDetailsServerModel, VideoFile, VideoState } from '../../../../../shared'
import { AuthUser } from '../../core'
import { VideoConstant, VideoDetails as VideoDetailsServerModel, VideoFile, VideoState } from '../../../../../shared'
import { Video } from '../../shared/video/video.model'
import { Account } from '@app/shared/account/account.model'
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'

View File

@ -52,7 +52,6 @@ export class Video implements VideoServerModel {
account: {
id: number
uuid: string
name: string
displayName: string
url: string
@ -62,7 +61,6 @@ export class Video implements VideoServerModel {
channel: {
id: number
uuid: string
name: string
displayName: string
url: string

View File

@ -36,7 +36,8 @@ function normalizeComment (comment: any) {
if (!comment) return
if (typeof comment.url !== 'string') {
comment.url = comment.url.href || comment.url.url
if (typeof comment.url === 'object') comment.url = comment.url.href || comment.url.url
else comment.url = comment.id
}
return

View File

@ -28,13 +28,22 @@ async function crawlCollectionPage <T> (uri: string, handler: HandlerFunction<T>
let i = 0
let nextLink = firstBody.first
while (nextLink && i < limit) {
// Don't crawl ourselves
const remoteHost = parse(nextLink).host
if (remoteHost === WEBSERVER.HOST) continue
let body: any
options.uri = nextLink
if (typeof nextLink === 'string') {
// Don't crawl ourselves
const remoteHost = parse(nextLink).host
if (remoteHost === WEBSERVER.HOST) continue
options.uri = nextLink
const res = await doRequest<ActivityPubOrderedCollection<T>>(options)
body = res.body
} else {
// nextLink is already the object we want
body = nextLink
}
const { body } = await doRequest<ActivityPubOrderedCollection<T>>(options)
nextLink = body.next
i++

View File

@ -5,8 +5,9 @@ import { ActorModel } from '../../../models/activitypub/actor'
import { VideoShareModel } from '../../../models/video/video-share'
import { forwardVideoRelatedActivity } from '../send/utils'
import { getOrCreateVideoAndAccountAndChannel } from '../videos'
import { VideoPrivacy } from '../../../../shared/models/videos'
import { Notifier } from '../../notifier'
import { VideoModel } from '../../../models/video/video'
import { logger } from '../../../helpers/logger'
async function processAnnounceActivity (activity: ActivityAnnounce, actorAnnouncer: ActorModel) {
return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity)
@ -23,7 +24,17 @@ export {
async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
const { video, created: videoCreated } = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
let video: VideoModel
let videoCreated: boolean
try {
const result = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
video = result.video
videoCreated = result.created
} catch (err) {
logger.debug('Cannot process share of %s. Maybe this is not a video object, so just skipping.', objectUri, { err })
return
}
await sequelizeTypescript.transaction(async t => {
// Add share entry

View File

@ -14,6 +14,7 @@ import { processDislikeActivity } from './process-dislike'
import { processFlagActivity } from './process-flag'
import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
import { createOrUpdateVideoPlaylist } from '../playlist'
import { VideoModel } from '../../../models/video/video'
async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) {
const activityObject = activity.object
@ -91,7 +92,17 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: Act
if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url)
const { video } = await resolveThread(commentObject.inReplyTo)
let video: VideoModel
try {
const resolveThreadResult = await resolveThread(commentObject.inReplyTo)
video = resolveThreadResult.video
} catch (err) {
logger.debug(
'Cannot process video comment because we could not resolve thread %s. Maybe it was not a video thread, so skip it.',
commentObject.inReplyTo,
{ err }
)
}
const { comment, created } = await addVideoComment(video, commentObject.id)

View File

@ -80,7 +80,8 @@ async function addVideoComment (videoInstance: VideoModel, commentUrl: string) {
return { comment, created }
}
async function resolveThread (url: string, comments: VideoCommentModel[] = []) {
type ResolveThreadResult = Promise<{ video: VideoModel, parents: VideoCommentModel[] }>
async function resolveThread (url: string, comments: VideoCommentModel[] = []): ResolveThreadResult {
// Already have this comment?
const commentFromDatabase = await VideoCommentModel.loadByUrlAndPopulateReplyAndVideo(url)
if (commentFromDatabase) {
@ -161,7 +162,6 @@ async function resolveThread (url: string, comments: VideoCommentModel[] = []) {
return resolveThread(body.inReplyTo, comments.concat([ comment ]))
}
}
export {