aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/controllers/activitypub/client.ts26
-rw-r--r--server/models/activitypub/actor.ts2
2 files changed, 17 insertions, 11 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index ba659984f..2587ee212 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -1,7 +1,7 @@
1// Intercept ActivityPub client requests 1// Intercept ActivityPub client requests
2import * as express from 'express' 2import * as express from 'express'
3import { VideoPrivacy } from '../../../shared/models/videos' 3import { VideoPrivacy } from '../../../shared/models/videos'
4import { activityPubCollectionPagination } from '../../helpers/activitypub' 4import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
5import { pageToStartAndCount } from '../../helpers/core-utils' 5import { pageToStartAndCount } from '../../helpers/core-utils'
6import { ACTIVITY_PUB, CONFIG } from '../../initializers' 6import { ACTIVITY_PUB, CONFIG } from '../../initializers'
7import { buildVideoAnnounceToFollowers } from '../../lib/activitypub/send' 7import { buildVideoAnnounceToFollowers } from '../../lib/activitypub/send'
@@ -69,7 +69,7 @@ export {
69function accountController (req: express.Request, res: express.Response, next: express.NextFunction) { 69function accountController (req: express.Request, res: express.Response, next: express.NextFunction) {
70 const account: AccountModel = res.locals.account 70 const account: AccountModel = res.locals.account
71 71
72 return res.json(account.toActivityPubObject()) 72 return res.json(activityPubContextify(account.toActivityPubObject()))
73 .end() 73 .end()
74} 74}
75 75
@@ -77,14 +77,14 @@ async function accountFollowersController (req: express.Request, res: express.Re
77 const account: AccountModel = res.locals.account 77 const account: AccountModel = res.locals.account
78 const activityPubResult = await actorFollowers(req, account.Actor) 78 const activityPubResult = await actorFollowers(req, account.Actor)
79 79
80 return res.json(activityPubResult) 80 return res.json(activityPubContextify(activityPubResult))
81} 81}
82 82
83async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) { 83async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
84 const account: AccountModel = res.locals.account 84 const account: AccountModel = res.locals.account
85 const activityPubResult = await actorFollowing(req, account.Actor) 85 const activityPubResult = await actorFollowing(req, account.Actor)
86 86
87 return res.json(activityPubResult) 87 return res.json(activityPubContextify(activityPubResult))
88} 88}
89 89
90async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) { 90async function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
@@ -93,42 +93,48 @@ async function videoController (req: express.Request, res: express.Response, nex
93 // We need more attributes 93 // We need more attributes
94 const videoAll = await VideoModel.loadAndPopulateAll(video.id) 94 const videoAll = await VideoModel.loadAndPopulateAll(video.id)
95 const audience = await getAudience(video.VideoChannel.Account.Actor, undefined, video.privacy === VideoPrivacy.PUBLIC) 95 const audience = await getAudience(video.VideoChannel.Account.Actor, undefined, video.privacy === VideoPrivacy.PUBLIC)
96 const videoObject = audiencify(videoAll.toActivityPubObject(), audience)
96 97
97 return res.json(audiencify(videoAll.toActivityPubObject(), audience)) 98 return res.json(activityPubContextify(videoObject))
98} 99}
99 100
100async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) { 101async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
101 const share = res.locals.videoShare as VideoShareModel 102 const share = res.locals.videoShare as VideoShareModel
102 const object = await buildVideoAnnounceToFollowers(share.Actor, res.locals.video, undefined) 103 const object = await buildVideoAnnounceToFollowers(share.Actor, res.locals.video, undefined)
103 104
104 return res.json(object) 105 return res.json(activityPubContextify(object))
105} 106}
106 107
107async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) { 108async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
108 const videoChannel: VideoChannelModel = res.locals.videoChannel 109 const videoChannel: VideoChannelModel = res.locals.videoChannel
109 110
110 return res.json(videoChannel.toActivityPubObject()) 111 return res.json(activityPubContextify(videoChannel.toActivityPubObject()))
111} 112}
112 113
113async function videoChannelFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) { 114async function videoChannelFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
114 const videoChannel: VideoChannelModel = res.locals.videoChannel 115 const videoChannel: VideoChannelModel = res.locals.videoChannel
115 const activityPubResult = await actorFollowers(req, videoChannel.Actor) 116 const activityPubResult = await actorFollowers(req, videoChannel.Actor)
116 117
117 return res.json(activityPubResult) 118 return res.json(activityPubContextify(activityPubResult))
118} 119}
119 120
120async function videoChannelFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) { 121async function videoChannelFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
121 const videoChannel: VideoChannelModel = res.locals.videoChannel 122 const videoChannel: VideoChannelModel = res.locals.videoChannel
122 const activityPubResult = await actorFollowing(req, videoChannel.Actor) 123 const activityPubResult = await actorFollowing(req, videoChannel.Actor)
123 124
124 return res.json(activityPubResult) 125 return res.json(activityPubContextify(activityPubResult))
125} 126}
126 127
127async function videoCommentController (req: express.Request, res: express.Response, next: express.NextFunction) { 128async function videoCommentController (req: express.Request, res: express.Response, next: express.NextFunction) {
128 const videoComment: VideoCommentModel = res.locals.videoComment 129 const videoComment: VideoCommentModel = res.locals.videoComment
129 130
130 const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined) 131 const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined)
131 return res.json(videoComment.toActivityPubObject(threadParentComments)) 132 const isPublic = true // Comments are always public
133 const audience = await getAudience(videoComment.Account.Actor, undefined, isPublic)
134
135 const videoCommentObject = audiencify(videoComment.toActivityPubObject(threadParentComments), audience)
136
137 return res.json(activityPubContextify(videoCommentObject))
132} 138}
133 139
134// --------------------------------------------------------------------------- 140// ---------------------------------------------------------------------------
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts
index 269149a31..c79bba96b 100644
--- a/server/models/activitypub/actor.ts
+++ b/server/models/activitypub/actor.ts
@@ -389,7 +389,7 @@ export class ActorModel extends Model<ActorModel> {
389 attribute: [], 389 attribute: [],
390 model: ActorFollowModel.unscoped(), 390 model: ActorFollowModel.unscoped(),
391 required: true, 391 required: true,
392 as: 'ActorFollowers', 392 as: 'ActorFollowing',
393 where: { 393 where: {
394 state: 'accepted', 394 state: 'accepted',
395 targetActorId: this.id 395 targetActorId: this.id