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 @@
"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",
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 @@
Transcoding is enabled on server. The video quota only take in account original video.
- In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
+ At most, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
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 @@
},
"exclude": [
"test.ts",
- "**/*.spec.ts"
+ "**/*.spec.ts",
+ "../node_modules/ngx-clipboard/**/*.spec.ts"
+ ],
+ "include": [
+ "**/*.ts",
+ "../node_modules/ngx-clipboard/*/**.ts"
]
}
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 @@
-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'})
-}
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:
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:
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 {
}
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,