diff options
Diffstat (limited to 'server/models/video/video-blacklist.ts')
-rw-r--r-- | server/models/video/video-blacklist.ts | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts index dc49852b6..1c279b1ba 100644 --- a/server/models/video/video-blacklist.ts +++ b/server/models/video/video-blacklist.ts | |||
@@ -1,6 +1,8 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | 2 | ||
3 | import { addMethodsToModel, getSort } from '../utils' | 3 | import { SortType } from '../../helpers' |
4 | import { addMethodsToModel, getSortOnModel } from '../utils' | ||
5 | import { VideoInstance } from './video-interface' | ||
4 | import { | 6 | import { |
5 | BlacklistedVideoInstance, | 7 | BlacklistedVideoInstance, |
6 | BlacklistedVideoAttributes, | 8 | BlacklistedVideoAttributes, |
@@ -49,10 +51,23 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da | |||
49 | // ------------------------------ METHODS ------------------------------ | 51 | // ------------------------------ METHODS ------------------------------ |
50 | 52 | ||
51 | toFormattedJSON = function (this: BlacklistedVideoInstance) { | 53 | toFormattedJSON = function (this: BlacklistedVideoInstance) { |
54 | let video: VideoInstance | ||
55 | |||
56 | video = this.Video | ||
57 | |||
52 | return { | 58 | return { |
53 | id: this.id, | 59 | id: this.id, |
54 | videoId: this.videoId, | 60 | videoId: this.videoId, |
55 | createdAt: this.createdAt | 61 | createdAt: this.createdAt, |
62 | updatedAt: this.updatedAt, | ||
63 | name: video.name, | ||
64 | uuid: video.uuid, | ||
65 | description: video.description, | ||
66 | duration: video.duration, | ||
67 | views: video.views, | ||
68 | likes: video.likes, | ||
69 | dislikes: video.dislikes, | ||
70 | nsfw: video.nsfw | ||
56 | } | 71 | } |
57 | } | 72 | } |
58 | 73 | ||
@@ -76,11 +91,12 @@ list = function () { | |||
76 | return BlacklistedVideo.findAll() | 91 | return BlacklistedVideo.findAll() |
77 | } | 92 | } |
78 | 93 | ||
79 | listForApi = function (start: number, count: number, sort: string) { | 94 | listForApi = function (start: number, count: number, sort: SortType) { |
80 | const query = { | 95 | const query = { |
81 | offset: start, | 96 | offset: start, |
82 | limit: count, | 97 | limit: count, |
83 | order: [ getSort(sort) ] | 98 | order: [ getSortOnModel(sort.sortModel, sort.sortValue) ], |
99 | include: [ { model: BlacklistedVideo['sequelize'].models.Video } ] | ||
84 | } | 100 | } |
85 | 101 | ||
86 | return BlacklistedVideo.findAndCountAll(query).then(({ rows, count }) => { | 102 | return BlacklistedVideo.findAndCountAll(query).then(({ rows, count }) => { |