diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
| commit | a24bd1ed41b43790bab6ba789580bb4e85f07d85 (patch) | |
| tree | a54b0f6c921ba83a6e909cd0ced325b2d4b8863c /server/controllers/api/videos/watching.ts | |
| parent | 5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565 (diff) | |
| parent | c63830f15403ac4e750829f27d8bbbdc9a59282c (diff) | |
| download | PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.gz PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.zst PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.zip | |
Merge branch 'next' into develop
Diffstat (limited to 'server/controllers/api/videos/watching.ts')
| -rw-r--r-- | server/controllers/api/videos/watching.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/api/videos/watching.ts b/server/controllers/api/videos/watching.ts index 8b15525aa..05c75e543 100644 --- a/server/controllers/api/videos/watching.ts +++ b/server/controllers/api/videos/watching.ts | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | import * as express from 'express' | 1 | import * as express from 'express' |
| 2 | import { UserWatchingVideo } from '../../../../shared' | 2 | import { UserWatchingVideo } from '../../../../shared' |
| 3 | import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' | ||
| 3 | import { | 4 | import { |
| 4 | asyncMiddleware, | 5 | asyncMiddleware, |
| 5 | asyncRetryTransactionMiddleware, | 6 | asyncRetryTransactionMiddleware, |
| @@ -8,7 +9,6 @@ import { | |||
| 8 | videoWatchingValidator | 9 | videoWatchingValidator |
| 9 | } from '../../../middlewares' | 10 | } from '../../../middlewares' |
| 10 | import { UserVideoHistoryModel } from '../../../models/user/user-video-history' | 11 | import { UserVideoHistoryModel } from '../../../models/user/user-video-history' |
| 11 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | ||
| 12 | 12 | ||
| 13 | const watchingRouter = express.Router() | 13 | const watchingRouter = express.Router() |
| 14 | 14 | ||