From 0e9c48c2edbb3871b0ca3ccd6718f2c99f9760b6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 8 Apr 2019 11:52:29 +0200
Subject: Add ability to remove an instance follower in API
---
server/lib/activitypub/send/index.ts | 2 ++
server/lib/activitypub/send/send-reject.ts | 44 ++++++++++++++++++++++++++++++
server/lib/hls.ts | 3 +-
3 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 server/lib/activitypub/send/send-reject.ts
(limited to 'server/lib')
diff --git a/server/lib/activitypub/send/index.ts b/server/lib/activitypub/send/index.ts
index 79ba6c7fe..028936810 100644
--- a/server/lib/activitypub/send/index.ts
+++ b/server/lib/activitypub/send/index.ts
@@ -1,8 +1,10 @@
export * from './send-accept'
+export * from './send-accept'
export * from './send-announce'
export * from './send-create'
export * from './send-delete'
export * from './send-follow'
export * from './send-like'
+export * from './send-reject'
export * from './send-undo'
export * from './send-update'
diff --git a/server/lib/activitypub/send/send-reject.ts b/server/lib/activitypub/send/send-reject.ts
new file mode 100644
index 000000000..db8c2d86d
--- /dev/null
+++ b/server/lib/activitypub/send/send-reject.ts
@@ -0,0 +1,44 @@
+import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
+import { unicastTo } from './utils'
+import { buildFollowActivity } from './send-follow'
+import { logger } from '../../../helpers/logger'
+
+async function sendReject (actorFollow: ActorFollowModel) {
+ const follower = actorFollow.ActorFollower
+ const me = actorFollow.ActorFollowing
+
+ if (!follower.serverId) { // This should never happen
+ logger.warn('Do not sending reject to local follower.')
+ return
+ }
+
+ logger.info('Creating job to reject follower %s.', follower.url)
+
+ const followUrl = getActorFollowActivityPubUrl(actorFollow)
+ const followData = buildFollowActivity(followUrl, follower, me)
+
+ const url = getActorFollowAcceptActivityPubUrl(actorFollow)
+ const data = buildRejectActivity(url, me, followData)
+
+ return unicastTo(data, me, follower.inboxUrl)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+ sendReject
+}
+
+// ---------------------------------------------------------------------------
+
+function buildRejectActivity (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityReject {
+ return {
+ type: 'Reject',
+ id: url,
+ actor: byActor.url,
+ object: followActivityData
+ }
+}
diff --git a/server/lib/hls.ts b/server/lib/hls.ts
index 5a7d61dee..c0fc4961a 100644
--- a/server/lib/hls.ts
+++ b/server/lib/hls.ts
@@ -1,6 +1,6 @@
import { VideoModel } from '../models/video/video'
import { basename, dirname, join } from 'path'
-import { CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY, sequelizeTypescript } from '../initializers'
+import { CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, sequelizeTypescript } from '../initializers'
import { close, ensureDir, move, open, outputJSON, pathExists, read, readFile, remove, writeFile } from 'fs-extra'
import { getVideoFileSize } from '../helpers/ffmpeg-utils'
import { sha256 } from '../helpers/core-utils'
@@ -20,6 +20,7 @@ async function updateStreamingPlaylistsInfohashesIfNeeded () {
const videoFiles = await VideoFileModel.listByStreamingPlaylist(playlist.id, t)
playlist.p2pMediaLoaderInfohashes = await VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlist.playlistUrl, videoFiles)
+ playlist.p2pMediaLoaderPeerVersion = P2P_MEDIA_LOADER_PEER_VERSION
await playlist.save({ transaction: t })
})
}
--
cgit v1.2.3