diff options
author | Chocobozzz <me@florianbigard.com> | 2019-03-19 10:35:15 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-03-19 10:35:15 +0100 |
commit | dae86118ed5d4026d04acb9d0e36829b9ad8eb4e (patch) | |
tree | a5bf9c4487240bf75a9b328cad459a0587f90dea /server/controllers/api/users/my-blocklist.ts | |
parent | e65c0c5b1fab9c3d93f51721b2458cf5cf471f20 (diff) | |
download | PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.tar.gz PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.tar.zst PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.zip |
Cleanup express locals typings
Diffstat (limited to 'server/controllers/api/users/my-blocklist.ts')
-rw-r--r-- | server/controllers/api/users/my-blocklist.ts | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/server/controllers/api/users/my-blocklist.ts b/server/controllers/api/users/my-blocklist.ts index 9575eab46..481e75139 100644 --- a/server/controllers/api/users/my-blocklist.ts +++ b/server/controllers/api/users/my-blocklist.ts | |||
@@ -17,7 +17,6 @@ import { | |||
17 | serversBlocklistSortValidator, | 17 | serversBlocklistSortValidator, |
18 | unblockServerByAccountValidator | 18 | unblockServerByAccountValidator |
19 | } from '../../../middlewares/validators' | 19 | } from '../../../middlewares/validators' |
20 | import { UserModel } from '../../../models/account/user' | ||
21 | import { AccountModel } from '../../../models/account/account' | 20 | import { AccountModel } from '../../../models/account/account' |
22 | import { AccountBlocklistModel } from '../../../models/account/account-blocklist' | 21 | import { AccountBlocklistModel } from '../../../models/account/account-blocklist' |
23 | import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist' | 22 | import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist' |
@@ -75,7 +74,7 @@ export { | |||
75 | // --------------------------------------------------------------------------- | 74 | // --------------------------------------------------------------------------- |
76 | 75 | ||
77 | async function listBlockedAccounts (req: express.Request, res: express.Response) { | 76 | async function listBlockedAccounts (req: express.Request, res: express.Response) { |
78 | const user: UserModel = res.locals.oauth.token.User | 77 | const user = res.locals.oauth.token.User |
79 | 78 | ||
80 | const resultList = await AccountBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) | 79 | const resultList = await AccountBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) |
81 | 80 | ||
@@ -83,8 +82,8 @@ async function listBlockedAccounts (req: express.Request, res: express.Response) | |||
83 | } | 82 | } |
84 | 83 | ||
85 | async function blockAccount (req: express.Request, res: express.Response) { | 84 | async function blockAccount (req: express.Request, res: express.Response) { |
86 | const user: UserModel = res.locals.oauth.token.User | 85 | const user = res.locals.oauth.token.User |
87 | const accountToBlock: AccountModel = res.locals.account | 86 | const accountToBlock = res.locals.account |
88 | 87 | ||
89 | await addAccountInBlocklist(user.Account.id, accountToBlock.id) | 88 | await addAccountInBlocklist(user.Account.id, accountToBlock.id) |
90 | 89 | ||
@@ -92,7 +91,7 @@ async function blockAccount (req: express.Request, res: express.Response) { | |||
92 | } | 91 | } |
93 | 92 | ||
94 | async function unblockAccount (req: express.Request, res: express.Response) { | 93 | async function unblockAccount (req: express.Request, res: express.Response) { |
95 | const accountBlock: AccountBlocklistModel = res.locals.accountBlock | 94 | const accountBlock = res.locals.accountBlock |
96 | 95 | ||
97 | await removeAccountFromBlocklist(accountBlock) | 96 | await removeAccountFromBlocklist(accountBlock) |
98 | 97 | ||
@@ -100,7 +99,7 @@ async function unblockAccount (req: express.Request, res: express.Response) { | |||
100 | } | 99 | } |
101 | 100 | ||
102 | async function listBlockedServers (req: express.Request, res: express.Response) { | 101 | async function listBlockedServers (req: express.Request, res: express.Response) { |
103 | const user: UserModel = res.locals.oauth.token.User | 102 | const user = res.locals.oauth.token.User |
104 | 103 | ||
105 | const resultList = await ServerBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) | 104 | const resultList = await ServerBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort) |
106 | 105 | ||
@@ -108,8 +107,8 @@ async function listBlockedServers (req: express.Request, res: express.Response) | |||
108 | } | 107 | } |
109 | 108 | ||
110 | async function blockServer (req: express.Request, res: express.Response) { | 109 | async function blockServer (req: express.Request, res: express.Response) { |
111 | const user: UserModel = res.locals.oauth.token.User | 110 | const user = res.locals.oauth.token.User |
112 | const serverToBlock: ServerModel = res.locals.server | 111 | const serverToBlock = res.locals.server |
113 | 112 | ||
114 | await addServerInBlocklist(user.Account.id, serverToBlock.id) | 113 | await addServerInBlocklist(user.Account.id, serverToBlock.id) |
115 | 114 | ||
@@ -117,7 +116,7 @@ async function blockServer (req: express.Request, res: express.Response) { | |||
117 | } | 116 | } |
118 | 117 | ||
119 | async function unblockServer (req: express.Request, res: express.Response) { | 118 | async function unblockServer (req: express.Request, res: express.Response) { |
120 | const serverBlock: ServerBlocklistModel = res.locals.serverBlock | 119 | const serverBlock = res.locals.serverBlock |
121 | 120 | ||
122 | await removeServerFromBlocklist(serverBlock) | 121 | await removeServerFromBlocklist(serverBlock) |
123 | 122 | ||