diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-19 14:11:40 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-05-01 16:41:02 +0200 |
commit | e0a929179a9dc76e035ca7fda2b61d5ff46afbc5 (patch) | |
tree | 1e6615c612ad6995dcb1c3619342dbbc7db35034 /server/controllers/api/users/my-blocklist.ts | |
parent | aeb1bed9835b3b092832160245080d4023c14d91 (diff) | |
download | PeerTube-e0a929179a9dc76e035ca7fda2b61d5ff46afbc5.tar.gz PeerTube-e0a929179a9dc76e035ca7fda2b61d5ff46afbc5.tar.zst PeerTube-e0a929179a9dc76e035ca7fda2b61d5ff46afbc5.zip |
Add filter inputs for blacklisted videos and muted accounts/servers
Diffstat (limited to 'server/controllers/api/users/my-blocklist.ts')
-rw-r--r-- | server/controllers/api/users/my-blocklist.ts | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/server/controllers/api/users/my-blocklist.ts b/server/controllers/api/users/my-blocklist.ts index 713c16022..3a44376f2 100644 --- a/server/controllers/api/users/my-blocklist.ts +++ b/server/controllers/api/users/my-blocklist.ts | |||
@@ -74,7 +74,13 @@ export { | |||
74 | async function listBlockedAccounts (req: express.Request, res: express.Response) { | 74 | async function listBlockedAccounts (req: express.Request, res: express.Response) { |
75 | const user = res.locals.oauth.token.User | 75 | const user = res.locals.oauth.token.User |
76 | 76 | ||
77 | const resultList = await AccountBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) | 77 | const resultList = await AccountBlocklistModel.listForApi({ |
78 | start: req.query.start, | ||
79 | count: req.query.count, | ||
80 | sort: req.query.sort, | ||
81 | search: req.query.search, | ||
82 | accountId: user.Account.id | ||
83 | }) | ||
78 | 84 | ||
79 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | 85 | return res.json(getFormattedObjects(resultList.data, resultList.total)) |
80 | } | 86 | } |
@@ -99,7 +105,13 @@ async function unblockAccount (req: express.Request, res: express.Response) { | |||
99 | async function listBlockedServers (req: express.Request, res: express.Response) { | 105 | async function listBlockedServers (req: express.Request, res: express.Response) { |
100 | const user = res.locals.oauth.token.User | 106 | const user = res.locals.oauth.token.User |
101 | 107 | ||
102 | const resultList = await ServerBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) | 108 | const resultList = await ServerBlocklistModel.listForApi({ |
109 | start: req.query.start, | ||
110 | count: req.query.count, | ||
111 | sort: req.query.sort, | ||
112 | search: req.query.search, | ||
113 | accountId: user.Account.id | ||
114 | }) | ||
103 | 115 | ||
104 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | 116 | return res.json(getFormattedObjects(resultList.data, resultList.total)) |
105 | } | 117 | } |