X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Furl.ts;h=5cdac71bf0248053c46ab78d4e4ca92716837bc8;hb=8cdb6b6276164bc7b1a465b7f3e4634c58decb8d;hp=6290af34ba91c5ecb399c07b6b521b05cefc6a98;hpb=5c5e587307a27e173333789b5b5167d35f468b01;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts
index 6290af34b..5cdac71bf 100644
--- a/server/lib/activitypub/url.ts
+++ b/server/lib/activitypub/url.ts
@@ -1,101 +1,106 @@
-import { WEBSERVER } from '../../initializers/constants'
+import { REMOTE_SCHEME, WEBSERVER } from '../../initializers/constants'
 import {
+  MAbuseFull,
+  MAbuseId,
   MActor,
-  MActorFollowActors,
+  MActorFollow,
   MActorId,
   MActorUrl,
   MCommentId,
-  MVideoAbuseId,
+  MLocalVideoViewer,
   MVideoId,
+  MVideoPlaylistElement,
   MVideoUrl,
-  MVideoUUID
-} from '../../typings/models'
-import { MVideoPlaylist, MVideoPlaylistUUID } from '../../typings/models/video/video-playlist'
-import { MVideoFileVideoUUID } from '../../typings/models/video/video-file'
-import { MStreamingPlaylist } from '../../typings/models/video/video-streaming-playlist'
-
-function getVideoActivityPubUrl (video: MVideoUUID) {
+  MVideoUUID,
+  MVideoWithHost
+} from '../../types/models'
+import { MVideoFileVideoUUID } from '../../types/models/video/video-file'
+import { MVideoPlaylist, MVideoPlaylistUUID } from '../../types/models/video/video-playlist'
+import { MStreamingPlaylist } from '../../types/models/video/video-streaming-playlist'
+
+function getLocalVideoActivityPubUrl (video: MVideoUUID) {
   return WEBSERVER.URL + '/videos/watch/' + video.uuid
 }
 
