aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
Diffstat (limited to 'server/models')
-rw-r--r--server/models/user/user.ts3
-rw-r--r--server/models/video/video.ts3
2 files changed, 2 insertions, 4 deletions
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index 3c625e450..c1e7abea6 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -1,7 +1,7 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import * as Promise from 'bluebird' 2import * as Promise from 'bluebird'
3 3
4import { getSort } from '../utils' 4import { getSort, addMethodsToModel } from '../utils'
5import { 5import {
6 cryptPassword, 6 cryptPassword,
7 comparePassword, 7 comparePassword,
@@ -13,7 +13,6 @@ import {
13} from '../../helpers' 13} from '../../helpers'
14import { UserRight, USER_ROLE_LABELS, hasUserRight } from '../../../shared' 14import { UserRight, USER_ROLE_LABELS, hasUserRight } from '../../../shared'
15 15
16import { addMethodsToModel } from '../utils'
17import { 16import {
18 UserInstance, 17 UserInstance,
19 UserAttributes, 18 UserAttributes,
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 2c1bd6b6e..02dde1726 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1,12 +1,11 @@
1import * as safeBuffer from 'safe-buffer' 1import * as safeBuffer from 'safe-buffer'
2const Buffer = safeBuffer.Buffer 2const Buffer = safeBuffer.Buffer
3import * as magnetUtil from 'magnet-uri' 3import * as magnetUtil from 'magnet-uri'
4import { map } from 'lodash' 4import { map, maxBy, truncate } from 'lodash'
5import * as parseTorrent from 'parse-torrent' 5import * as parseTorrent from 'parse-torrent'
6import { join } from 'path' 6import { join } from 'path'
7import * as Sequelize from 'sequelize' 7import * as Sequelize from 'sequelize'
8import * as Promise from 'bluebird' 8import * as Promise from 'bluebird'
9import { maxBy, truncate } from 'lodash'
10 9
11import { TagInstance } from './tag-interface' 10import { TagInstance } from './tag-interface'
12import { 11import {