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

Handle account name in client url

Browse source 
More consistent with AP urls
This commit is contained in:
Chocobozzz 2018-05-24 15:30:28 +02:00
parent b528582df2
commit d14a9532a1
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
server/helpers/custom-validators/accounts.ts
View file

@ -4,16 +4,21 @@ import 'express-validator'
import * as validator from 'validator'
import { AccountModel } from '../../models/account/account'
import { isUserDescriptionValid, isUserUsernameValid } from './users'
import { exists } from './misc'
function isAccountNameValid (value: string) {
return isUserUsernameValid(value)
}
function isAccountIdValid (value: string) {
return exists(value)
}
function isAccountDescriptionValid (value: string) {
return isUserDescriptionValid(value)
}
function isAccountIdExist (id: number | string, res: Response) {
function isAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
let promise: Bluebird<AccountModel>
if (validator.isInt('' + id)) {
@ -22,32 +27,34 @@ function isAccountIdExist (id: number | string, res: Response) {
promise = AccountModel.loadByUUID('' + id)
}
return isAccountExist(promise, res)
return isAccountExist(promise, res, sendNotFound)
}
function isLocalAccountNameExist (name: string, res: Response) {
function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
const promise = AccountModel.loadLocalByName(name)
return isAccountExist(promise, res)
return isAccountExist(promise, res, sendNotFound)
}
function isAccountNameWithHostExist (nameWithDomain: string, res: Response) {
function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
const [ accountName, host ] = nameWithDomain.split('@')
let promise: Bluebird<AccountModel>
if (!host) promise = AccountModel.loadLocalByName(accountName)
else promise = AccountModel.loadLocalByNameAndHost(accountName, host)
return isAccountExist(promise, res)
return isAccountExist(promise, res, sendNotFound)
}
async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
async function isAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
const account = await p
if (!account) {
res.status(404)
.send({ error: 'Account not found' })
.end()
if (sendNotFound === true) {
res.status(404)
.send({ error: 'Account not found' })
.end()
}
return false
}
@ -60,6 +67,7 @@ async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
// ---------------------------------------------------------------------------
export {
isAccountIdValid,
isAccountIdExist,
isLocalAccountNameExist,
isAccountDescriptionValid,