diff options
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/live-manager.ts | 2 | ||||
-rw-r--r-- | server/lib/moderation.ts | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts index 9a2914cc5..ef9377e43 100644 --- a/server/lib/live-manager.ts +++ b/server/lib/live-manager.ts | |||
@@ -118,7 +118,7 @@ class LiveManager { | |||
118 | } | 118 | } |
119 | 119 | ||
120 | run () { | 120 | run () { |
121 | logger.info('Running RTMP server.') | 121 | logger.info('Running RTMP server on port %d', config.rtmp.port) |
122 | 122 | ||
123 | this.rtmpServer = new NodeRtmpServer(config) | 123 | this.rtmpServer = new NodeRtmpServer(config) |
124 | this.rtmpServer.run() | 124 | this.rtmpServer.run() |
diff --git a/server/lib/moderation.ts b/server/lib/moderation.ts index 0ef26d53d..0ace2d021 100644 --- a/server/lib/moderation.ts +++ b/server/lib/moderation.ts | |||
@@ -20,7 +20,7 @@ import { | |||
20 | import { ActivityCreate } from '../../shared/models/activitypub' | 20 | import { ActivityCreate } from '../../shared/models/activitypub' |
21 | import { VideoObject } from '../../shared/models/activitypub/objects' | 21 | import { VideoObject } from '../../shared/models/activitypub/objects' |
22 | import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object' | 22 | import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object' |
23 | import { VideoCreate, VideoImportCreate } from '../../shared/models/videos' | 23 | import { LiveVideoCreate, VideoCreate, VideoImportCreate } from '../../shared/models/videos' |
24 | import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model' | 24 | import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model' |
25 | import { UserModel } from '../models/account/user' | 25 | import { UserModel } from '../models/account/user' |
26 | import { ActorModel } from '../models/activitypub/actor' | 26 | import { ActorModel } from '../models/activitypub/actor' |
@@ -43,6 +43,13 @@ function isLocalVideoAccepted (object: { | |||
43 | return { accepted: true } | 43 | return { accepted: true } |
44 | } | 44 | } |
45 | 45 | ||
46 | function isLocalLiveVideoAccepted (object: { | ||
47 | liveVideoBody: LiveVideoCreate | ||
48 | user: UserModel | ||
49 | }): AcceptResult { | ||
50 | return { accepted: true } | ||
51 | } | ||
52 | |||
46 | function isLocalVideoThreadAccepted (_object: { | 53 | function isLocalVideoThreadAccepted (_object: { |
47 | commentBody: VideoCommentCreate | 54 | commentBody: VideoCommentCreate |
48 | video: VideoModel | 55 | video: VideoModel |
@@ -175,6 +182,8 @@ function createAccountAbuse (options: { | |||
175 | } | 182 | } |
176 | 183 | ||
177 | export { | 184 | export { |
185 | isLocalLiveVideoAccepted, | ||
186 | |||
178 | isLocalVideoAccepted, | 187 | isLocalVideoAccepted, |
179 | isLocalVideoThreadAccepted, | 188 | isLocalVideoThreadAccepted, |
180 | isRemoteVideoAccepted, | 189 | isRemoteVideoAccepted, |