1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00

Fix incorrect IDs in AP federation

This commit is contained in:
Chocobozzz 2020-11-20 11:21:08 +01:00
parent 3fba4b6bce
commit de94ac86a2
No known key found for this signature in database
GPG key ID: 583A612D890159BE
34 changed files with 281 additions and 236 deletions

View file

@ -6,11 +6,11 @@ import { ActorFollowModel } from '../server/models/activitypub/actor-follow'
import { VideoModel } from '../server/models/video/video'
import { ActorModel } from '../server/models/activitypub/actor'
import {
getAccountActivityPubUrl,
getVideoActivityPubUrl,
getVideoAnnounceActivityPubUrl,
getVideoChannelActivityPubUrl,
getVideoCommentActivityPubUrl
getLocalAccountActivityPubUrl,
getLocalVideoActivityPubUrl,
getLocalVideoAnnounceActivityPubUrl,
getLocalVideoChannelActivityPubUrl,
getLocalVideoCommentActivityPubUrl
} from '../server/lib/activitypub/url'
import { VideoShareModel } from '../server/models/video/video-share'
import { VideoCommentModel } from '../server/models/video/video-comment'
@ -62,8 +62,8 @@ async function run () {
console.log('Updating actor ' + actor.url)
const newUrl = actor.Account
? getAccountActivityPubUrl(actor.preferredUsername)
: getVideoChannelActivityPubUrl(actor.preferredUsername)
? getLocalAccountActivityPubUrl(actor.preferredUsername)
: getLocalVideoChannelActivityPubUrl(actor.preferredUsername)
actor.url = newUrl
actor.inboxUrl = newUrl + '/inbox'
@ -85,7 +85,7 @@ async function run () {
console.log('Updating video share ' + videoShare.url)
videoShare.url = getVideoAnnounceActivityPubUrl(videoShare.Actor, videoShare.Video)
videoShare.url = getLocalVideoAnnounceActivityPubUrl(videoShare.Actor, videoShare.Video)
await videoShare.save()
}
@ -110,7 +110,7 @@ async function run () {
console.log('Updating comment ' + comment.url)
comment.url = getVideoCommentActivityPubUrl(comment.Video, comment)
comment.url = getLocalVideoCommentActivityPubUrl(comment.Video, comment)
await comment.save()
}
@ -120,7 +120,7 @@ async function run () {
for (const video of videos) {
console.log('Updating video ' + video.uuid)
video.url = getVideoActivityPubUrl(video)
video.url = getLocalVideoActivityPubUrl(video)
await video.save()
for (const file of video.VideoFiles) {