aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-09 14:05:21 +0100
committerChocobozzz <me@florianbigard.com>2021-12-09 14:09:24 +0100
commit650580504cf14a87bd4025eec9673eb5642dc71d (patch)
treeae5dce55a9cbe8c392db4668bb599c74a17b241d /server
parenta554bc1a260a525cd635d62404b9fe76fdb9e36b (diff)
downloadPeerTube-650580504cf14a87bd4025eec9673eb5642dc71d.tar.gz
PeerTube-650580504cf14a87bd4025eec9673eb5642dc71d.tar.zst
PeerTube-650580504cf14a87bd4025eec9673eb5642dc71d.zip
Add filter:api.server.stats.get.result hook
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/server/stats.ts4
-rw-r--r--server/tests/fixtures/peertube-plugin-test/main.js7
-rw-r--r--server/tests/plugins/external-auth.ts2
-rw-r--r--server/tests/plugins/filter-hooks.ts10
4 files changed, 21 insertions, 2 deletions
diff --git a/server/controllers/api/server/stats.ts b/server/controllers/api/server/stats.ts
index d661144ca..2ab398f4d 100644
--- a/server/controllers/api/server/stats.ts
+++ b/server/controllers/api/server/stats.ts
@@ -3,6 +3,7 @@ import { StatsManager } from '@server/lib/stat-manager'
3import { ROUTE_CACHE_LIFETIME } from '../../../initializers/constants' 3import { ROUTE_CACHE_LIFETIME } from '../../../initializers/constants'
4import { asyncMiddleware } from '../../../middlewares' 4import { asyncMiddleware } from '../../../middlewares'
5import { cacheRoute } from '../../../middlewares/cache/cache' 5import { cacheRoute } from '../../../middlewares/cache/cache'
6import { Hooks } from '@server/lib/plugins/hooks'
6 7
7const statsRouter = express.Router() 8const statsRouter = express.Router()
8 9
@@ -12,7 +13,8 @@ statsRouter.get('/stats',
12) 13)
13 14
14async function getStats (_req: express.Request, res: express.Response) { 15async function getStats (_req: express.Request, res: express.Response) {
15 const data = await StatsManager.Instance.getStats() 16 let data = await StatsManager.Instance.getStats()
17 data = await Hooks.wrapObject(data, 'filter:api.server.stats.get.result')
16 18
17 return res.json(data) 19 return res.json(data)
18} 20}
diff --git a/server/tests/fixtures/peertube-plugin-test/main.js b/server/tests/fixtures/peertube-plugin-test/main.js
index db405ff31..aba415d1e 100644
--- a/server/tests/fixtures/peertube-plugin-test/main.js
+++ b/server/tests/fixtures/peertube-plugin-test/main.js
@@ -233,6 +233,13 @@ async function register ({ registerHook, registerSetting, settingsManager, stora
233 } 233 }
234 }) 234 })
235 235
236 registerHook({
237 target: 'filter:api.server.stats.get.result',
238 handler: (result) => {
239 return { ...result, customStats: 14 }
240 }
241 })
242
236 { 243 {
237 const filterHooks = [ 244 const filterHooks = [
238 'filter:api.search.videos.local.list.params', 245 'filter:api.search.videos.local.list.params',
diff --git a/server/tests/plugins/external-auth.ts b/server/tests/plugins/external-auth.ts
index f3e018d43..25b25bfee 100644
--- a/server/tests/plugins/external-auth.ts
+++ b/server/tests/plugins/external-auth.ts
@@ -125,7 +125,7 @@ describe('Test external auth plugins', function () {
125 expectedStatus: HttpStatusCode.BAD_REQUEST_400 125 expectedStatus: HttpStatusCode.BAD_REQUEST_400
126 }) 126 })
127 127
128 await server.servers.waitUntilLog('expired external auth token', 2) 128 await server.servers.waitUntilLog('expired external auth token', 4)
129 }) 129 })
130 130
131 it('Should auto login Cyan, create the user and use the token', async function () { 131 it('Should auto login Cyan, create the user and use the token', async function () {
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts
index 02915f08c..80014566b 100644
--- a/server/tests/plugins/filter-hooks.ts
+++ b/server/tests/plugins/filter-hooks.ts
@@ -537,6 +537,16 @@ describe('Test plugin filter hooks', function () {
537 }) 537 })
538 }) 538 })
539 539
540 describe('Stats filters', function () {
541
542 it('Should run filter:api.server.stats.get.result', async function () {
543 const data = await servers[0].stats.get()
544
545 expect((data as any).customStats).to.equal(14)
546 })
547
548 })
549
540 after(async function () { 550 after(async function () {
541 await cleanupTests(servers) 551 await cleanupTests(servers)
542 }) 552 })