diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-12 15:26:04 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-16 16:41:36 +0200 |
| commit | 7ad9b9846c44d198a736183fb186c2039f5236b5 (patch) | |
| tree | 9c8456882a261c0522efb507f20e323c2741a0f8 /server/controllers/api/users/me.ts | |
| parent | dffd5d127f49eb63d2b2b3133aec75ec1d7e4dcb (diff) | |
| download | PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.gz PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.zst PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.zip | |
Add ability for users to block an account/instance on server side
Diffstat (limited to 'server/controllers/api/users/me.ts')
| -rw-r--r-- | server/controllers/api/users/me.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 591ec6b25..ebe668110 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts | |||
| @@ -238,7 +238,8 @@ async function getUserSubscriptionVideos (req: express.Request, res: express.Res | |||
| 238 | nsfw: buildNSFWFilter(res, req.query.nsfw), | 238 | nsfw: buildNSFWFilter(res, req.query.nsfw), |
| 239 | filter: req.query.filter as VideoFilter, | 239 | filter: req.query.filter as VideoFilter, |
| 240 | withFiles: false, | 240 | withFiles: false, |
| 241 | actorId: user.Account.Actor.id | 241 | actorId: user.Account.Actor.id, |
| 242 | user | ||
| 242 | }) | 243 | }) |
| 243 | 244 | ||
| 244 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | 245 | return res.json(getFormattedObjects(resultList.data, resultList.total)) |