aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-09 17:22:26 +0100
committerChocobozzz <me@florianbigard.com>2018-01-09 17:22:26 +0100
commitca309a9f6492f340295fee010ffa6dcc63fd76b4 (patch)
treecece9d0a20b4ebec3818cc219827209fd261021b
parent234b535dacdeacfacd7ac5601e53b6b7d923ca00 (diff)
downloadPeerTube-ca309a9f6492f340295fee010ffa6dcc63fd76b4.tar.gz
PeerTube-ca309a9f6492f340295fee010ffa6dcc63fd76b4.tar.zst
PeerTube-ca309a9f6492f340295fee010ffa6dcc63fd76b4.zip
Fix aot build
-rw-r--r--client/package.json2
-rw-r--r--client/src/app/+admin/users/user-edit/user-edit.component.html2
-rw-r--r--client/src/tsconfig.app.json7
-rw-r--r--client/webpack.config.js16
-rw-r--r--client/yarn.lock2
-rw-r--r--server/models/activitypub/actor-follow.ts11
6 files changed, 18 insertions, 22 deletions
diff --git a/client/package.json b/client/package.json
index 2d86d91fe..ad07f31b0 100644
--- a/client/package.json
+++ b/client/package.json
@@ -57,7 +57,7 @@
57 "markdown-it": "^8.4.0", 57 "markdown-it": "^8.4.0",
58 "ngx-bootstrap": "2.0.0-rc.0", 58 "ngx-bootstrap": "2.0.0-rc.0",
59 "ngx-chips": "1.6.2", 59 "ngx-chips": "1.6.2",
60 "ngx-clipboard": "^9.0.0", 60 "ngx-clipboard": "9.0.1",
61 "ngx-infinite-scroll": "0.7.2", 61 "ngx-infinite-scroll": "0.7.2",
62 "ngx-pipes": "^2.0.5", 62 "ngx-pipes": "^2.0.5",
63 "node-sass": "^4.1.1", 63 "node-sass": "^4.1.1",
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index a69ffee77..a68dd231b 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -64,7 +64,7 @@
64 64
65 <div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()"> 65 <div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()">
66 Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br /> 66 Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br />
67 In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}. 67 At most, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
68 </div> 68 </div>
69 </div> 69 </div>
70 70
diff --git a/client/src/tsconfig.app.json b/client/src/tsconfig.app.json
index 39ba8dbac..4339f4d4b 100644
--- a/client/src/tsconfig.app.json
+++ b/client/src/tsconfig.app.json
@@ -8,6 +8,11 @@
8 }, 8 },
9 "exclude": [ 9 "exclude": [
10 "test.ts", 10 "test.ts",
11 "**/*.spec.ts" 11 "**/*.spec.ts",
12 "../node_modules/ngx-clipboard/**/*.spec.ts"
13 ],
14 "include": [
15 "**/*.ts",
16 "../node_modules/ngx-clipboard/*/**.ts"
12 ] 17 ]
13} 18}
diff --git a/client/webpack.config.js b/client/webpack.config.js
deleted file mode 100644
index b51057c65..000000000
--- a/client/webpack.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
1switch (process.env.NODE_ENV) {
2 case 'prod':
3 case 'production':
4 module.exports = require('./webpack/webpack.prod')({env: 'production'})
5 break
6
7 case 'test':
8 case 'testing':
9 module.exports = require('./webpack/webpack.test')({env: 'test'})
10 break
11
12 case 'dev':
13 case 'development':
14 default:
15 module.exports = require('./webpack/webpack.dev')({env: 'development'})
16}
diff --git a/client/yarn.lock b/client/yarn.lock
index 062893f90..44d84beaa 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4444,7 +4444,7 @@ ngx-chips@1.6.2:
4444 dependencies: 4444 dependencies:
4445 ng2-material-dropdown "~0.8.2" 4445 ng2-material-dropdown "~0.8.2"
4446 4446
4447ngx-clipboard@^9.0.0: 4447ngx-clipboard@9.0.1:
4448 version "9.0.1" 4448 version "9.0.1"
4449 resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-9.0.1.tgz#3829ef67d00a447303af4faf96c705de435d80f8" 4449 resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-9.0.1.tgz#3829ef67d00a447303af4faf96c705de435d80f8"
4450 dependencies: 4450 dependencies:
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 4cba05e95..c35c712ed 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -190,14 +190,21 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
190 } 190 }
191 191
192 static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Sequelize.Transaction) { 192 static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Sequelize.Transaction) {
193 return ActorFollowModel.createListAcceptedFollowForApiQuery('followers', actorIds, t, undefined, undefined, 'sharedInboxUrl') 193 return ActorFollowModel.createListAcceptedFollowForApiQuery(
194 'DISTINCT(followers)',
195 actorIds,
196 t,
197 undefined,
198 undefined,
199 'sharedInboxUrl'
200 )
194 } 201 }
195 202
196 static listAcceptedFollowingUrlsForApi (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) { 203 static listAcceptedFollowingUrlsForApi (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
197 return ActorFollowModel.createListAcceptedFollowForApiQuery('following', actorIds, t, start, count) 204 return ActorFollowModel.createListAcceptedFollowForApiQuery('following', actorIds, t, start, count)
198 } 205 }
199 206
200 private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following', 207 private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following' | 'DISTINCT(followers)',
201 actorIds: number[], 208 actorIds: number[],
202 t: Sequelize.Transaction, 209 t: Sequelize.Transaction,
203 start?: number, 210 start?: number,