From 0aef76c479bc7fc758e70e1cd478ade46761b51b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 Aug 2017 11:45:31 +0200 Subject: Formated -> Formatted --- server/controllers/api/pods.ts | 6 +++--- server/controllers/api/users.ts | 10 +++++----- server/controllers/api/videos/abuse.ts | 4 ++-- server/controllers/api/videos/index.ts | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts index 916b131d9..e1fa4b7e8 100644 --- a/server/controllers/api/pods.ts +++ b/server/controllers/api/pods.ts @@ -5,7 +5,7 @@ import { CONFIG } from '../../initializers' import { logger, getMyPublicCert, - getFormatedObjects + getFormattedObjects } from '../../helpers' import { sendOwnedVideosToPod, @@ -25,7 +25,7 @@ import { import { PodInstance } from '../../models' -import { Pod as FormatedPod } from '../../../shared' +import { Pod as FormattedPod } from '../../../shared' const podsRouter = express.Router() @@ -81,7 +81,7 @@ function addPods (req: express.Request, res: express.Response, next: express.Nex function listPods (req: express.Request, res: express.Response, next: express.NextFunction) { db.Pod.list() - .then(podsList => res.json(getFormatedObjects(podsList, podsList.length))) + .then(podsList => res.json(getFormattedObjects(podsList, podsList.length))) .catch(err => next(err)) } diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index f50dbc9a3..04d885185 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -2,7 +2,7 @@ import * as express from 'express' import { database as db } from '../../initializers/database' import { USER_ROLES } from '../../initializers' -import { logger, getFormatedObjects } from '../../helpers' +import { logger, getFormattedObjects } from '../../helpers' import { authenticate, ensureIsAdmin, @@ -17,7 +17,7 @@ import { setUsersSort, token } from '../../middlewares' -import { UserVideoRate as FormatedUserVideoRate, UserCreate, UserUpdate } from '../../../shared' +import { UserVideoRate as FormattedUserVideoRate, UserCreate, UserUpdate } from '../../../shared' const usersRouter = express.Router() @@ -95,7 +95,7 @@ function createUser (req: express.Request, res: express.Response, next: express. function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) { db.User.loadByUsername(res.locals.oauth.token.user.username) - .then(user => res.json(user.toFormatedJSON())) + .then(user => res.json(user.toFormattedJSON())) .catch(err => next(err)) } @@ -106,7 +106,7 @@ function getUserVideoRating (req: express.Request, res: express.Response, next: db.UserVideoRate.load(userId, videoId, null) .then(ratingObj => { const rating = ratingObj ? ratingObj.type : 'none' - const json: FormatedUserVideoRate = { + const json: FormattedUserVideoRate = { videoId, rating } @@ -118,7 +118,7 @@ function getUserVideoRating (req: express.Request, res: express.Response, next: function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) { db.User.listForApi(req.query.start, req.query.count, req.query.sort) .then(resultList => { - res.json(getFormatedObjects(resultList.data, resultList.total)) + res.json(getFormattedObjects(resultList.data, resultList.total)) }) .catch(err => next(err)) } diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 5cf0303fb..c9313d5f5 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -4,7 +4,7 @@ import { database as db } from '../../../initializers/database' import * as friends from '../../../lib/friends' import { logger, - getFormatedObjects, + getFormattedObjects, retryTransactionWrapper } from '../../../helpers' import { @@ -46,7 +46,7 @@ export { function listVideoAbuses (req: express.Request, res: express.Response, next: express.NextFunction) { db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) + .then(result => res.json(getFormattedObjects(result.data, result.total))) .catch(err => next(err)) } diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index d71a132ed..f639df098 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -36,7 +36,7 @@ import { logger, retryTransactionWrapper, generateRandomString, - getFormatedObjects, + getFormattedObjects, renamePromise } from '../../../helpers' import { TagInstance } from '../../../models' @@ -386,12 +386,12 @@ function getVideo (req: express.Request, res: express.Response, next: express.Ne } // Do not wait the view system - res.json(videoInstance.toFormatedJSON()) + res.json(videoInstance.toFormattedJSON()) } function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) { db.Video.listForApi(req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) + .then(result => res.json(getFormattedObjects(result.data, result.total))) .catch(err => next(err)) } @@ -408,6 +408,6 @@ function removeVideo (req: express.Request, res: express.Response, next: express function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { db.Video.searchAndPopulateAuthorAndPodAndTags(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort) - .then(result => res.json(getFormatedObjects(result.data, result.total))) + .then(result => res.json(getFormattedObjects(result.data, result.total))) .catch(err => next(err)) } -- cgit v1.2.3