Stringify and trim whitespace from a few services (#7880)

services/gem/gem-owner.service.js

@@ -1,5 +1,6 @@
 import Joi from 'joi'
 import { floorCount as floorCountColor } from '../color-formatters.js'
+import { metric } from '../text-formatters.js'
 import { BaseJsonService } from '../index.js'
 
 const ownerSchema = Joi.array().required()
@@ -20,7 +21,7 @@ export default class GemOwner extends BaseJsonService {
 
   static render({ count }) {
     return {
-      message: count,
+      message: metric(count),
       color: floorCountColor(count, 10, 50, 100),
     }
   }

services/github/github-issues.service.js

@@ -307,7 +307,9 @@ export default class GithubIssues extends GithubAuthV4Service {
 
     return {
       label: `${labelPrefix}${labelText}${labelSuffix}`,
-      message: `${metric(issueCount)} ${messageSuffix}`,
+      message: `${metric(issueCount)}${
+        messageSuffix ? ' ' : ''
+      }${messageSuffix}`,
       color: issueCount > 0 ? 'yellow' : 'brightgreen',
     }
   }

services/github/github-milestone-detail.service.js

@@ -75,7 +75,7 @@ export default class GithubMilestoneDetail extends GithubAuthV3Service {
     }
 
     return {
-      label: `${milestone.title} ${label}`,
+      label: `${milestone.title}${label ? ' ' : ''}${label}`,
       message: metric(milestoneMetric),
       color,
     }

services/github/github-milestone.service.js

@@ -43,7 +43,7 @@ export default class GithubMilestone extends GithubAuthV3Service {
   static render({ user, repo, variant, milestones }) {
     const milestoneLength = milestones.length
     let color
-    let label = ''
+    let qualifier = ''
 
     switch (variant) {
       case 'all':
@@ -51,16 +51,16 @@ export default class GithubMilestone extends GithubAuthV3Service {
         break
       case 'open':
         color = 'red'
-        label = 'active'
+        qualifier = 'active'
         break
       case 'closed':
         color = 'green'
-        label = 'completed'
+        qualifier = 'completed'
         break
     }
 
     return {
-      label: `${label} milestones`,
+      label: `${qualifier}${qualifier ? ' ' : ''}milestones`,
       message: metric(milestoneLength),
       color,
     }

services/opencollective/opencollective-base.js

@@ -1,6 +1,7 @@
 import Joi from 'joi'
 import { nonNegativeInteger } from '../validators.js'
 import { BaseJsonService } from '../index.js'
+import { metric } from '../text-formatters.js'
 
 // https://developer.opencollective.com/#/api/collectives?id=get-info
 const collectiveDetailsSchema = Joi.object().keys({
@@ -30,12 +31,11 @@ export default class OpencollectiveBase extends BaseJsonService {
   }
 
   static render(backersCount, label) {
-    const badge = {
-      message: backersCount,
+    return {
+      label,
+      message: metric(backersCount),
       color: backersCount > 0 ? 'brightgreen' : 'lightgrey',
     }
-    if (label) badge.label = label
-    return badge
   }
 
   async fetchCollectiveInfo(collective) {

services/swagger/swagger.service.js

@@ -69,7 +69,7 @@ export default class SwaggerValidatorService extends BaseJsonService {
     } else if (valMessages.length === 1) {
       const { message, level } = valMessages[0]
       if (level === 'error' && message === `Can't read from file ${specUrl}`) {
-        throw new NotFound({ prettyMessage: 'spec not found or unreadable ' })
+        throw new NotFound({ prettyMessage: 'spec not found or unreadable' })
       }
     }
     if (valMessages.every(msg => msg.level === 'warning')) {