aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/activitypub
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-21 15:00:58 +0100
committerChocobozzz <me@florianbigard.com>2018-03-21 15:00:58 +0100
commitbffbebbe6b33ce306e7ec1b6051f0e51521c0440 (patch)
tree70cc5b1eaba4520619b690b4755d19528689360a /server/lib/activitypub
parenta3cffab42d78560a7db8ad1df14680be5b55277f (diff)
downloadPeerTube-bffbebbe6b33ce306e7ec1b6051f0e51521c0440.tar.gz
PeerTube-bffbebbe6b33ce306e7ec1b6051f0e51521c0440.tar.zst
PeerTube-bffbebbe6b33ce306e7ec1b6051f0e51521c0440.zip
Fix issues with truncated description and utf characters
Diffstat (limited to 'server/lib/activitypub')
-rw-r--r--server/lib/activitypub/process/process.ts3
-rw-r--r--server/lib/activitypub/videos.ts2
2 files changed, 2 insertions, 3 deletions
diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts
index 7edf3bba0..094219489 100644
--- a/server/lib/activitypub/process/process.ts
+++ b/server/lib/activitypub/process/process.ts
@@ -40,8 +40,7 @@ async function processActivities (activities: Activity[], signatureActor?: Actor
40 try { 40 try {
41 await activityProcessor(activity, inboxActor) 41 await activityProcessor(activity, inboxActor)
42 } catch (err) { 42 } catch (err) {
43 logger.warn(err.stack) 43 logger.warn('Cannot process activity %s.', activity.type, { error: err.stack })
44 logger.warn('Cannot process activity %s.', activity.type, err)
45 } 44 }
46 } 45 }
47} 46}
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index e7b516129..907fe458d 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -187,7 +187,7 @@ async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentOb
187 } 187 }
188 188
189 videoObject = await fetchRemoteVideo(videoObject) 189 videoObject = await fetchRemoteVideo(videoObject)
190 if (!videoObject) throw new Error('Cannot fetch remote video') 190 if (!videoObject) throw new Error('Cannot fetch remote video (maybe invalid...)')
191 } 191 }
192 192
193 if (!actor) { 193 if (!actor) {