BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295452
Change subject: Hygiene: move getRevision and buildSummaryResponse to library
......................................................................
Hygiene: move getRevision and buildSummaryResponse to library
Going to use the two functions for random page functionality, too.
Don't need to pass in pageTitle to buildSummaryResponse since the
extract also includes it, making this function more generally applicable.
Change-Id: Ia652d88c050f1f6a6b07d7acae49117b46ef2f9b
---
M lib/feed/featured.js
M lib/mwapi.js
2 files changed, 17 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/52/295452/1
diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 9831d90..71c61ad 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -70,19 +70,6 @@
return extract;
}
-function getRevision(extractObj) {
- return extractObj.revisions[0].revid;
-}
-
-function buildResponse(pageTitle, extractPageObj) {
- return {
- title: pageTitle,
- thumbnail: extractPageObj.thumbnail,
- description: extractPageObj.terms &&
extractPageObj.terms.description[0],
- extract: extractPageObj.extract
- };
-}
-
function promise(app, req) {
if (req.params.domain.indexOf('en') !== 0) {
throw new HTTPError({
@@ -106,9 +93,9 @@
mwapi.checkForQueryPagesInResponse(req, extractResponse);
var extractPageObj = getPageObject(extractResponse, true);
return {
- payload: buildResponse(pageTitle, extractPageObj),
+ payload: mwapi.buildSummaryResponse(extractPageObj),
meta: {
- etag: tfaPageObj.pageid + '/' + getRevision(extractPageObj),
+ etag: tfaPageObj.pageid + '/' +
mwapi.getRevisionFromExtract(extractPageObj)
}
};
});
diff --git a/lib/mwapi.js b/lib/mwapi.js
index d1588f7..ba552d2 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -159,6 +159,19 @@
return api.mwApiGet(app, req.params.domain, query);
}
+function getRevisionFromExtract(extractObj) {
+ return extractObj.revisions[0].revid;
+}
+
+function buildSummaryResponse(extractObj) {
+ return {
+ title: extractObj.title,
+ thumbnail: extractObj.thumbnail,
+ description: extractObj.terms && extractObj.terms.description[0],
+ extract: extractObj.extract
+ };
+}
+
function requestMostReadMetadata(app, req, titlesList) {
var query = {
action: 'query',
@@ -227,6 +240,8 @@
checkForQueryPagesInResponse: checkForQueryPagesInResponse,
requestExtract: requestExtract,
requestExtractAndDescription: requestExtractAndDescription,
+ getRevisionFromExtract: getRevisionFromExtract,
+ buildSummaryResponse: buildSummaryResponse,
requestMostReadMetadata: requestMostReadMetadata,
API_QUERY_MAX_TITLES: API_QUERY_MAX_TITLES,
--
To view, visit https://gerrit.wikimedia.org/r/295452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia652d88c050f1f6a6b07d7acae49117b46ef2f9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
