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

Formated -> Formatted

Browse source
This commit is contained in:
Chocobozzz 2017-08-25 11:45:31 +02:00
parent 93e1258c7c
commit 0aef76c479
17 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/models/pod/pod-interface.ts
View file

@ -2,10 +2,10 @@ import * as Sequelize from 'sequelize'
import * as Promise from 'bluebird'
// Don't use barrel, import just what we need
import { Pod as FormatedPod } from '../../../shared/models/pods/pod.model'
import { Pod as FormattedPod } from '../../../shared/models/pods/pod.model'
export namespace PodMethods {
export type ToFormatedJSON = (this: PodInstance) => FormatedPod
export type ToFormattedJSON = (this: PodInstance) => FormattedPod
export type CountAll = () => Promise<number>
@ -53,7 +53,7 @@ export interface PodInstance extends PodClass, PodAttributes, Sequelize.Instance
createdAt: Date
updatedAt: Date
toFormatedJSON: PodMethods.ToFormatedJSON,
toFormattedJSON: PodMethods.ToFormattedJSON,
}
export interface PodModel extends PodClass, Sequelize.Model<PodInstance, PodAttributes> {}

6
server/models/pod/pod.ts
View file

@ -13,7 +13,7 @@ import {
} from './pod-interface'
let Pod: Sequelize.Model<PodInstance, PodAttributes>
let toFormatedJSON: PodMethods.ToFormatedJSON
let toFormattedJSON: PodMethods.ToFormattedJSON
let countAll: PodMethods.CountAll
let incrementScores: PodMethods.IncrementScores
let list: PodMethods.List
@ -86,7 +86,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
updatePodsScore,
removeAll
]
const instanceMethods = [ toFormatedJSON ]
const instanceMethods = [ toFormattedJSON ]
addMethodsToModel(Pod, classMethods, instanceMethods)
return Pod
@ -94,7 +94,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
// ------------------------------ METHODS ------------------------------
toFormatedJSON = function (this: PodInstance) {
toFormattedJSON = function (this: PodInstance) {
const json = {
id: this.id,
host: this.host,

8
server/models/user/user-interface.ts
View file

@ -2,14 +2,14 @@ import * as Sequelize from 'sequelize'
import * as Promise from 'bluebird'
// Don't use barrel, import just what we need
import { User as FormatedUser } from '../../../shared/models/users/user.model'
import { User as FormattedUser } from '../../../shared/models/users/user.model'
import { UserRole } from '../../../shared/models/users/user-role.type'
import { ResultList } from '../../../shared/models/result-list.model'
export namespace UserMethods {
export type IsPasswordMatch = (this: UserInstance, password: string) => Promise<boolean>
export type ToFormatedJSON = (this: UserInstance) => FormatedUser
export type ToFormattedJSON = (this: UserInstance) => FormattedUser
export type IsAdmin = (this: UserInstance) => boolean
export type CountTotal = () => Promise<number>
@ -29,7 +29,7 @@ export namespace UserMethods {
export interface UserClass {
isPasswordMatch: UserMethods.IsPasswordMatch,
toFormatedJSON: UserMethods.ToFormatedJSON,
toFormattedJSON: UserMethods.ToFormattedJSON,
isAdmin: UserMethods.IsAdmin,
countTotal: UserMethods.CountTotal,
@ -55,7 +55,7 @@ export interface UserInstance extends UserClass, UserAttributes, Sequelize.Insta
updatedAt: Date
isPasswordMatch: UserMethods.IsPasswordMatch
toFormatedJSON: UserMethods.ToFormatedJSON
toFormattedJSON: UserMethods.ToFormattedJSON
isAdmin: UserMethods.IsAdmin
}

6
server/models/user/user.ts
View file

@ -21,7 +21,7 @@ import {
let User: Sequelize.Model<UserInstance, UserAttributes>
let isPasswordMatch: UserMethods.IsPasswordMatch
let toFormatedJSON: UserMethods.ToFormatedJSON
let toFormattedJSON: UserMethods.ToFormattedJSON
let isAdmin: UserMethods.IsAdmin
let countTotal: UserMethods.CountTotal
let getByUsername: UserMethods.GetByUsername
@ -108,7 +108,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
]
const instanceMethods = [
isPasswordMatch,
toFormatedJSON,
toFormattedJSON,
isAdmin
]
addMethodsToModel(User, classMethods, instanceMethods)
@ -129,7 +129,7 @@ isPasswordMatch = function (this: UserInstance, password: string) {
return comparePassword(password, this.password)
}
toFormatedJSON = function (this: UserInstance) {
toFormattedJSON = function (this: UserInstance) {
return {
id: this.id,
username: this.username,

6
server/models/video/video-abuse-interface.ts
View file

@ -5,10 +5,10 @@ import { PodInstance } from '../pod'
import { ResultList } from '../../../shared'
// Don't use barrel, import just what we need
import { VideoAbuse as FormatedVideoAbuse } from '../../../shared/models/videos/video-abuse.model'
import { VideoAbuse as FormattedVideoAbuse } from '../../../shared/models/videos/video-abuse.model'
export namespace VideoAbuseMethods {
export type ToFormatedJSON = (this: VideoAbuseInstance) => FormatedVideoAbuse
export type ToFormattedJSON = (this: VideoAbuseInstance) => FormattedVideoAbuse
export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList<VideoAbuseInstance> >
}
@ -30,7 +30,7 @@ export interface VideoAbuseInstance extends VideoAbuseClass, VideoAbuseAttribute
Pod: PodInstance
toFormatedJSON: VideoAbuseMethods.ToFormatedJSON
toFormattedJSON: VideoAbuseMethods.ToFormattedJSON
}
export interface VideoAbuseModel extends VideoAbuseClass, Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes> {}

6
server/models/video/video-abuse.ts
View file

@ -12,7 +12,7 @@ import {
} from './video-abuse-interface'
let VideoAbuse: Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes>
let toFormatedJSON: VideoAbuseMethods.ToFormatedJSON
let toFormattedJSON: VideoAbuseMethods.ToFormattedJSON
let listForApi: VideoAbuseMethods.ListForApi
export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
@ -57,7 +57,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
listForApi
]
const instanceMethods = [
toFormatedJSON
toFormattedJSON
]
addMethodsToModel(VideoAbuse, classMethods, instanceMethods)
@ -66,7 +66,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
// ------------------------------ METHODS ------------------------------
toFormatedJSON = function (this: VideoAbuseInstance) {
toFormattedJSON = function (this: VideoAbuseInstance) {
let reporterPodHost
if (this.Pod) {

8
server/models/video/video-blacklist-interface.ts
View file

@ -4,10 +4,10 @@ import * as Promise from 'bluebird'
import { ResultList } from '../../../shared'
// Don't use barrel, import just what we need
import { BlacklistedVideo as FormatedBlacklistedVideo } from '../../../shared/models/videos/video-blacklist.model'
import { BlacklistedVideo as FormattedBlacklistedVideo } from '../../../shared/models/videos/video-blacklist.model'
export namespace BlacklistedVideoMethods {
export type ToFormatedJSON = (this: BlacklistedVideoInstance) => FormatedBlacklistedVideo
export type ToFormattedJSON = (this: BlacklistedVideoInstance) => FormattedBlacklistedVideo
export type CountTotal = () => Promise<number>
@ -21,7 +21,7 @@ export namespace BlacklistedVideoMethods {
}
export interface BlacklistedVideoClass {
toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
countTotal: BlacklistedVideoMethods.CountTotal
list: BlacklistedVideoMethods.List
listForApi: BlacklistedVideoMethods.ListForApi
@ -39,7 +39,7 @@ export interface BlacklistedVideoInstance
createdAt: Date
updatedAt: Date
toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
}
export interface BlacklistedVideoModel

6
server/models/video/video-blacklist.ts
View file

@ -9,7 +9,7 @@ import {
} from './video-blacklist-interface'
let BlacklistedVideo: Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes>
let toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
let toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
let countTotal: BlacklistedVideoMethods.CountTotal
let list: BlacklistedVideoMethods.List
let listForApi: BlacklistedVideoMethods.ListForApi
@ -39,7 +39,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
loadByVideoId
]
const instanceMethods = [
toFormatedJSON
toFormattedJSON
]
addMethodsToModel(BlacklistedVideo, classMethods, instanceMethods)
@ -48,7 +48,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
// ------------------------------ METHODS ------------------------------
toFormatedJSON = function (this: BlacklistedVideoInstance) {
toFormattedJSON = function (this: BlacklistedVideoInstance) {
return {
id: this.id,
videoId: this.videoId,

20
server/models/video/video-interface.ts
View file

@ -6,17 +6,17 @@ import { TagAttributes, TagInstance } from './tag-interface'
import { VideoFileAttributes, VideoFileInstance } from './video-file-interface'
// Don't use barrel, import just what we need
import { Video as FormatedVideo } from '../../../shared/models/videos/video.model'
import { Video as FormattedVideo } from '../../../shared/models/videos/video.model'
import { ResultList } from '../../../shared/models/result-list.model'
export type FormatedRemoteVideoFile = {
export type FormattedRemoteVideoFile = {
infoHash: string
resolution: number
extname: string
size: number
}
export type FormatedAddRemoteVideo = {
export type FormattedAddRemoteVideo = {
uuid: string
name: string
category: number
@ -33,10 +33,10 @@ export type FormatedAddRemoteVideo = {
views: number
likes: number
dislikes: number
files: FormatedRemoteVideoFile[]
files: FormattedRemoteVideoFile[]
}
export type FormatedUpdateRemoteVideo = {
export type FormattedUpdateRemoteVideo = {
uuid: string
name: string
category: number
@ -52,14 +52,14 @@ export type FormatedUpdateRemoteVideo = {
views: number
likes: number
dislikes: number
files: FormatedRemoteVideoFile[]
files: FormattedRemoteVideoFile[]
}
export namespace VideoMethods {
export type GetThumbnailName = (this: VideoInstance) => string
export type GetPreviewName = (this: VideoInstance) => string
export type IsOwned = (this: VideoInstance) => boolean
export type ToFormatedJSON = (this: VideoInstance) => FormatedVideo
export type ToFormattedJSON = (this: VideoInstance) => FormattedVideo
export type GenerateMagnetUri = (this: VideoInstance, videoFile: VideoFileInstance) => string
export type GetTorrentFileName = (this: VideoInstance, videoFile: VideoFileInstance) => string
@ -69,8 +69,8 @@ export namespace VideoMethods {
export type GetVideoFilePath = (this: VideoInstance, videoFile: VideoFileInstance) => string
export type CreateTorrentAndSetInfoHash = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<void>
export type ToAddRemoteJSON = (this: VideoInstance) => Promise<FormatedAddRemoteVideo>
export type ToUpdateRemoteJSON = (this: VideoInstance) => FormatedUpdateRemoteVideo
export type ToAddRemoteJSON = (this: VideoInstance) => Promise<FormattedAddRemoteVideo>
export type ToUpdateRemoteJSON = (this: VideoInstance) => FormattedUpdateRemoteVideo
export type TranscodeVideofile = (this: VideoInstance, inputVideoFile: VideoFileInstance) => Promise<void>
@ -159,7 +159,7 @@ export interface VideoInstance extends VideoClass, VideoAttributes, Sequelize.In
removeThumbnail: VideoMethods.RemoveThumbnail
removeTorrent: VideoMethods.RemoveTorrent
toAddRemoteJSON: VideoMethods.ToAddRemoteJSON
toFormatedJSON: VideoMethods.ToFormatedJSON
toFormattedJSON: VideoMethods.ToFormattedJSON
toUpdateRemoteJSON: VideoMethods.ToUpdateRemoteJSON
transcodeVideofile: VideoMethods.TranscodeVideofile

6
server/models/video/video.ts
View file

@ -52,7 +52,7 @@ let getThumbnailName: VideoMethods.GetThumbnailName
let getPreviewName: VideoMethods.GetPreviewName
let getTorrentFileName: VideoMethods.GetTorrentFileName
let isOwned: VideoMethods.IsOwned
let toFormatedJSON: VideoMethods.ToFormatedJSON
let toFormattedJSON: VideoMethods.ToFormattedJSON
let toAddRemoteJSON: VideoMethods.ToAddRemoteJSON
let toUpdateRemoteJSON: VideoMethods.ToUpdateRemoteJSON
let transcodeVideofile: VideoMethods.TranscodeVideofile
@ -257,7 +257,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
removeThumbnail,
removeTorrent,
toAddRemoteJSON,
toFormatedJSON,
toFormattedJSON,
toUpdateRemoteJSON,
transcodeVideofile
]
@ -414,7 +414,7 @@ generateMagnetUri = function (this: VideoInstance, videoFile: VideoFileInstance)
return magnetUtil.encode(magnetHash)
}
toFormatedJSON = function (this: VideoInstance) {
toFormattedJSON = function (this: VideoInstance) {
let podHost
if (this.Author.Pod) {