-function getVideoPlaylistActivityPubUrl (videoPlaylist: MVideoPlaylist) {
+function getLocalVideoPlaylistActivityPubUrl (videoPlaylist: MVideoPlaylist) {
   return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid
 }
 
-function getVideoPlaylistElementActivityPubUrl (videoPlaylist: MVideoPlaylistUUID, video: MVideoUUID) {
-  return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid + '/' + video.uuid
+function getLocalVideoPlaylistElementActivityPubUrl (videoPlaylist: MVideoPlaylistUUID, videoPlaylistElement: MVideoPlaylistElement) {
+  return WEBSERVER.URL + '/video-playlists/' + videoPlaylist.uuid + '/videos/' + videoPlaylistElement.id
 }
 
-function getVideoCacheFileActivityPubUrl (videoFile: MVideoFileVideoUUID) {
+function getLocalVideoCacheFileActivityPubUrl (videoFile: MVideoFileVideoUUID) {
   const suffixFPS = videoFile.fps && videoFile.fps !== -1 ? '-' + videoFile.fps : ''
 
   return `${WEBSERVER.URL}/redundancy/videos/${videoFile.Video.uuid}/${videoFile.resolution}${suffixFPS}`
 }
 
-function getVideoCacheStreamingPlaylistActivityPubUrl (video: MVideoUUID, playlist: MStreamingPlaylist) {
+function getLocalVideoCacheStreamingPlaylistActivityPubUrl (video: MVideoUUID, playlist: MStreamingPlaylist) {
   return `${WEBSERVER.URL}/redundancy/streaming-playlists/${playlist.getStringType()}/${video.uuid}`
 }
 
-function getVideoCommentActivityPubUrl (video: MVideoUUID, videoComment: MCommentId) {
+function getLocalVideoCommentActivityPubUrl (video: MVideoUUID, videoComment: MCommentId) {
   return WEBSERVER.URL + '/videos/watch/' + video.uuid + '/comments/' + videoComment.id
 }
 
-function getVideoChannelActivityPubUrl (videoChannelName: string) {
+function getLocalVideoChannelActivityPubUrl (videoChannelName: string) {
   return WEBSERVER.URL + '/video-channels/' + videoChannelName
 }
 
-function getAccountActivityPubUrl (accountName: string) {
+function getLocalAccountActivityPubUrl (accountName: string) {
   return WEBSERVER.URL + '/accounts/' + accountName
 }
 
-function getVideoAbuseActivityPubUrl (videoAbuse: MVideoAbuseId) {
-  return WEBSERVER.URL + '/admin/video-abuses/' + videoAbuse.id
+function getLocalAbuseActivityPubUrl (abuse: MAbuseId) {
+  return WEBSERVER.URL + '/admin/abuses/' + abuse.id
+}
+
+function getLocalVideoViewActivityPubUrl (byActor: MActorUrl, video: MVideoId, viewerIdentifier: string) {
+  return byActor.url + '/views/videos/' + video.id + '/' + viewerIdentifier
 }
 
-function getVideoViewActivityPubUrl (byActor: MActorUrl, video: MVideoId) {
-  return byActor.url + '/views/videos/' + video.id + '/' + new Date().toISOString()
+function getLocalVideoViewerActivityPubUrl (stats: MLocalVideoViewer) {
+  return WEBSERVER.URL + '/videos/local-viewer/' + stats.uuid
 }
 
-function getVideoLikeActivityPubUrl (byActor: MActorUrl, video: MVideoId) {
+function getVideoLikeActivityPubUrlByLocalActor (byActor: MActorUrl, video: MVideoId) {
   return byActor.url + '/likes/' + video.id
 }
 
-function getVideoDislikeActivityPubUrl (byActor: MActorUrl, video: MVideoId) {
+function getVideoDislikeActivityPubUrlByLocalActor (byActor: MActorUrl, video: MVideoId) {
   return byActor.url + '/dislikes/' + video.id
 }
 
-function getVideoSharesActivityPubUrl (video: MVideoUrl) {
+function getLocalVideoSharesActivityPubUrl (video: MVideoUrl) {
   return video.url + '/announces'
 }
 
-function getVideoCommentsActivityPubUrl (video: MVideoUrl) {
+function getLocalVideoCommentsActivityPubUrl (video: MVideoUrl) {
   return video.url + '/comments'
 }
 
-function getVideoLikesActivityPubUrl (video: MVideoUrl) {
+function getLocalVideoLikesActivityPubUrl (video: MVideoUrl) {
   return video.url + '/likes'
 }
 
-function getVideoDislikesActivityPubUrl (video: MVideoUrl) {
+function getLocalVideoDislikesActivityPubUrl (video: MVideoUrl) {
   return video.url + '/dislikes'
 }
 
-function getActorFollowActivityPubUrl (follower: MActor, following: MActorId) {
+function getLocalActorFollowActivityPubUrl (follower: MActor, following: MActorId) {
   return follower.url + '/follows/' + following.id
 }
 
-function getActorFollowAcceptActivityPubUrl (actorFollow: MActorFollowActors) {
-  const follower = actorFollow.ActorFollower
-  const me = actorFollow.ActorFollowing
-
-  return follower.url + '/accepts/follows/' + me.id
+function getLocalActorFollowAcceptActivityPubUrl (actorFollow: MActorFollow) {
+  return WEBSERVER.URL + '/accepts/follows/' + actorFollow.id
 }
 
-function getActorFollowRejectActivityPubUrl (follower: MActorUrl, following: MActorId) {
-  return follower.url + '/rejects/follows/' + following.id
+function getLocalActorFollowRejectActivityPubUrl () {
+  return WEBSERVER.URL + '/rejects/follows/' + new Date().toISOString()
 }
 
-function getVideoAnnounceActivityPubUrl (byActor: MActorId, video: MVideoUrl) {
+function getLocalVideoAnnounceActivityPubUrl (byActor: MActorId, video: MVideoUrl) {
   return video.url + '/announces/' + byActor.id
 }
 
@@ -111,28 +116,62 @@ function getUndoActivityPubUrl (originalUrl: string) {
   return originalUrl + '/undo'
 }
 
+// ---------------------------------------------------------------------------
+
+function getAbuseTargetUrl (abuse: MAbuseFull) {
+  return abuse.VideoAbuse?.Video?.url ||
+    abuse.VideoCommentAbuse?.VideoComment?.url ||
+    abuse.FlaggedAccount.Actor.url
+}
+
+// ---------------------------------------------------------------------------
+
+function buildRemoteVideoBaseUrl (video: MVideoWithHost, path: string, scheme?: string) {
+  if (!scheme) scheme = REMOTE_SCHEME.HTTP
+
+  const host = video.VideoChannel.Actor.Server.host
+
+  return scheme + '://' + host + path
+}
+
+// ---------------------------------------------------------------------------
+
+function checkUrlsSameHost (url1: string, url2: string) {
+  const idHost = new URL(url1).host
+  const actorHost = new URL(url2).host
+
+  return idHost && actorHost && idHost.toLowerCase() === actorHost.toLowerCase()
+}
+
+// ---------------------------------------------------------------------------
+
 export {
-  getVideoActivityPubUrl,
-  getVideoPlaylistElementActivityPubUrl,
-  getVideoPlaylistActivityPubUrl,
-  getVideoCacheStreamingPlaylistActivityPubUrl,
-  getVideoChannelActivityPubUrl,
-  getAccountActivityPubUrl,
-  getVideoAbuseActivityPubUrl,
-  getActorFollowActivityPubUrl,
-  getActorFollowAcceptActivityPubUrl,
-  getVideoAnnounceActivityPubUrl,
+  getLocalVideoActivityPubUrl,
+  getLocalVideoPlaylistActivityPubUrl,
+  getLocalVideoPlaylistElementActivityPubUrl,
+  getLocalVideoCacheFileActivityPubUrl,
+  getLocalVideoCacheStreamingPlaylistActivityPubUrl,
+  getLocalVideoCommentActivityPubUrl,
+  getLocalVideoChannelActivityPubUrl,
+  getLocalAccountActivityPubUrl,
+  getLocalAbuseActivityPubUrl,
+  getLocalActorFollowActivityPubUrl,
+  getLocalActorFollowAcceptActivityPubUrl,
+  getLocalVideoAnnounceActivityPubUrl,
   getUpdateActivityPubUrl,
   getUndoActivityPubUrl,
-  getVideoViewActivityPubUrl,
-  getVideoLikeActivityPubUrl,
-  getVideoDislikeActivityPubUrl,
-  getActorFollowRejectActivityPubUrl,
-  getVideoCommentActivityPubUrl,
+  getVideoLikeActivityPubUrlByLocalActor,
+  getLocalVideoViewActivityPubUrl,
+  getVideoDislikeActivityPubUrlByLocalActor,
+  getLocalActorFollowRejectActivityPubUrl,
   getDeleteActivityPubUrl,
-  getVideoSharesActivityPubUrl,
-  getVideoCommentsActivityPubUrl,
-  getVideoLikesActivityPubUrl,
-  getVideoDislikesActivityPubUrl,
-  getVideoCacheFileActivityPubUrl
+  getLocalVideoSharesActivityPubUrl,
+  getLocalVideoCommentsActivityPubUrl,
+  getLocalVideoLikesActivityPubUrl,
+  getLocalVideoDislikesActivityPubUrl,
+  getLocalVideoViewerActivityPubUrl,
+
+  getAbuseTargetUrl,
+  checkUrlsSameHost,
+  buildRemoteVideoBaseUrl
 }