aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-08 10:46:41 +0100
committerChocobozzz <me@florianbigard.com>2018-01-08 10:46:41 +0100
commit28832412d145e3c36bcc62df79ef3af791535622 (patch)
treea408c88f8f634e1521b0bb07785d90bae111584b
parent76d36e0b355f41fb46709ba5e39c59b10087c6a9 (diff)
downloadPeerTube-28832412d145e3c36bcc62df79ef3af791535622.tar.gz
PeerTube-28832412d145e3c36bcc62df79ef3af791535622.tar.zst
PeerTube-28832412d145e3c36bcc62df79ef3af791535622.zip
Fix lint
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts2
-rw-r--r--server/lib/activitypub/process/process-create.ts1
2 files changed, 1 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 01e4bbf4a..a27cacba3 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -28,7 +28,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
28 @ViewChild('videoShareModal') videoShareModal: VideoShareComponent 28 @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
29 @ViewChild('videoReportModal') videoReportModal: VideoReportComponent 29 @ViewChild('videoReportModal') videoReportModal: VideoReportComponent
30 30
31 otherVideos: Video[] = []
32 otherVideosDisplayed: Video[] = [] 31 otherVideosDisplayed: Video[] = []
33 32
34 error = false 33 error = false
@@ -47,6 +46,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
47 videoHTMLDescription = '' 46 videoHTMLDescription = ''
48 likesBarTooltipText = '' 47 likesBarTooltipText = ''
49 48
49 private otherVideos: Video[] = []
50 private paramsSub: Subscription 50 private paramsSub: Subscription
51 51
52 constructor ( 52 constructor (
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index a97f6ae83..32be37e2d 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -13,7 +13,6 @@ import { VideoModel } from '../../../models/video/video'
13import { VideoAbuseModel } from '../../../models/video/video-abuse' 13import { VideoAbuseModel } from '../../../models/video/video-abuse'
14import { VideoCommentModel } from '../../../models/video/video-comment' 14import { VideoCommentModel } from '../../../models/video/video-comment'
15import { VideoFileModel } from '../../../models/video/video-file' 15import { VideoFileModel } from '../../../models/video/video-file'
16import { VideoShareModel } from '../../../models/video/video-share'
17import { getOrCreateActorAndServerAndModel } from '../actor' 16import { getOrCreateActorAndServerAndModel } from '../actor'
18import { forwardActivity, getActorsInvolvedInVideo } from '../send/misc' 17import { forwardActivity, getActorsInvolvedInVideo } from '../send/misc'
19import { generateThumbnailFromUrl } from '../videos' 18import { generateThumbnailFromUrl } from '../videos'