From d7a25329f9e607894d29ab342b9cb66638b56dc0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 15 Nov 2019 15:06:03 +0100
Subject: Add ability to disable webtorrent

In favour of HLS
---
 server/typings/models/user/index.d.ts | 4 ----
 server/typings/models/user/index.ts   | 4 ++++
 server/typings/models/user/user.ts    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 server/typings/models/user/index.d.ts
 create mode 100644 server/typings/models/user/index.ts

(limited to 'server/typings/models/user')

diff --git a/server/typings/models/user/index.d.ts b/server/typings/models/user/index.d.ts
deleted file mode 100644
index 6657b2128..000000000
--- a/server/typings/models/user/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './user'
-export * from './user-notification'
-export * from './user-notification-setting'
-export * from './user-video-history'
diff --git a/server/typings/models/user/index.ts b/server/typings/models/user/index.ts
new file mode 100644
index 000000000..6657b2128
--- /dev/null
+++ b/server/typings/models/user/index.ts
@@ -0,0 +1,4 @@
+export * from './user'
+export * from './user-notification'
+export * from './user-notification-setting'
+export * from './user-video-history'
diff --git a/server/typings/models/user/user.ts b/server/typings/models/user/user.ts
index 52d6d4a05..a2750adc7 100644
--- a/server/typings/models/user/user.ts
+++ b/server/typings/models/user/user.ts
@@ -11,7 +11,7 @@ import {
 } from '../account'
 import { MNotificationSetting, MNotificationSettingFormattable } from './user-notification-setting'
 import { AccountModel } from '@server/models/account/account'
-import { MChannelFormattable } from '@server/typings/models'
+import { MChannelFormattable } from '../video/video-channels'
 
 type Use<K extends keyof UserModel, M> = PickWith<UserModel, K, M>
 
-- 
cgit v1.2.3