Merge branch 'master' into better-modal

badges · Jan 11, 2019 · ff37c71 · ff37c71
2 parents 9cc1d9c + da12f00
commit ff37c71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/services/bstats/bstats-players.service.js b/services/bstats/bstats-players.service.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const BaseJsonService = require('../base-json')
+const { metric } = require('../../lib/text-formatters')
 
 const Joi = require('joi')
 const schema = Joi.array()
@@ -49,7 +50,7 @@ module.exports = class BStatsPlayers extends BaseJsonService {
 
   static render({ players }) {
     return {
-      message: players,
+      message: metric(players),
     }
   }
 

diff --git a/services/bstats/bstats-players.tester.js b/services/bstats/bstats-players.tester.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
+const { isMetric } = require('../test-validators')
 
 const t = (module.exports = require('../create-service-tester')())
 
@@ -9,6 +10,6 @@ t.create('Players')
   .expectJSONTypes(
     Joi.object().keys({
       name: 'players',
-      value: Joi.number(),
+      value: isMetric,
     })
   )
diff --git a/services/bstats/bstats-servers.service.js b/services/bstats/bstats-servers.service.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const BaseJsonService = require('../base-json')
+const { metric } = require('../../lib/text-formatters')
 
 const Joi = require('joi')
 const schema = Joi.array()
@@ -49,7 +50,7 @@ module.exports = class BStatsServers extends BaseJsonService {
 
   static render({ servers }) {
     return {
-      message: servers,
+      message: metric(servers),
     }
   }
 

diff --git a/services/bstats/bstats-servers.tester.js b/services/bstats/bstats-servers.tester.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
+const { isMetric } = require('../test-validators')
 
 const t = (module.exports = require('../create-service-tester')())
 
@@ -9,6 +10,6 @@ t.create('Servers')
   .expectJSONTypes(
     Joi.object().keys({
       name: 'servers',
-      value: Joi.number(),
+      value: isMetric,
     })
   )