X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fupdate-host.ts;h=b030b21c313694858a069f53dbfdb55b2cc82af7;hb=79cba9b79fa9772ff41e3a4de8b52b253cb976ee;hp=d9192d5540c9f832f8a09e257514e3c78cd6b0e8;hpb=d7a25329f9e607894d29ab342b9cb66638b56dc0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index d9192d554..b030b21c3 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,25 +1,25 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
 import { WEBSERVER } from '../server/initializers/constants'
 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
-} from '../server/lib/activitypub'
+  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'
-import { getServerActor } from '../server/helpers/utils'
 import { AccountModel } from '../server/models/account/account'
 import { VideoChannelModel } from '../server/models/video/video-channel'
 import { VideoStreamingPlaylistModel } from '../server/models/video/video-streaming-playlist'
-import { initDatabaseModels } from '../server/initializers'
+import { initDatabaseModels } from '../server/initializers/database'
 import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
-
-registerTSPaths()
+import { getServerActor } from '@server/models/application/application'
 
 run()
   .then(() => process.exit(0))
@@ -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) {
@@ -130,7 +130,7 @@ async function run () {
 
     for (const playlist of video.VideoStreamingPlaylists) {
       playlist.playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid)
-      playlist.segmentsSha256Url = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid)
+      playlist.segmentsSha256Url = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive)
 
       await playlist.save()
     }