diff --git a/.eslintrc.yml b/.eslintrc.yml index bb9ff0a86dc97899b5202d117bd56d86547bd90c..09c32d7415e4cc7aa2145302e2c24eb97a4408cd 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -35,6 +35,7 @@ rules: strict: "error" arrow-body-style: ["error", "as-needed"] no-extension-in-require/main: "error" + object-shorthand: ["error", "properties"] # Mocha-related. mocha/no-exclusive-tests: "error" diff --git a/frontend/components/examples-page.js b/frontend/components/examples-page.js index a660330590cfe7ec10dfb073390d180c7f4f1a8c..1fe3bf4e2cdb9aed18b3bafc44415ebd7bb671b6 100644 --- a/frontend/components/examples-page.js +++ b/frontend/components/examples-page.js @@ -43,7 +43,7 @@ export default class ExamplesPage extends React.Component { this.searchTimeout = window.setTimeout(() => { this.setState({ searchReady: true, - query: query, + query, }) }, 500) } diff --git a/lib/badge-cli.js b/lib/badge-cli.js index 7dd2b1fac4a0d375cd296eef715ea40439f9a03b..946b8de087045b33aea1050c51caea20bdf65c2f 100755 --- a/lib/badge-cli.js +++ b/lib/badge-cli.js @@ -52,7 +52,7 @@ const status = process.argv[3] let color = process.argv[4] || ':green' const colorA = process.argv[5] -const badgeData = { text: [subject, status], format: format } +const badgeData = { text: [subject, status], format } if (style) { badgeData.template = style } diff --git a/lib/github-auth.js b/lib/github-auth.js index 87ca171ffa9264cc7e66a6878fa6e900fab3514e..81f3a63587eb213640668a7f4b89f49c2e59be3e 100644 --- a/lib/github-auth.js +++ b/lib/github-auth.js @@ -129,7 +129,7 @@ function sendTokenToAllServers(token) { method: 'POST', form: { shieldsSecret: serverSecrets.shieldsSecret, - token: token, + token, }, // We target servers by IP, and we use HTTPS. Assuming that // 1. Internet routers aren't hacked, and @@ -311,7 +311,7 @@ function githubRequest(request, url, query, cb) { url += '?' + qs } - request(url, { headers: headers }, (err, res, buffer) => { + request(url, { headers }, (err, res, buffer) => { if (globalToken !== null && githubToken !== null && err === null) { if (res.statusCode === 401) { // Unauthorized. diff --git a/lib/request-handler.js b/lib/request-handler.js index aa93684ecd9ea3cc846344d786e2f599a19f3c2e..e4d6e4ca9f584e3885798025a717aa82fffa8b5d 100644 --- a/lib/request-handler.js +++ b/lib/request-handler.js @@ -180,7 +180,7 @@ function handleRequest(makeBadge, handlerOptions) { if (options && typeof options === 'object') { options.uri = uri } else if (typeof uri === 'string') { - options = { uri: uri } + options = { uri } } else { options = uri } @@ -247,7 +247,7 @@ function handleRequest(makeBadge, handlerOptions) { : 1, time: +reqTime, interval: cacheInterval, - data: { format: format, badgeData: badgeData }, + data: { format, badgeData }, } requestCache.set(cacheIndex, updatedCache) if (!cachedVersionSent) { diff --git a/services/aur/aur.service.js b/services/aur/aur.service.js index f6fa4bfd18c121cc891277fe156790c132377fd8..9ce017a3d4f4f4d0342e85501f512879a2b6a3fe 100644 --- a/services/aur/aur.service.js +++ b/services/aur/aur.service.js @@ -127,7 +127,7 @@ class AurVotes extends BaseAurService { class AurVersion extends BaseAurService { static render({ version, outOfDate }) { const color = outOfDate === null ? 'blue' : 'orange' - return { message: versionText(version), color: color } + return { message: versionText(version), color } } async handle({ pkg }) { diff --git a/services/gem/gem-downloads.service.js b/services/gem/gem-downloads.service.js index c2607d42d4348947d29d7cb51789a0bddfe65e4a..7cde3e714de1dad14e9583c7ea674fa41abc60a0 100644 --- a/services/gem/gem-downloads.service.js +++ b/services/gem/gem-downloads.service.js @@ -41,7 +41,7 @@ module.exports = class GemDownloads extends BaseJsonService { static render({ label, downloads }) { return { - label: label, + label, message: metric(downloads), color: downloadCountColor(downloads), } diff --git a/services/gem/gem-rank.service.js b/services/gem/gem-rank.service.js index bd73c8f7265283a80b49a524245ffb71be58c235..9372d62c4567c6c5dd9c317e7afd4b4aa18e18b8 100644 --- a/services/gem/gem-rank.service.js +++ b/services/gem/gem-rank.service.js @@ -41,7 +41,7 @@ module.exports = class GemRank extends BaseJsonService { let message = ordinalNumber(rank) message += period === 'rt' ? '' : ' daily' return { - message: message, + message, color: floorCountColor(count, 10, 50, 100), } } diff --git a/services/hexpm/hexpm.service.js b/services/hexpm/hexpm.service.js index 6c02d085326dd952200201bd10c905e0a27d9a7f..31e8e035d4e449392453e7cee8a5d1ad90655fc7 100644 --- a/services/hexpm/hexpm.service.js +++ b/services/hexpm/hexpm.service.js @@ -162,7 +162,7 @@ function DownloadsForInterval(interval) { static get url() { return { - base: base, + base, format: '(.+)', capture: ['pkg'], } diff --git a/services/imagelayers/imagelayers.service.js b/services/imagelayers/imagelayers.service.js index 68dea5cced0c00bbfc81410a9ac4c2cccc4d7ca2..10b37cc831faa085ed485d3f3cab73b57be1a26c 100644 --- a/services/imagelayers/imagelayers.service.js +++ b/services/imagelayers/imagelayers.service.js @@ -49,7 +49,7 @@ module.exports = class Imagelayers extends LegacyService { method: 'POST', json: true, body: { - repos: [{ name: path, tag: tag }], + repos: [{ name: path, tag }], }, uri: 'https://imagelayers.io/registry/analyze', } diff --git a/services/jenkins/jenkins-plugin-installs.service.js b/services/jenkins/jenkins-plugin-installs.service.js index c024daa270ac4123315d1c09e2bb6c478688a425..6115a156a087fc748ebeaf97d3c984164db2b38f 100644 --- a/services/jenkins/jenkins-plugin-installs.service.js +++ b/services/jenkins/jenkins-plugin-installs.service.js @@ -43,7 +43,7 @@ class JenkinsPluginInstalls extends BaseJsonService { static render({ label, installs }) { return { - label: label, + label, message: metric(installs), color: downloadCountColor(installs), } diff --git a/services/librariesio/librariesio-dependencies.service.js b/services/librariesio/librariesio-dependencies.service.js index 37be97dbb5f735cbe7f2cdb230a8664a6a63dd30..e9ded30b944d69c6be2ca1293d53d5629590b194 100644 --- a/services/librariesio/librariesio-dependencies.service.js +++ b/services/librariesio/librariesio-dependencies.service.js @@ -51,7 +51,7 @@ module.exports = class LibrariesioDependencies extends LegacyService { } } - const options = { method: 'GET', json: true, uri: uri } + const options = { method: 'GET', json: true, uri } const badgeData = getBadgeData('dependencies', data) request(options, (err, res, json) => { diff --git a/services/requires/requires.service.js b/services/requires/requires.service.js index efb0aabc8215fde8668f20827181260887f34706..645336997577bbb2570f59c5316bca1ccb0574ed 100644 --- a/services/requires/requires.service.js +++ b/services/requires/requires.service.js @@ -30,7 +30,7 @@ module.exports = class RequiresIo extends BaseJsonService { return this._requestJson({ url, schema: statusSchema, - options: { qs: { branch: branch } }, + options: { qs: { branch } }, }) } diff --git a/services/steam/steam-base.js b/services/steam/steam-base.js index adc7f591742328d08c27926cc463a7a818b1e02e..15835fb8ae280f15f1ab4532cf1f17b9f4f09742 100644 --- a/services/steam/steam-base.js +++ b/services/steam/steam-base.js @@ -38,11 +38,11 @@ module.exports = class BaseSteamAPI extends BaseJsonService { const url = `https://api.steampowered.com/${interf}/${method}/v${version}/?format=json` return this._requestJson({ url, - schema: schema, + schema, errorMessages: { 400: 'bad request', }, - options: options, + options, }) } } diff --git a/services/steam/steam-workshop.service.js b/services/steam/steam-workshop.service.js index 21059e06cb099baace9ff8eea522018cb98a5277..d8ae59ad84d31164437e9fbab314ad1267fe8818 100644 --- a/services/steam/steam-workshop.service.js +++ b/services/steam/steam-workshop.service.js @@ -280,7 +280,7 @@ class SteamFileReleaseDate extends SteamFileService { async onRequest({ response }) { const releaseDate = new Date(0).setUTCSeconds(response.time_created) - return this.constructor.render({ releaseDate: releaseDate }) + return this.constructor.render({ releaseDate }) } static get defaultBadgeData() { diff --git a/services/swagger/swagger.service.js b/services/swagger/swagger.service.js index 0e4d98c523b87be66f08d2f6f27fd6a17dfee332..010e48cec7c0c02ad857fb7c8f7a82cbb3361b92 100644 --- a/services/swagger/swagger.service.js +++ b/services/swagger/swagger.service.js @@ -16,7 +16,7 @@ const validatorSchema = Joi.object() module.exports = class SwaggerValidatorService extends BaseJsonService { static render({ message, clr }) { - return { message: message, color: clr } + return { message, color: clr } } static get url() { diff --git a/services/wercker/wercker.service.js b/services/wercker/wercker.service.js index c24e243976f26e9af7acc00d63c6bb158ad2ce29..cdf6aa992ced0bafa77080d9c3aa331ce9c390b6 100644 --- a/services/wercker/wercker.service.js +++ b/services/wercker/wercker.service.js @@ -29,7 +29,7 @@ module.exports = class Wercker extends BaseJsonService { url: baseUrl, options: { qs: { - branch: branch, + branch, limit: 1, }, }, @@ -57,7 +57,7 @@ module.exports = class Wercker extends BaseJsonService { projectId, applicationName, }), - branch: branch, + branch, }) if (json.length === 0) { return this.constructor.render({ diff --git a/services/wordpress/wordpress-base.js b/services/wordpress/wordpress-base.js index c89bb2ce7e51ca17268d8883be5670d45cc3e3ef..b3c96b3cb9dc07097048b630e026bc818b9770cb 100644 --- a/services/wordpress/wordpress-base.js +++ b/services/wordpress/wordpress-base.js @@ -38,7 +38,7 @@ module.exports = class BaseWordpress extends BaseJsonService { qs: { action: `${this.constructor.extensionType}_information`, request: { - slug: slug, + slug, fields: { active_installs: 1, sections: 0, diff --git a/services/wordpress/wordpress-downloads.service.js b/services/wordpress/wordpress-downloads.service.js index 403c4e2447b3eed3948a71e7a771cc456f4873e3..d6cf6504856875e831de4585ee967c70b3e4c9bd 100644 --- a/services/wordpress/wordpress-downloads.service.js +++ b/services/wordpress/wordpress-downloads.service.js @@ -177,7 +177,7 @@ function DownloadsForInterval(interval) { url: `https://api.wordpress.org/stats/plugin/1.0/downloads.php`, options: { qs: { - slug: slug, + slug, limit: query, }, }, diff --git a/services/wordpress/wordpress-platform.service.js b/services/wordpress/wordpress-platform.service.js index 44e8ec424d248c1b7e323636c88035df4485165c..002a96fd2841eff7fe969dbdedd5367272cb5d6d 100644 --- a/services/wordpress/wordpress-platform.service.js +++ b/services/wordpress/wordpress-platform.service.js @@ -69,7 +69,7 @@ class WordpressPluginTestedVersion extends BaseWordpressPlatform { static render({ version, color }) { return { message: `${addv(version)} tested`, - color: color, + color, } }