Fix aot build

pull/200/head
Chocobozzz 2018-01-09 17:22:26 +01:00
parent 234b535dac
commit ca309a9f64
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 18 additions and 22 deletions

View File

@ -57,7 +57,7 @@
"markdown-it": "^8.4.0",
"ngx-bootstrap": "2.0.0-rc.0",
"ngx-chips": "1.6.2",
"ngx-clipboard": "^9.0.0",
"ngx-clipboard": "9.0.1",
"ngx-infinite-scroll": "0.7.2",
"ngx-pipes": "^2.0.5",
"node-sass": "^4.1.1",

View File

@ -64,7 +64,7 @@
<div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()">
Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br />
In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
At most, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
</div>
</div>

View File

@ -8,6 +8,11 @@
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"**/*.spec.ts",
"../node_modules/ngx-clipboard/**/*.spec.ts"
],
"include": [
"**/*.ts",
"../node_modules/ngx-clipboard/*/**.ts"
]
}

View File

@ -1,16 +0,0 @@
switch (process.env.NODE_ENV) {
case 'prod':
case 'production':
module.exports = require('./webpack/webpack.prod')({env: 'production'})
break
case 'test':
case 'testing':
module.exports = require('./webpack/webpack.test')({env: 'test'})
break
case 'dev':
case 'development':
default:
module.exports = require('./webpack/webpack.dev')({env: 'development'})
}

View File

@ -4444,7 +4444,7 @@ ngx-chips@1.6.2:
dependencies:
ng2-material-dropdown "~0.8.2"
ngx-clipboard@^9.0.0:
ngx-clipboard@9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-9.0.1.tgz#3829ef67d00a447303af4faf96c705de435d80f8"
dependencies:

View File

@ -190,14 +190,21 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
}
static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Sequelize.Transaction) {
return ActorFollowModel.createListAcceptedFollowForApiQuery('followers', actorIds, t, undefined, undefined, 'sharedInboxUrl')
return ActorFollowModel.createListAcceptedFollowForApiQuery(
'DISTINCT(followers)',
actorIds,
t,
undefined,
undefined,
'sharedInboxUrl'
)
}
static listAcceptedFollowingUrlsForApi (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
return ActorFollowModel.createListAcceptedFollowForApiQuery('following', actorIds, t, start, count)
}
private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following',
private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following' | 'DISTINCT(followers)',
actorIds: number[],
t: Sequelize.Transaction,
start?: number,