jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327142 )
Change subject: mobile-sections: remove unnecessary TextExtract request
......................................................................
mobile-sections: remove unnecessary TextExtract request
This hasn't been used since I0305ae280e30a815d8d0dcd8c95490a9f183c342.
Also don't need requestExtract and DEFAULT_THUMB_WIDTH in mwapi.
Change-Id: Idc70d6e989a67421ee5af1b0d2350cfc06a3da94
---
M lib/mwapi.js
M routes/mobile-sections.js
2 files changed, 2 insertions(+), 28 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/lib/mwapi.js b/lib/mwapi.js
index 150b955..97d436a 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -12,7 +12,6 @@
const mwapi = {};
mwapi.API_QUERY_MAX_TITLES = 50;
-mwapi.DEFAULT_THUMB_WIDTH = 320;
mwapi.CARD_THUMB_LIST_ITEM_SIZE = 320;
mwapi.CARD_THUMB_FEATURE_SIZE = 640;
@@ -170,29 +169,6 @@
mwapi.checkForMobileviewInResponse(req.logger, response);
return response;
});
-};
-
-/**
- * Requests an article extract.
- *
- * @param {Object} app the application object
- * @param {Object} req the request object
- * @return {Promise} a promise resolving as an JSON object containing the
response
- */
-mwapi.requestExtract = function(app, req) {
- const query = {
- action: 'query',
- format: 'json',
- formatversion: '2',
- redirects: true,
- prop: 'extracts|pageimages',
- exsentences: 5, // see T59669 + T117082
- explaintext: true,
- piprop: 'thumbnail',
- pithumbsize: mwapi.DEFAULT_THUMB_WIDTH,
- titles: req.params.title
- };
- return api.mwApiGet(app, req.params.domain, query);
};
/**
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 97094ba..75bd57c 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -194,8 +194,7 @@
.then((mainPageContent) => {
return {
page: mainPageContent,
- meta: response.meta,
- extract: response.extract
+ meta: response.meta
};
});
}
@@ -221,8 +220,7 @@
function buildLeadResponse(req, res, removeNodes) {
return BBPromise.props({
page: parsoid.pageContentPromise(app, req),
- meta: pageMetadataPromise(req),
- extract: mwapi.requestExtract(app, req)
+ meta: pageMetadataPromise(req)
}).then((response) => {
if (response.meta.mainpage) {
return mainPageFixPromise(req, response);
--
To view, visit https://gerrit.wikimedia.org/r/327142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc70d6e989a67421ee5af1b0d2350cfc06a3da94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
