diff options
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/activitypub/objects/dislike-object.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/video-rate.type.ts | 2 | ||||
-rw-r--r-- | shared/utils/index.ts | 2 | ||||
-rw-r--r-- | shared/utils/server/servers.ts | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/shared/models/activitypub/objects/dislike-object.ts b/shared/models/activitypub/objects/dislike-object.ts index 295175774..7218fb784 100644 --- a/shared/models/activitypub/objects/dislike-object.ts +++ b/shared/models/activitypub/objects/dislike-object.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | export interface DislikeObject { | 1 | export interface DislikeObject { |
2 | type: 'Dislike', | 2 | id: string |
3 | type: 'Dislike' | ||
3 | actor: string | 4 | actor: string |
4 | object: string | 5 | object: string |
5 | } | 6 | } |
diff --git a/shared/models/videos/video-rate.type.ts b/shared/models/videos/video-rate.type.ts index 17aaba5a5..d48774a4b 100644 --- a/shared/models/videos/video-rate.type.ts +++ b/shared/models/videos/video-rate.type.ts | |||
@@ -1 +1 @@ | |||
export type VideoRateType = 'like' | 'dislike' | 'none' | export type VideoRateType = 'like' | 'dislike' | ||
diff --git a/shared/utils/index.ts b/shared/utils/index.ts index 897389824..905d93823 100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts | |||
@@ -4,8 +4,10 @@ export * from './server/clients' | |||
4 | export * from './server/config' | 4 | export * from './server/config' |
5 | export * from './users/login' | 5 | export * from './users/login' |
6 | export * from './miscs/miscs' | 6 | export * from './miscs/miscs' |
7 | export * from './miscs/stubs' | ||
7 | export * from './server/follows' | 8 | export * from './server/follows' |
8 | export * from './requests/requests' | 9 | export * from './requests/requests' |
10 | export * from './requests/activitypub' | ||
9 | export * from './server/servers' | 11 | export * from './server/servers' |
10 | export * from './videos/services' | 12 | export * from './videos/services' |
11 | export * from './users/users' | 13 | export * from './users/users' |
diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts index 3c946db27..f358a21f1 100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts | |||
@@ -69,7 +69,7 @@ function flushTests () { | |||
69 | }) | 69 | }) |
70 | } | 70 | } |
71 | 71 | ||
72 | function runServer (serverNumber: number, configOverride?: Object) { | 72 | function runServer (serverNumber: number, configOverride?: Object, args = []) { |
73 | const server: ServerInfo = { | 73 | const server: ServerInfo = { |
74 | app: null, | 74 | app: null, |
75 | serverNumber: serverNumber, | 75 | serverNumber: serverNumber, |
@@ -115,7 +115,7 @@ function runServer (serverNumber: number, configOverride?: Object) { | |||
115 | } | 115 | } |
116 | 116 | ||
117 | return new Promise<ServerInfo>(res => { | 117 | return new Promise<ServerInfo>(res => { |
118 | server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), [], options) | 118 | server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), args, options) |
119 | server.app.stdout.on('data', function onStdout (data) { | 119 | server.app.stdout.on('data', function onStdout (data) { |
120 | let dontContinue = false | 120 | let dontContinue = false |
121 | 121 | ||