diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/user/user.ts | 3 | ||||
-rw-r--r-- | server/models/video/video.ts | 3 |
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 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { getSort } from '../utils' | 4 | import { getSort, addMethodsToModel } from '../utils' |
5 | import { | 5 | import { |
6 | cryptPassword, | 6 | cryptPassword, |
7 | comparePassword, | 7 | comparePassword, |
@@ -13,7 +13,6 @@ import { | |||
13 | } from '../../helpers' | 13 | } from '../../helpers' |
14 | import { UserRight, USER_ROLE_LABELS, hasUserRight } from '../../../shared' | 14 | import { UserRight, USER_ROLE_LABELS, hasUserRight } from '../../../shared' |
15 | 15 | ||
16 | import { addMethodsToModel } from '../utils' | ||
17 | import { | 16 | import { |
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 @@ | |||
1 | import * as safeBuffer from 'safe-buffer' | 1 | import * as safeBuffer from 'safe-buffer' |
2 | const Buffer = safeBuffer.Buffer | 2 | const Buffer = safeBuffer.Buffer |
3 | import * as magnetUtil from 'magnet-uri' | 3 | import * as magnetUtil from 'magnet-uri' |
4 | import { map } from 'lodash' | 4 | import { map, maxBy, truncate } from 'lodash' |
5 | import * as parseTorrent from 'parse-torrent' | 5 | import * as parseTorrent from 'parse-torrent' |
6 | import { join } from 'path' | 6 | import { join } from 'path' |
7 | import * as Sequelize from 'sequelize' | 7 | import * as Sequelize from 'sequelize' |
8 | import * as Promise from 'bluebird' | 8 | import * as Promise from 'bluebird' |
9 | import { maxBy, truncate } from 'lodash' | ||
10 | 9 | ||
11 | import { TagInstance } from './tag-interface' | 10 | import { TagInstance } from './tag-interface' |
12 | import { | 11 | import { |