yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Cleanup express locals typings

Browse source
This commit is contained in:
Chocobozzz 2019-03-19 10:35:15 +01:00
parent e65c0c5b1f
commit dae86118ed
No known key found for this signature in database
GPG key ID: 583A612D890159BE
45 changed files with 270 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/controllers/api/users/my-blocklist.ts
View file

@ -17,7 +17,6 @@ import {
serversBlocklistSortValidator,
unblockServerByAccountValidator
} from '../../../middlewares/validators'
import { UserModel } from '../../../models/account/user'
import { AccountModel } from '../../../models/account/account'
import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../../../lib/blocklist'
@ -75,7 +74,7 @@ export {
// ---------------------------------------------------------------------------
async function listBlockedAccounts (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.oauth.token.User
const user = res.locals.oauth.token.User
const resultList = await AccountBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort)
@ -83,8 +82,8 @@ async function listBlockedAccounts (req: express.Request, res: express.Response)
}
async function blockAccount (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.oauth.token.User
const accountToBlock: AccountModel = res.locals.account
const user = res.locals.oauth.token.User
const accountToBlock = res.locals.account
await addAccountInBlocklist(user.Account.id, accountToBlock.id)
@ -92,7 +91,7 @@ async function blockAccount (req: express.Request, res: express.Response) {
}
async function unblockAccount (req: express.Request, res: express.Response) {
const accountBlock: AccountBlocklistModel = res.locals.accountBlock
const accountBlock = res.locals.accountBlock
await removeAccountFromBlocklist(accountBlock)
@ -100,7 +99,7 @@ async function unblockAccount (req: express.Request, res: express.Response) {
}
async function listBlockedServers (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.oauth.token.User
const user = res.locals.oauth.token.User
const resultList = await ServerBlocklistModel.listForApi(user.Account.id, req.query.start, req.query.count, req.query.sort)
@ -108,8 +107,8 @@ async function listBlockedServers (req: express.Request, res: express.Response)
}
async function blockServer (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.oauth.token.User
const serverToBlock: ServerModel = res.locals.server
const user = res.locals.oauth.token.User
const serverToBlock = res.locals.server
await addServerInBlocklist(user.Account.id, serverToBlock.id)
@ -117,7 +116,7 @@ async function blockServer (req: express.Request, res: express.Response) {
}
async function unblockServer (req: express.Request, res: express.Response) {
const serverBlock: ServerBlocklistModel = res.locals.serverBlock
const serverBlock = res.locals.serverBlock
await removeServerFromBlocklist(serverBlock)