Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391986 )
Change subject: WIP: Fix eslint warnings
......................................................................
WIP: Fix eslint warnings
Bug: T151395
Change-Id: I718800cfc99a682986a4fb4faa0a4bbe1368a27a
---
M lib/EventProcessor.js
M lib/EventSource.js
M lib/score-pages.js
M routes/trending-v1.js
4 files changed, 23 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits
refs/changes/86/391986/1
diff --git a/lib/EventProcessor.js b/lib/EventProcessor.js
index 9bd734a..4d0b6be 100644
--- a/lib/EventProcessor.js
+++ b/lib/EventProcessor.js
@@ -1,6 +1,4 @@
"use strict";
-
-/* eslint-disable */
const EventEmitter = require('events').EventEmitter;
/**
@@ -8,7 +6,7 @@
*
* @ignore
* @param {Map} pages
- * @param {Number} id
+ * @param {number} id
*/
function remove(pages, id) {
pages.delete(id);
@@ -67,7 +65,7 @@
* Return page with id from the store
*
* @ignore
- * @param {Number} id of page
+ * @param {number} id of page
* @param {Object} page
*/
getPage(id) {
diff --git a/lib/EventSource.js b/lib/EventSource.js
index 34f9f33..2c82247 100644
--- a/lib/EventSource.js
+++ b/lib/EventSource.js
@@ -1,6 +1,5 @@
"use strict";
-/* eslint-disable */
const kafka = require('node-rdkafka');
const EventEmitter = require('events').EventEmitter;
const os = require('os');
diff --git a/lib/score-pages.js b/lib/score-pages.js
index a5891ee..09d9521 100644
--- a/lib/score-pages.js
+++ b/lib/score-pages.js
@@ -1,21 +1,20 @@
"use strict";
-/* eslint-disable */
-var scorer = require('wikipedia-edits-scorer');
+const scorer = require('wikipedia-edits-scorer');
/**
* Score and sort pages
* @param {Date} date
* @param {Array} pages
- * @param {Number} [halflife] greater than 0, which causes scores to decay
over time.
+ * @param {number} [halflife] greater than 0, which causes scores to decay
over time.
* Will default to 1.5 if none given.
* @return {Array}
*/
function scoreAndSortPages(date, pages, halflife) {
halflife = halflife || 1.5;
- pages.forEach(function(candidate) {
- var contrs = candidate.contributors;
+ pages.forEach((candidate) => {
+ const contrs = candidate.contributors;
candidate.score = scorer.calculateScore(
date,
{
@@ -30,7 +29,7 @@
halflife
);
});
- return pages.sort(function(p1, p2) {
+ return pages.sort((p1, p2) => {
return p1.score > p2.score ? -1 : 1;
});
}
diff --git a/routes/trending-v1.js b/routes/trending-v1.js
index aec72a6..01bbe82 100644
--- a/routes/trending-v1.js
+++ b/routes/trending-v1.js
@@ -1,41 +1,37 @@
'use strict';
-/* eslint-disable */
-var BBPromise = require('bluebird');
-var preq = require('preq');
-var domino = require('domino');
-var sUtil = require('../lib/util');
-var apiUtil = require('../lib/api-util');
-var filterPages = require('../lib/filter-pages');
-var scorePages = require('../lib/score-pages');
+
+const sUtil = require('../lib/util');
+const filterPages = require('../lib/filter-pages');
+const scorePages = require('../lib/score-pages');
// shortcut
-var HTTPError = sUtil.HTTPError;
+const HTTPError = sUtil.HTTPError;
/**
* The main router object
*/
-var router = sUtil.router();
+const router = sUtil.router();
/**
* The main application object reported when this module is require()d
*/
-var app;
+let app;
/**
/****************************
* TRENDING ENDPOINTS *
****************************/
-var ERROR_UNAVAILABLE = 'Trending is currently not available on this wiki.';
+const ERROR_UNAVAILABLE = 'Trending is currently not available on this wiki.';
function getRbPageSummaryUrl(domain, title) {
const request = app.restbase_tpl.expand({
request: {
params: {
- domain: domain,
- path: 'page/summary/' + encodeURIComponent(title) },
+ domain,
+ path: `page/summary/${encodeURIComponent(title)}` },
}
});
return request.uri;
@@ -45,7 +41,7 @@
* GET /feed/debug-trending-edits
* Debugging tools for private usage that expose the contents of the processor
*/
-router.get('/debug-trending-edits/:id?/:halflife?', function(req, res) {
+router.get('/debug-trending-edits/:id?/:halflife?', (req, res) => {
const processor = app.processor;
if (req.params.id) {
const page = processor.getPage(parseInt(req.params.id, 10));
@@ -75,7 +71,7 @@
* GET /feed/trending-edits
* Gets the body of a given page.
*/
-router.get('/trending-edits/:period?', function(req, res) {
+router.get('/trending-edits/:period?', (req, res) => {
const domain = req.params.domain;
const period = req.params.period ? parseInt(req.params.period, 10) : 24;
const date = new Date();
@@ -95,8 +91,9 @@
const data = {
timestamp: date,
// show the 20 scored top pages being edited
- pages: scorePages(date, filterPages(app.processor.getPages(),
conf), period).slice(0, conf.max_results)
- .map(function(page) {
+ pages: scorePages(date, filterPages(app.processor.getPages(),
conf), period)
+ .slice(0, conf.max_results)
+ .map((page) => {
return {
totalEdits: page.edits,
editors: page.contributors.total,
@@ -128,7 +125,7 @@
return {
path: '/feed',
api_version: 1,
- router: router
+ router
};
};
--
To view, visit https://gerrit.wikimedia.org/r/391986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I718800cfc99a682986a4fb4faa0a4bbe1368a27a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
